commit 9a5124efe1f7b8c50c15c413959dca31c7098106
author Mike Frysinger <vapier@chromium.org> Thu Jan 26 17:16:44 2023 -0500
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 02 10:22:23 2023 +0000
tree 7975221f3094d240abed83392d71e4f85849ef18
parent 0c7fcacf007bc54d0e0d14fb3ff7862c286f4fe2

scripts: cros_sdk: switch to goma_lib.Goma

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

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

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

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index d94a194..a8df76f 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -24,7 +24,7 @@
 import shlex
 import subprocess
 import sys
-from typing import List
+from typing import List, Optional
 import urllib.parse
 
 from chromite.cbuildbot import cbuildbot_alerts
@@ -32,6 +32,7 @@
 from chromite.lib import constants
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_sdk_lib
+from chromite.lib import goma_lib
 from chromite.lib import locking
 from chromite.lib import namespaces
 from chromite.lib import osutils
@@ -199,7 +200,7 @@
     cache_dir,
     chrome_root,
     chrome_root_mount,
-    goma_dir,
+    goma: Optional[goma_lib.Goma],
     reclient_dir,
     reproxy_cfg_file,
     working_dir,
@@ -215,8 +216,8 @@
         cmd.extend(["--chrome_root", chrome_root])
     if chrome_root_mount:
         cmd.extend(["--chrome_root_mount", chrome_root_mount])
-    if goma_dir:
-        cmd.extend(["--goma_dir", goma_dir])
+    if goma:
+        cmd.extend(["--goma_dir", goma.linux_goma_dir])
     if reclient_dir:
         cmd.extend(["--reclient_dir", reclient_dir])
     if reproxy_cfg_file:
@@ -1079,6 +1080,8 @@
             " %s.  Please find a x86_64 machine." % (host,)
         )
 
+    goma = goma_lib.Goma(options.goma_dir) if options.goma_dir else None
+
     # Merge the outside PATH setting if we re-execed ourselves.
     if "CHROMEOS_SUDO_PATH" in os.environ:
         os.environ["PATH"] = "%s:%s" % (
@@ -1496,7 +1499,7 @@
                 options.cache_dir,
                 options.chrome_root,
                 options.chrome_root_mount,
-                options.goma_dir,
+                goma,
                 options.reclient_dir,
                 options.reproxy_cfg_file,
                 options.working_dir,