commit 253c8395fbbcb7c7e067abc9824e81f444c5acd4
author Mike Frysinger <vapier@chromium.org> Fri Jan 27 01:12:21 2023 -0500
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 02 20:44:24 2023 +0000
tree 45265270cd11c63ea082debd19b490a4a9a1b17d
parent f4b6ab86a3b9ef36b5ef8d61fc7408eeba5b6578

scripts: cros_sdk: switch to remoteexec_util.Remoteexec

Rather than pass the paths around directly, use a Remoteexec object to
manage things.  This will be needed to move to chroot_lib.Chroot.

BUG=b:191307774
TEST=`cros_sdk` still works

Change-Id: I70315e0e3d0adb2ea20dc88719d48cfa0f1a42f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4213656
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index a8df76f..4742bcf 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -38,6 +38,7 @@
 from chromite.lib import osutils
 from chromite.lib import path_util
 from chromite.lib import process_util
+from chromite.lib import remoteexec_util
 from chromite.lib import retry_util
 from chromite.lib import timeout_util
 from chromite.lib import toolchain
@@ -201,8 +202,7 @@
     chrome_root,
     chrome_root_mount,
     goma: Optional[goma_lib.Goma],
-    reclient_dir,
-    reproxy_cfg_file,
+    remoteexec: Optional[remoteexec_util.Remoteexec],
     working_dir,
     additional_args,
 ):
@@ -218,10 +218,15 @@
         cmd.extend(["--chrome_root_mount", chrome_root_mount])
     if goma:
         cmd.extend(["--goma_dir", goma.linux_goma_dir])
-    if reclient_dir:
-        cmd.extend(["--reclient_dir", reclient_dir])
-    if reproxy_cfg_file:
-        cmd.extend(["--reproxy_cfg_file", reproxy_cfg_file])
+    if remoteexec:
+        cmd.extend(
+            [
+                "--reclient_dir",
+                remoteexec.reclient_dir,
+                "--reproxy_cfg_file",
+                remoteexec.reproxy_cfg_file,
+            ]
+        )
     if working_dir is not None:
         cmd.extend(["--working_dir", working_dir])
 
@@ -1231,6 +1236,14 @@
 
     options.Freeze()
 
+    remoteexec = (
+        remoteexec_util.Remoteexec(
+            options.reclient_dir, options.reproxy_cfg_file
+        )
+        if (options.reclient_dir and options.reproxy_cfg_file)
+        else None
+    )
+
     # Anything that needs to manipulate the main chroot mount or communicate
     # with LVM needs to be done here before we enter the new namespaces.
 
@@ -1500,8 +1513,7 @@
                 options.chrome_root,
                 options.chrome_root_mount,
                 goma,
-                options.reclient_dir,
-                options.reproxy_cfg_file,
+                remoteexec,
                 options.working_dir,
                 options.commands,
             )