feat: Add new gcloud commands, API clients, and third-party libraries across various services.

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/CONTRIBUTING.md

@@ -0,0 +1,24 @@
+Want to contribute? Great! First, read this page (including the small print at the end).
+
+### Before you contribute
+Before we can use your code, you must sign the
+[Google Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual?csw=1)
+(CLA), which you can do online. The CLA is necessary mainly because you own the
+copyright to your changes, even after your contribution becomes part of our
+codebase, so we need your permission to use and distribute your code. We also
+need to be sure of various other things—for instance that you'll tell us if you
+know that your code infringes on other people's patents. You don't have to sign
+the CLA until after you've submitted your code for review and a member has
+approved it, but you must do it before we can put your code into our codebase.
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Code reviews
+All submissions, including submissions by project members, require review. We
+use Github pull requests for this purpose.
+
+### The small print
+Contributions made by corporations are covered by a different agreement than
+the one above, the Software Grant and Corporate Contributor License Agreement.

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/README.md

@@ -0,0 +1,6 @@
+
+Python Externalized Runtime
+===========================
+
+This is the python runtime definition that will soon be used by gcloud for
+generating dockerfiles for GAE.

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/bin/detect

@@ -0,0 +1,129 @@
+#!/usr/bin/python
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Language detection script.
+
+import json
+import os
+import sys
+
+# Augment the path with our library directory.
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+sys.path.append(os.path.join(ROOT_DIR, 'lib'))
+
+import comm
+import versions
+
+def PythonVersionFromRuntimeConfig(runtime_config):
+  """Validate the python_version section of runtime_config, if present.
+
+  Valid values are set in versions.PYTHON_INTERPRETER_VERSION_MAP. If
+  runtime_config is false-equivalent or if the python_version field is
+  absent, versions.DEFAULT_PYTHON_INTERPRETER_VERSION is used as the
+  default.
+
+  Args:
+    runtime_config: A valid runtime_config.
+
+  Returns:
+    One of the strings from versions.PYTHON_INTERPRETER_VERSION_MAP.keys().
+
+  Raises:
+    ValueError: If the contents of the python_version field are not valid.
+  """
+  if not runtime_config:
+    python_version = None
+  else:
+    python_version = runtime_config.python_version
+
+  if not python_version:
+    return versions.DEFAULT_PYTHON_INTERPRETER_VERSION
+  elif python_version in versions.PYTHON_INTERPRETER_VERSION_MAP:
+    return python_version
+  else:
+    raise ValueError('Unsupported or invalid python version specified.')
+
+def Main(args):
+  if len(args) != 2:
+    # If we're being called incorrectly, this probably isn't happening from a
+    # framework.
+    sys.stderr.write('Invalid Usage: %s <source-root-directory>' % sys.argv[0])
+    return 1
+
+  # Get the first argument, should be the source root directory.
+  path = args[1]
+
+  # See if we have a config file and if it contains an entrypoint.
+  config = comm.get_config()
+  appinfo = config.params.appinfo
+  entrypoint = None
+  if appinfo:
+    entrypoint = appinfo.entrypoint
+
+  comm.info('Checking for Python.')
+  got_shrinkwrap = False
+
+  requirements_txt = os.path.join(path, 'requirements.txt')
+
+  got_requirements_txt = os.path.isfile(requirements_txt)
+  got_py_files = False
+
+  # check for any python files.
+  for _, _, files in os.walk(path):
+    for filename in files:
+      if filename.endswith('.py'):
+        got_py_files = True
+
+  if not got_requirements_txt and not got_py_files:
+    return 1
+
+  # Query the user for the WSGI entrypoint:
+  if not entrypoint:
+    entrypoint = comm.query_user('This looks like a Python app.  If so, please '
+                                 'enter the command to run the app in '
+                                 "production (enter nothing if it's not a "
+                                 'python app): ')
+    if not entrypoint:
+      comm.info('No entrypoint specified.  Assuming this is not a python app.')
+      return 1
+    elif appinfo:
+      comm.print_status('To avoid being asked for an entrypoint in the '
+                        'future, please add the entrypoint to your app.yaml:\n'
+                        '  entrypoint: %s' % entrypoint)
+
+  try:
+    # Get the python interpreter version. Use the default if not specified.
+    python_version = PythonVersionFromRuntimeConfig(
+        appinfo.runtime_config if appinfo else None)
+  except ValueError:
+    # The python version was selected, but set to an invalid result.
+    valid_versions = str(sorted(versions.PYTHON_INTERPRETER_VERSION_MAP.keys()))
+    comm.error('The python_version selected in runtime_config is invalid or not '
+               'supported. Please select from the following options:\n'
+               '%s', valid_versions)
+    return 1
+
+  runtime = 'custom' if config.params.custom else 'python'
+
+  comm.send_runtime_params({'entrypoint': entrypoint,
+                            'got_requirements_txt': got_requirements_txt,
+                            'python_version': python_version},
+                           appinfo={'runtime': runtime,
+                                    'entrypoint': entrypoint,
+                                    'env': 'flex'})
+  return 0
+
+if __name__ == '__main__':
+  sys.exit(Main(sys.argv))

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/bin/generate_configs

@@ -0,0 +1,60 @@
+#!/usr/bin/python
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import StringIO
+import sys
+
+# Augment the path with our library directory.
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+sys.path.append(os.path.join(ROOT_DIR, 'lib'))
+
+import comm
+import versions
+
+ROOT = comm.RuntimeDefinitionRoot(ROOT_DIR)
+
+def Main(args):
+  """Generate all config files for the module."""
+
+  # Get runtime parameters from the controller.
+  config = comm.get_config()
+  params = config.params
+  runtime_data = config.runtime_data
+
+  # Customize the dockerfile.
+  if params.custom or params.deploy:
+    # Generate the Dockerfile.
+    out = StringIO.StringIO()
+    out.write(ROOT.read_file('data', 'Dockerfile.preamble'))
+    docker_python_version = versions.PYTHON_INTERPRETER_VERSION_MAP[
+        runtime_data.python_version]
+    out.write(ROOT.read_file('data', 'Dockerfile.virtualenv.template').format(
+              python_version=docker_python_version))
+
+    if runtime_data.got_requirements_txt:
+      out.write(ROOT.read_file('data', 'Dockerfile.requirements_txt'))
+
+    out.write(ROOT.read_file('data', 'Dockerfile.install_app'))
+    if runtime_data.entrypoint:
+      out.write('CMD {0}\n'.format(runtime_data.entrypoint))
+
+    comm.gen_file('Dockerfile', out.getvalue())
+
+    # Generate .dockerignore
+    comm.gen_file('.dockerignore', ROOT.read_file('data', 'dockerignore'))
+
+if __name__ == '__main__':
+  Main(sys.argv)

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/data/Dockerfile.install_app

@@ -0,0 +1 @@
+ADD . /app/

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/data/Dockerfile.preamble

@@ -0,0 +1 @@
+FROM gcr.io/google-appengine/python

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/data/Dockerfile.requirements_txt

@@ -0,0 +1,2 @@
+ADD requirements.txt /app/
+RUN pip install -r requirements.txt

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/data/Dockerfile.virtualenv.template

@@ -0,0 +1,7 @@
+LABEL python_version=python{python_version}
+RUN virtualenv --no-download /env -p python{python_version}
+
+# Set virtualenv environment variables. This is equivalent to running
+# source /env/bin/activate
+ENV VIRTUAL_ENV /env
+ENV PATH /env/bin:$PATH

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/data/app.yaml.template

@@ -0,0 +1,3 @@
+runtime: {runtime}
+env: flex
+entrypoint: {entrypoint}

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/data/dockerignore

@@ -0,0 +1,19 @@
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.dockerignore
+Dockerfile
+.git
+.hg
+.svn

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/lib/comm.py

@@ -0,0 +1,174 @@
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: this file is part of the sdk-ext-runtime package.  It gets copied into
+# individual GAE runtime modules so that they can be easily deployed.
+
+import json
+import os
+import sys
+
+
+class JSONObject(object):
+    """Wrapper for a JSON object.
+
+    Presents a JSON object as a python object (where fields are attributes)
+    instead of a dictionary.  Undefined attributes produce a value of None
+    instead of an AttributeError.
+
+    Note that attribute names beginning with an underscore are excluded.
+    """
+
+    def __getattr__(self, attr):
+        return None
+
+    def to_dict(self):
+        result = {}
+        for attr, val in self.__dict__.iteritems():
+            if not attr.startswith('_'):
+                result[attr] = _make_serializable(val)
+        return result
+
+    # Alias old style naming so this interoperates with gcloud's appinfo.
+    ToDict = to_dict
+
+
+def _make_serializable(obj):
+    """Converts objects to serializable form."""
+    if isinstance(obj, JSONObject):
+        return obj.to_dict()
+    else:
+        return obj
+
+
+def _write_msg(**message):
+    """Write a message to standard output.
+
+    Args:
+        **message: ({str: object, ...}) A JSON message encoded in keyword
+            arguments.
+    """
+    json.dump(message, sys.stdout, default=_make_serializable)
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+
+
+def error(message, *args):
+    _write_msg(type='error', message=message % args)
+
+
+def warn(message, *args):
+    _write_msg(type='warn', message=message % args)
+
+
+def info(message, *args):
+    _write_msg(type='info', message=message % args)
+
+
+def debug(message, *args):
+    _write_msg(type='debug', message=message % args)
+
+
+def print_status(message, *args):
+    _write_msg(type='print_status', message=message % args)
+
+
+def send_runtime_params(params, appinfo=None):
+    """Send runtime parameters back to the controller.
+
+    Args:
+        params: ({str: object, ...}) Set of runtime parameters.  Must be
+            json-encodable.
+        appinfo: ({str: object, ...} or None) Contents of the app.yaml file to
+            be produced by the runtime definition.  Required fields may be
+            added to this by the framework, the only thing an application
+            needs to provide is the "runtime" field and any additional data
+            fields.
+    """
+    if appinfo is not None:
+        _write_msg(type='runtime_parameters', runtime_data=params,
+                   appinfo=appinfo)
+    else:
+        _write_msg(type='runtime_parameters', runtime_data=params)
+
+
+def get_config():
+    """Request runtime parameters from the controller.
+
+    Returns:
+      (object) The runtime parameters represented as an object.
+    """
+    _write_msg(type='get_config')
+    return dict_to_object(json.loads(sys.stdin.readline()))
+
+
+def dict_to_object(json_dict):
+    """Converts a dictionary to a python object.
+
+    Converts key-values to attribute-values.
+
+    Args:
+      json_dict: ({str: object, ...})
+
+    Returns:
+      (JSONObject)
+    """
+    obj = JSONObject()
+    for name, val in json_dict.iteritems():
+        if isinstance(val, dict):
+          val = dict_to_object(val)
+        setattr(obj, name, val)
+    return obj
+
+
+class RuntimeDefinitionRoot(object):
+    """Abstraction that allows us to access files in the runtime definiton."""
+
+    def __init__(self, path):
+        self.root = path
+
+    def read_file(self, *name):
+        with open(os.path.join(self.root, *name)) as src:
+            return src.read()
+
+
+def gen_file(name, contents):
+    """Generate the file.
+
+    This writes the file to be generated back to the controller.
+
+    Args:
+        name: (str) The UNIX-style relative path of the file.
+        contents: (str) The complete file contents.
+    """
+    _write_msg(type='gen_file', filename=name, contents=contents)
+
+
+def query_user(prompt, default=None):
+    """Query the user for data.
+
+    Args:
+        prompt: (str) Prompt to display to the user.
+        default: (str or None) Default value to use if the user doesn't input
+            anything.
+
+    Returns:
+        (str) Value returned by the user.
+    """
+    kwargs = {}
+    kwargs['prompt'] = prompt
+    if default is not None:
+        kwargs['default'] = default
+    _write_msg(type='query_user', **kwargs)
+    return json.loads(sys.stdin.readline())['result']

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/lib/versions.py

@@ -0,0 +1,28 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Table of supported Python interpreter versions."""
+
+# Missing python_version defaults to this
+DEFAULT_PYTHON_INTERPRETER_VERSION = '2'
+
+# Map from app.yaml "python_version" to Dockerfile.virtualenv.template
+# {python_version}
+PYTHON_INTERPRETER_VERSION_MAP = {
+    '2': '',
+    '3': '3.6',
+    '3.4': '3.4',
+    '3.5': '3.5',
+    '3.6': '3.6',
+}

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/runtime.yaml

@@ -0,0 +1,8 @@
+author: mmuller@google.com
+name: python
+description: Official Google Python runtime definition.
+api_version: 0.1
+detect:
+  python: bin/detect
+generate_configs:
+  python: bin/generate_configs

gcloud auth application-default login/google-cloud-sdk/platform/ext-runtime/python/test/runtime_test.py

@@ -0,0 +1,449 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: this file is part of the sdk-ext-runtime package.  It gets copied into
+# individual GAE runtime modules so that they can be easily deployed.
+
+import os
+import textwrap
+import unittest
+
+from gae_ext_runtime import comm
+from gae_ext_runtime import ext_runtime
+from gae_ext_runtime import testutil
+
+ROOT_DIR = os.path.dirname(os.path.dirname(__file__))
+ROOT = comm.RuntimeDefinitionRoot(ROOT_DIR)
+
+
+class FakeExecutionEnvironment(ext_runtime.DefaultExecutionEnvironment):
+
+    def CanPrompt(self):
+        return True
+
+    def PromptResponse(self, message):
+        return 'my_entrypoint'
+
+
+class RuntimeTests(testutil.TestBase):
+
+    def setUp(self):
+        # This has to come before RuntimeTests.setUp()
+        self.runtime_def_root = ROOT_DIR
+        super(RuntimeTests, self).setUp()
+
+        self.DOCKERFILE_PREAMBLE = (
+            ROOT.read_file('data', 'Dockerfile.preamble'))
+        self.DOCKERFILE_VIRTUALENV_TEMPLATE = (
+            ROOT.read_file('data',
+                           'Dockerfile.virtualenv.template'))
+        self.DOCKERFILE_REQUIREMENTS_TXT = (
+            ROOT.read_file('data', 'Dockerfile.requirements_txt'))
+        self.DOCKERFILE_INSTALL_APP = (
+            ROOT.read_file('data', 'Dockerfile.install_app'))
+        self.set_execution_environment(FakeExecutionEnvironment())
+
+    # XXX Move this to testutil.
+    def read_file(self, *args):
+        """Read the file, return the contents.
+
+        Args:
+            *args: A set of path components (see full_path()) relative to the
+                temporary directory.
+        """
+        with open(os.path.join(self.temp_path, *args)) as fp:
+            return fp.read()
+
+    def test_python(self):
+        self.write_file('requirements.txt', 'requirements')
+        self.generate_configs(deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(python_version='') +
+            self.DOCKERFILE_REQUIREMENTS_TXT +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD my_entrypoint\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'requirements.txt',
+                          'app.yaml',
+                          'Dockerfile',
+                          '.dockerignore'})
+
+    def test_python_no_write(self):
+        """Tests generate_config_data with only requirements.txt.
+
+        app.yaml should be written to disk, Dockerfile and .dockerignore
+        returned by the method in memory. Tests that Dockerfile contents
+        are correct.
+        """
+        self.write_file('requirements.txt', 'requirements')
+        cfg_files = self.generate_config_data(deploy=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(python_version='') +
+            self.DOCKERFILE_REQUIREMENTS_TXT +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD my_entrypoint\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'requirements.txt', 'app.yaml'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_no_requirements_txt(self):
+        self.write_file('foo.py', '# python code')
+        self.generate_configs(custom=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD my_entrypoint\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'foo.py', 'app.yaml', 'Dockerfile', '.dockerignore'})
+
+    def test_python_no_requirements_txt_no_write(self):
+        """Tests generate_config_data with no requirements.txt file."""
+        self.write_file('foo.py', '# python code')
+        cfg_files = self.generate_config_data(custom=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD my_entrypoint\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'foo.py', 'app.yaml'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_with_app_yaml(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(
+            runtime='python',
+            entrypoint='run_me_some_python!')
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', 'Dockerfile', '.dockerignore'})
+
+    def test_python_with_app_yaml_no_write(self):
+        """Tests generate_config_data with fake appinfo."""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(
+            runtime='python',
+            entrypoint='run_me_some_python!')
+        cfg_files = self.generate_config_data(appinfo=config, deploy=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_app_yaml_no_entrypoint(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python')
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD my_entrypoint\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', 'Dockerfile', '.dockerignore'})
+
+    def test_python_app_yaml_no_entrypoint_no_write(self):
+        """Tests generate_config_data with fake appinfo, no entrypoint."""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python')
+        cfg_files = self.generate_config_data(appinfo=config, deploy=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD my_entrypoint\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_with_runtime_config_but_no_python_version(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!')
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', '.dockerignore', 'Dockerfile'})
+
+    def test_python_with_runtime_config_but_no_python_version_no_write(self):
+        """Tests generate_config_data with no python version in appinfo."""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!')
+        cfg_files = self.generate_config_data(appinfo=config, deploy=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_with_explicit_python2(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(
+            runtime='python',
+            entrypoint='run_me_some_python!',
+            runtime_config=dict(python_version='2'))
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', '.dockerignore', 'Dockerfile'})
+
+    def test_python_with_explicit_python2_no_write(self):
+        """Tests generate_config_data with Python version '2' in appinfo."""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(
+            runtime='python',
+            entrypoint='run_me_some_python!',
+            runtime_config=dict(python_version='2'))
+        cfg_files = self.generate_config_data(appinfo=config, deploy=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_with_explicit_python3(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!',
+                                      runtime_config=dict(python_version='3'))
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='3.6') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', '.dockerignore', 'Dockerfile'})
+
+    def test_python_with_explicit_python3_no_write(self):
+        """Tests generate_config_data with python version '3' in appinfo."""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!',
+                                      runtime_config=dict(python_version='3'))
+        cfg_files = self.generate_config_data(appinfo=config, deploy=True)
+        self.assert_genfile_exists_with_contents(
+            cfg_files,
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='3.6') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_with_explicit_python34(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!',
+                                      runtime_config=dict(python_version='3.4'))
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='3.4') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', '.dockerignore', 'Dockerfile'})
+
+    def test_python_with_explicit_python35(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!',
+                                      runtime_config=dict(python_version='3.5'))
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='3.5') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', '.dockerignore', 'Dockerfile'})
+
+    def test_python_with_explicit_python36(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='python',
+                                      entrypoint='run_me_some_python!',
+                                      runtime_config=dict(python_version='3.6'))
+        self.generate_configs(appinfo=config, deploy=True)
+        self.assert_file_exists_with_contents(
+            'Dockerfile',
+            self.DOCKERFILE_PREAMBLE +
+            self.DOCKERFILE_VIRTUALENV_TEMPLATE.format(
+                python_version='3.6') +
+            self.DOCKERFILE_INSTALL_APP +
+            'CMD run_me_some_python!\n')
+
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', '.dockerignore', 'Dockerfile'})
+
+    def test_python_with_invalid_version(self):
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(
+            runtime='python',
+            entrypoint='run_me_some_python!',
+            runtime_config=dict(python_version='invalid_version'))
+        self.assertRaises(testutil.InvalidRuntime,
+                          self.generate_config_data, appinfo=config)
+
+    def test_python_custom_runtime(self):
+        self.write_file('test.py', 'test file')
+        self.generate_configs(custom=True)
+        with open(os.path.join(self.temp_path, 'app.yaml')) as f:
+            app_yaml_contents = f.read()
+        self.assertMultiLineEqual(
+            app_yaml_contents,
+            textwrap.dedent("""\
+                entrypoint: my_entrypoint
+                env: flex
+                runtime: custom
+                """))
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', 'app.yaml', '.dockerignore', 'Dockerfile'})
+
+    def test_python_custom_runtime_no_write(self):
+        """Tests generate_config_data with custom=True."""
+        self.write_file('test.py', 'test file')
+        cfg_files = self.generate_config_data(custom=True)
+        with open(os.path.join(self.temp_path, 'app.yaml')) as f:
+            app_yaml_contents = f.read()
+        self.assertMultiLineEqual(
+            app_yaml_contents,
+            textwrap.dedent("""\
+                entrypoint: my_entrypoint
+                env: flex
+                runtime: custom
+                """))
+        self.assertEqual(set(os.listdir(self.temp_path)),
+                         {'test.py', 'app.yaml'})
+        self.assertEqual({f.filename for f in cfg_files},
+                         {'Dockerfile', '.dockerignore'})
+
+    def test_python_custom_runtime_field(self):
+        """Verify that a runtime field of "custom" works."""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(runtime='custom',
+                                      entrypoint='my_entrypoint')
+        self.assertTrue(self.generate_configs(appinfo=config, deploy=True))
+
+    def test_python_label(self):
+        """Test that a LABEL directive is added to the Dockerfile"""
+        self.write_file('test.py', 'test file')
+        config = testutil.AppInfoFake(
+            runtime='python',
+            entrypoint='run_me_some_python!',
+            runtime_config=dict(python_version='3'))
+        cfg_files = self.generate_config_data(appinfo=config, deploy=True)
+        dockerfile = [f for f in cfg_files if f.filename == 'Dockerfile'][0]
+        self.assertIn('LABEL python_version=python3.6\n', dockerfile.contents)
+
+    # NOTE: this test is also irrelevant to the runtime, convert it to
+    # something appropriate to the framework.
+#    def test_python_non_interactive(self):
+#        self.write_file('test.py', 'blah')
+#        with mock.patch.object(console_io, 'CanPrompt', lambda: False):
+#            with mock.patch.object(fingerprinting,
+#                                   'GetNonInteractiveErrorMessage',
+#                                   lambda: 'xx123unlikely'):
+#
+#        fingerprinter.IdentifyDirectory(self.temp_path)
+#        self.AssertLogContains('xx123unlikely')
+
+if __name__ == '__main__':
+    unittest.main()