commit d3b8404adb9b9b82efbcb33d1f3263323ff364e6
author Alex Klein <saklein@chromium.org> Fri May 19 14:43:59 2023 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat May 27 03:03:15 2023 +0000
tree 004e56b7e17f7090a05c8740a9bea0bcbbcf7bd6
parent ace4eaeeab6e370398070b2b49cb5eee496190af

api: Drop controller_util.PackageInfoToCpv.

Convert remaining usages of PackageInfoToCpv to
deserialize_package_info to allow dropping the SplitCPV usage.

BUG=b:187792048
TEST=run_tests, CQ

Change-Id: I90f48ce1d728bc077dbb6dac1807cb4468f0a8f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4548373
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index feafe40..fea0d98 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -80,7 +80,7 @@
     """
     chroot = controller_util.ParseChroot(input_proto.chroot)
     build_targets = controller_util.ParseBuildTargets(input_proto.build_targets)
-    package = controller_util.PackageInfoToCPV(input_proto.package_info)
+    package = controller_util.deserialize_package_info(input_proto.package_info)
     refs = []
     for ref in input_proto.versions:
         refs.append(
@@ -183,7 +183,8 @@
     """Returns the target versions."""
     build_target = controller_util.ParseBuildTarget(input_proto.build_target)
     package_list = [
-        controller_util.PackageInfoToCPV(x) for x in input_proto.packages or []
+        controller_util.deserialize_package_info(x)
+        for x in input_proto.packages
     ]
     target_versions = packages.get_target_versions(build_target, package_list)
 
@@ -301,10 +302,10 @@
 def HasPrebuilt(input_proto, output_proto, _config):
     """Checks if the most recent version of Chrome has a prebuilt."""
     build_target = controller_util.ParseBuildTarget(input_proto.build_target)
-    package = controller_util.PackageInfoToCPV(input_proto.package_info).cp
+    package = controller_util.deserialize_package_info(input_proto.package_info)
     useflags = "chrome_internal" if input_proto.chrome else None
     exists = packages.has_prebuilt(
-        package, build_target=build_target, useflags=useflags
+        package.atom, build_target=build_target, useflags=useflags
     )
 
     output_proto.has_prebuilt = exists
@@ -323,8 +324,11 @@
 def BuildsChrome(input_proto, output_proto, _config):
     """Check if the board builds chrome."""
     build_target = controller_util.ParseBuildTarget(input_proto.build_target)
-    cpvs = [controller_util.PackageInfoToCPV(pi) for pi in input_proto.packages]
-    builds_chrome = packages.builds(constants.CHROME_CP, build_target, cpvs)
+    pkgs = [
+        controller_util.deserialize_package_info(x)
+        for x in input_proto.packages
+    ]
+    builds_chrome = packages.builds(constants.CHROME_CP, build_target, pkgs)
     output_proto.builds_chrome = builds_chrome