commit 26e472b6108517188a477247d9872cc50fe2d229
author Alex Klein <saklein@chromium.org> Tue Mar 10 14:35:01 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Mar 11 19:10:39 2020 +0000
tree e59c554aa20be81bcf9e0368af6539df1463f99b
parent 62b7e1e2b7e41f88783bce5ef8b49ce0d61d5cec

api/controller: Convert manual BuildTarget instantiations

There are controller_util functions to construct BuildTargets from
the protobuf messages so we can have a single place to address changes
to the protobuf message. Convert all the BuildTarget instantiations
from manual constructions to calls to the util function.

BUG=chromium:1060351
TEST=run_tests, cq

Change-Id: I60c6720cf7bbc60f122f2fa1e2e81ab13368193f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2096818
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>

api/controller/sysroot.py

diff --git a/api/controller/sysroot.py b/api/controller/sysroot.py
index 3615078..b0901ab 100644
--- a/api/controller/sysroot.py
+++ b/api/controller/sysroot.py
@@ -15,7 +15,6 @@
 from chromite.api import validate
 from chromite.api.controller import controller_util
 from chromite.api.metrics import deserialize_metrics_log
-from chromite.lib import build_target_lib
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_logging as logging
 from chromite.lib import goma_lib
@@ -40,11 +39,8 @@
   update_chroot = not input_proto.flags.chroot_current
   replace_sysroot = input_proto.flags.replace
 
-  build_target_name = input_proto.build_target.name
-  profile = input_proto.profile.name or None
-
-  build_target = build_target_lib.BuildTarget(name=build_target_name,
-                                              profile=profile)
+  build_target = controller_util.ParseBuildTarget(input_proto.build_target,
+                                                  input_proto.profile)
   run_configs = sysroot.SetupBoardRunConfig(
       force=replace_sysroot, upgrade_chroot=update_chroot)
 
@@ -55,7 +51,7 @@
     cros_build_lib.Die(e)
 
   output_proto.sysroot.path = created.path
-  output_proto.sysroot.build_target.name = build_target_name
+  output_proto.sysroot.build_target.name = build_target.name
 
   return controller.RETURN_CODE_SUCCESS
 
@@ -121,9 +117,9 @@
       input_proto.flags.compile_source or input_proto.flags.toolchain_changed)
 
   sysroot_path = input_proto.sysroot.path
-  build_target_name = input_proto.sysroot.build_target.name
 
-  build_target = build_target_lib.BuildTarget(name=build_target_name)
+  build_target = controller_util.ParseBuildTarget(
+      input_proto.sysroot.build_target)
   target_sysroot = sysroot_lib.Sysroot(sysroot_path)
   run_configs = sysroot.SetupBoardRunConfig(usepkg=not compile_source)