gsutil: Pass proxy information via Boto options.

gsutil.py

Index: gsutil.py
diff --git a/gsutil.py b/gsutil.py
index 6578d7844171202eb787bf1414c4a371e15a75a0..bdb9d53d7b3f939c8a943533dabba1025b2e6863 100755
--- a/gsutil.py
+++ b/gsutil.py
@@ -15,6 +15,7 @@ import shutil
 import subprocess
 import sys
 import urllib2
+import urlparse
 import zipfile
 
 
@@ -121,12 +122,32 @@ def ensure_gsutil(version, target):
   return gsutil_bin
 
 
+def get_boto_proxy_options_from_environment():

[Ryan Tseng, 2015/01/07 22:21:58]

for completeness sake (since I've seen all these permutations before) lets also
look for ['http_proxy', 'HTTP_PROXY', 'HTTPS_PROXY', 'https_proxy']

+  """Converts the contents of the 'http_proxy' environment variable into the

[Ryan Tseng, 2015/01/07 22:21:58]

"""One line

More lines
...
"""

So rewrite this as:
"""Derive proxy options for gsutil from the environment.

<more description if needed>
"""

+  corresponding Boto options that gsutil accepts."""
+  if 'http_proxy' not in os.environ:
+    return []
+  proxy_url = urlparse.urlsplit(os.environ['http_proxy'])
+  if proxy_url.hostname is None or proxy_url.port is None:
+    raise EnvironmentError(
+      'The "http_proxy" environment is set, but has an invalid format. Its '

[Ryan Tseng, 2015/01/07 22:21:58]

2 indents

+      'format must be "http://[user[:password]]host:port".')
+  boto_options = ['-o', 'Boto:proxy=%s' % proxy_url.hostname,
+                  '-o', 'Boto:proxy_port=%d' % proxy_url.port]
+  if proxy_url.username:
+    boto_options.extend(['-o', 'Boto:proxy_user=%s' % proxy_url.username])
+  if proxy_url.password:
+    boto_options.extend(['-o', 'Boto:proxy_pass=%s' % proxy_url.password])
+  return boto_options
+
+
 def run_gsutil(force_version, fallback, target, args):
   if force_version:
     gsutil_bin = ensure_gsutil(force_version, target)
   else:
     gsutil_bin = fallback
-  cmd = [sys.executable, gsutil_bin] + args
+  proxy_options = get_boto_proxy_options_from_environment()
+  cmd = [sys.executable, gsutil_bin] + proxy_options + args
   try:
     call(cmd)
   except SubprocessError as e: