commit 2960c75fdb9a3f14c8e74ad9c60856a470d44eee
author Alex Klein <saklein@chromium.org> Mon Mar 09 13:43:38 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Mar 11 00:31:12 2020 +0000
tree 3b6a9a38fbd19ea6f20a7325f6c93e4e6f419b9d
parent 6e22a4d8cfaeaca405750f3ae7111f71ce115361

build_target_util: Rename to build_target_lib.

Nitty name change. The module contains a class and is in lib, so
should be a _lib, not a _util.

BUG=chromium:1060351
TEST=run_tests

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

api/controller/binhost.py

diff --git a/api/controller/binhost.py b/api/controller/binhost.py
index 1e231f1..8180831 100644
--- a/api/controller/binhost.py
+++ b/api/controller/binhost.py
@@ -18,7 +18,6 @@
 from chromite.api import validate
 from chromite.api.controller import controller_util
 from chromite.api.gen.chromite.api import binhost_pb2
-from chromite.lib import build_target_util
 from chromite.lib import constants
 from chromite.lib import cros_build_lib
 from chromite.lib import gs
@@ -51,7 +50,7 @@
 @validate.validation_complete
 def GetBinhosts(input_proto, output_proto, _config):
   """Get a list of binhosts."""
-  build_target = build_target_util.BuildTarget(input_proto.build_target.name)
+  build_target = controller_util.ParseBuildTarget(input_proto.build_target)
 
   binhosts = binhost.GetBinhosts(build_target)
 
@@ -74,7 +73,7 @@
 @validate.validation_complete
 def GetPrivatePrebuiltAclArgs(input_proto, output_proto, _config):
   """Get the ACL args from the files in the private overlays."""
-  build_target = build_target_util.BuildTarget(input_proto.build_target.name)
+  build_target = controller_util.ParseBuildTarget(input_proto.build_target)
 
   try:
     args = binhost.GetPrebuiltAclArgs(build_target)
@@ -106,18 +105,19 @@
     output_proto (PrepareBinhostUploadsResponse): The output proto.
     config (api_config.ApiConfig): The API call config.
   """
-  target_name = (input_proto.sysroot.build_target.name
-                 or input_proto.build_target.name)
+  if input_proto.sysroot.build_target.name:
+    build_target_msg = input_proto.sysroot.build_target
+  else:
+    build_target_msg = input_proto.build_target
   sysroot_path = input_proto.sysroot.path
 
-  if not sysroot_path and not target_name:
+  if not sysroot_path and not build_target_msg.name:
     cros_build_lib.Die('Sysroot.path is required.')
 
-  build_target = build_target_util.BuildTarget(target_name)
+  build_target = controller_util.ParseBuildTarget(build_target_msg)
   chroot = controller_util.ParseChroot(input_proto.chroot)
 
   if not sysroot_path:
-    # Very temporary, so not worried about this not calling the lib function.
     sysroot_path = build_target.root
   sysroot = sysroot_lib.Sysroot(sysroot_path)
 
@@ -173,7 +173,6 @@
   """
   sysroot_path = input_proto.sysroot.path
 
-  # build_target = build_target_util.BuildTarget(target_name)
   chroot = controller_util.ParseChroot(input_proto.chroot)
   sysroot = sysroot_lib.Sysroot(sysroot_path)