Adds SSO auth to gsutil

download_from_google_storage.py

Index: download_from_google_storage.py
diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index 766a2b85500e7644069b1781f92f3576cf135584..e02cde42f60aa25eb5e4f31ad10bb52d860491d6 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -36,12 +36,13 @@ class InvalidFileError(IOError):
 class Gsutil(object):
   """Call gsutil with some predefined settings.  This is a convenience object,
   and is also immutable."""
-  def __init__(self, path, boto_path, timeout=None):
+  def __init__(self, path, boto_path, timeout=None, bypass_prodaccess=False):
     if not os.path.exists(path):
       raise FileNotFoundError('GSUtil not found in %s' % path)
     self.path = path
     self.timeout = timeout
     self.boto_path = boto_path
+    self.bypass_prodaccess = bypass_prodaccess
 
   def get_sub_env(self):
     env = os.environ.copy()
@@ -60,13 +61,19 @@ class Gsutil(object):
     return env
 
   def call(self, *args):
-    return subprocess2.call((sys.executable, self.path) + args,
-                            env=self.get_sub_env(),
-                            timeout=self.timeout)
+    cmd = [sys.executable, self.path]
+    if self.bypass_prodaccess:
+      cmd += ['--bypass_prodaccess']

[M-A Ruel, 2013/12/04 00:38:17]

Use append()

[Ryan Tseng, 2013/12/04 01:22:22]

Done.

+    cmd += list(args)

[M-A Ruel, 2013/12/04 00:38:17]

Use extend()

[Ryan Tseng, 2013/12/04 01:22:22]

Done.

+    return subprocess2.call(cmd, env=self.get_sub_env(), timeout=self.timeout)
 
   def check_call(self, *args):
+    cmd = [sys.executable, self.path]
+    if self.bypass_prodaccess:
+      cmd += ['--bypass_prodaccess']

[M-A Ruel, 2013/12/04 00:38:17]

everywhere.

[Ryan Tseng, 2013/12/04 01:22:22]

Done.

+    cmd += list(args)
     ((out, err), code) = subprocess2.communicate(
-        (sys.executable, self.path) + args,
+        cmd,
         stdout=subprocess2.PIPE,
         stderr=subprocess2.PIPE,
         env=self.get_sub_env(),
@@ -327,17 +334,14 @@ def main(args):
   if options.no_auth:
     options.boto = os.devnull
 
-  # Make sure we can find a working instance of gsutil.
+  # Make sure gsutil exists where we expect it to.
   if os.path.exists(GSUTIL_DEFAULT_PATH):
-    gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto)
+    gsutil = Gsutil(GSUTIL_DEFAULT_PATH,
+                    boto_path=options.boto,
+                    bypass_prodaccess=options.no_auth)
   else:
-    gsutil = None
-    for path in os.environ["PATH"].split(os.pathsep):
-      if os.path.exists(path) and 'gsutil' in os.listdir(path):
-        gsutil = Gsutil(os.path.join(path, 'gsutil'), boto_path=options.boto)
-    if not gsutil:
-      parser.error('gsutil not found in %s, bad depot_tools checkout?' %
-                  GSUTIL_DEFAULT_PATH)
+    parser.error('gsutil not found in %s, bad depot_tools checkout?' %
+                 GSUTIL_DEFAULT_PATH)
 
   # Passing in -g/--config will run our copy of GSUtil, then quit.
   if options.config: