Roll version of gsutil to 4.15.

third_party/gsutil/third_party/apitools/apitools/gen/gen_client.py

Index: third_party/gsutil/third_party/apitools/apitools/gen/gen_client.py
diff --git a/third_party/gsutil/third_party/apitools/apitools/gen/gen_client.py b/third_party/gsutil/third_party/apitools/apitools/gen/gen_client.py
old mode 100755
new mode 100644
index 7b7b6487af47d2fa3e733ac6a1942ff7ec730889..a8e32f7a3df44067903a8acffca32b8c4f2b92e5
--- a/third_party/gsutil/third_party/apitools/apitools/gen/gen_client.py
+++ b/third_party/gsutil/third_party/apitools/apitools/gen/gen_client.py
@@ -103,16 +103,29 @@ def _CopyLocalFile(filename):
         out.write(src_data)
 
 
+_DISCOVERY_DOC = None
+
+
+def _GetDiscoveryDocFromFlags():
+    """Get the discovery doc from flags."""
+    global _DISCOVERY_DOC  # pylint: disable=global-statement
+    if _DISCOVERY_DOC is None:
+        if FLAGS.discovery_url:
+            try:
+                discovery_doc = util.FetchDiscoveryDoc(FLAGS.discovery_url)
+            except exceptions.CommunicationError:
+                raise exceptions.GeneratedClientError(
+                    'Could not fetch discovery doc')
+        else:
+            infile = os.path.expanduser(FLAGS.infile) or '/dev/stdin'
+            discovery_doc = json.load(open(infile))
+        _DISCOVERY_DOC = discovery_doc
+    return _DISCOVERY_DOC
+
+
 def _GetCodegenFromFlags():
     """Create a codegen object from flags."""
-    if FLAGS.discovery_url:
-        try:
-            discovery_doc = util.FetchDiscoveryDoc(FLAGS.discovery_url)
-        except exceptions.CommunicationError:
-            return None
-    else:
-        infile = os.path.expanduser(FLAGS.infile) or '/dev/stdin'
-        discovery_doc = json.load(open(infile))
+    discovery_doc = _GetDiscoveryDocFromFlags()
     names = util.Names(
         FLAGS.strip_prefix,
         FLAGS.experimental_name_convention,
@@ -122,7 +135,7 @@ def _GetCodegenFromFlags():
         try:
             with open(FLAGS.client_json) as client_json:
                 f = json.loads(client_json.read())
-                web = f.get('web', {})
+                web = f.get('installed', f.get('web', {}))
                 client_id = web.get('client_id')
                 client_secret = web.get('client_secret')
         except IOError:
@@ -148,9 +161,10 @@ def _GetCodegenFromFlags():
         raise exceptions.ConfigurationValueError(
             'Output directory exists, pass --overwrite to replace '
             'the existing files.')
+    if not os.path.exists(outdir):
+        os.makedirs(outdir)
 
-    root_package = FLAGS.root_package or util.GetPackage(
-        outdir)  # pylint: disable=line-too-long
+    root_package = FLAGS.root_package or util.GetPackage(outdir)
     return gen_client_lib.DescriptorGenerator(
         discovery_doc, client_info, names, root_package, outdir,
         base_package=FLAGS.base_package,
@@ -169,6 +183,11 @@ def _WriteBaseFiles(codegen):
         _CopyLocalFile('exceptions.py')
 
 
+def _WriteIntermediateInit(codegen):
+    with open('__init__.py', 'w') as out:
+        codegen.WriteIntermediateInit(out)
+
+
 def _WriteProtoFiles(codegen):
     with util.Chdir(codegen.outdir):
         with open(codegen.client_info.messages_proto_file_name, 'w') as out:
@@ -197,6 +216,11 @@ def _WriteInit(codegen):
             codegen.WriteInit(out)
 
 
+def _WriteSetupPy(codegen):
+    with open('setup.py', 'w') as out:
+        codegen.WriteSetupPy(out)
+
+
 class GenerateClient(appcommands.Cmd):
 
     """Driver for client code generation."""
@@ -211,6 +235,33 @@ class GenerateClient(appcommands.Cmd):
         _WriteInit(codegen)
 
 
+class GeneratePipPackage(appcommands.Cmd):
+
+    """Generate a client as a pip-installable tarball."""
+
+    def Run(self, _):
+        """Create a client in a pip package."""
+        discovery_doc = _GetDiscoveryDocFromFlags()
+        package = discovery_doc['name']
+        original_outdir = os.path.expanduser(FLAGS.outdir)
+        FLAGS.outdir = os.path.join(
+            FLAGS.outdir, 'apitools/clients/%s' % package)
+        FLAGS.root_package = 'apitools.clients.%s' % package
+        FLAGS.generate_cli = False
+        codegen = _GetCodegenFromFlags()
+        if codegen is None:
+            logging.error('Failed to create codegen, exiting.')
+            return 1
+        _WriteGeneratedFiles(codegen)
+        _WriteInit(codegen)
+        with util.Chdir(original_outdir):
+            _WriteSetupPy(codegen)
+            with util.Chdir('apitools'):
+                _WriteIntermediateInit(codegen)
+                with util.Chdir('clients'):
+                    _WriteIntermediateInit(codegen)
+
+
 class GenerateProto(appcommands.Cmd):
 
     """Generate just the two proto files for a given API."""
@@ -247,6 +298,7 @@ def run_main():
 
 def main(_):
     appcommands.AddCmd('client', GenerateClient)
+    appcommands.AddCmd('pip_package', GeneratePipPackage)
     appcommands.AddCmd('proto', GenerateProto)