Merge branch 'master' into simple-nox

.kokoro/tests/run_tests.sh

@@ -76,6 +76,16 @@ for file in **/requirements.txt; do
         fi
     fi
 
+    # Skip unsupported Python versions for Cloud Functions
+    # (Some GCF samples' dependencies don't support them)
+    if [[ "$file" == "functions/"* ]]; then
+      PYTHON_VERSION="$(python --version 2>&1)"
+      if [[ "$PYTHON_VERSION" == "Python 2."* || "$PYTHON_VERSION" == "Python 3.5"* ]]; then
+        # echo -e "\n Skipping $file: Python $PYTHON_VERSION is not supported by Cloud Functions.\n"
+        continue
+      fi
+    fi
+
     echo "------------------------------------------------------------"
     echo "- testing $file"
     echo "------------------------------------------------------------"
@@ -95,6 +105,31 @@ for file in **/requirements.txt; do
     nox -s "$RUN_TESTS_SESSION"
     EXIT=$?
 
+    # If this is a continuous build, send the test log to the Build Cop Bot.
+    # See https://github.com/googleapis/repo-automation-bots/tree/master/packages/buildcop.
+    if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
+      XML=$(base64 -w 0 sponge_log.xml)
+
+      # See https://github.com/apps/build-cop-bot/installations/5943459.
+      MESSAGE=$(cat <<EOF
+      {
+          "Name": "buildcop",
+          "Type" : "function",
+          "Location": "us-central1",
+          "installation": {"id": "5943459"},
+          "repo": "GoogleCloudPlatform/python-docs-samples",
+          "buildID": "$KOKORO_GIT_COMMIT",
+          "buildURL": "https://source.cloud.google.com/results/invocations/$KOKORO_BUILD_ID",
+          "xunitXML": "$XML"
+      }
+EOF
+      )
+
+      # Use a service account with access to the repo-automation-bots project.
+      gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS
+      gcloud pubsub topics publish passthrough --project=repo-automation-bots --message="$MESSAGE"
+    fi
+
     if [[ $EXIT -ne 0 ]]; then
       RTN=1
       echo -e "\n Testing failed: Nox returned a non-zero exit code. \n"

appengine/flexible/tasks/Dockerfile

@@ -1,6 +1,6 @@
 # Use the official Python image.
 # https://hub.docker.com/_/python
-FROM python:3.7
+FROM python:3.8
 
 # Copy local code to the container image.
 ENV APP_HOME /app

appengine/standard/flask/tutorial/requirements.txt

@@ -1,2 +1,2 @@
 Flask==1.1.1
-Werkzeug==0.16.0
+Werkzeug==0.16.1

appengine/standard_python37/cloudsql/requirements.txt

@@ -1,5 +1,5 @@
 flask==1.1.1
-psycopg2==2.8.4
-psycopg2-binary==2.8.4
+# psycopg2==2.8.4
+psycopg2-binary==2.8.4 # you will need either the binary or the regular - for more info see http://initd.org/psycopg/docs/install.html
 PyMySQL==0.9.3
-SQLAlchemy==1.3.12
+SQLAlchemy==1.3.13

cloud-sql/mysql/sqlalchemy/Dockerfile

@@ -14,7 +14,7 @@
 
 # Use the official Python image.
 # https://hub.docker.com/_/python
-FROM python:3.7
+FROM python:3.8
 
 # Copy application dependency manifests to the container image.
 # Copying this separately prevents re-running pip install on every code change.

cloud-sql/mysql/sqlalchemy/requirements.txt

@@ -1,3 +1,3 @@
 Flask==1.1.1
-SQLAlchemy==1.3.12
+SQLAlchemy==1.3.13
 PyMySQL==0.9.3

cloud-sql/postgres/sqlalchemy/Dockerfile

@@ -14,7 +14,7 @@
 
 # Use the official Python image.
 # https://hub.docker.com/_/python
-FROM python:3.7
+FROM python:3.8
 
 # Copy application dependency manifests to the container image.
 # Copying this separately prevents re-running pip install on every code change.

cloud-sql/postgres/sqlalchemy/requirements.txt

@@ -1,3 +1,4 @@
 Flask==1.1.1
-SQLAlchemy==1.3.12
-pg8000==1.13.2
+SQLAlchemy==1.3.13
+pg8000==1.13.2; python_version > '3.0'
+pg8000==1.12.5; python_version < '3.0'

composer/workflows/kubernetes_pod_operator.py

@@ -78,7 +78,7 @@
         # project-id as the gcr.io images and the service account that Composer
         # uses has permission to access the Google Container Registry
         # (the default service account has permission)
-        image='gcr.io/gcp-runtimes/ubuntu_16_0_4')
+        image='gcr.io/gcp-runtimes/ubuntu_18_0_4')
     # [END composer_kubernetespodoperator_minconfig]
     # [START composer_kubernetespodoperator_templateconfig]
     kubenetes_template_ex = kubernetes_pod_operator.KubernetesPodOperator(

composer/workflows/requirements.txt

@@ -1,4 +1,6 @@
 apache-airflow[gcp]==1.10.6
 kubernetes==10.0.1
-scipy==1.4.1
-numpy==1.17.4
+scipy==1.4.1; python_version > '3.0'
+scipy==1.2.3; python_version < '3.0'
+numpy==1.17.4; python_version > '3.0'
+numpy==1.16.6; python_version < '3.0'

dataflow/encryption-keys/requirements.txt

@@ -1 +1 @@
-apache-beam[gcp]==2.17.0
+apache-beam[gcp]==2.19.0

endpoints/README.md

@@ -0,0 +1,8 @@
+## Google Cloud Endpoints Examples
+
+The files in this directory are referenced from [Google Cloud Endpoints Documentation](https://cloud.google.com/endpoints/docs/).
+
+### CA File
+
+`roots.pem` is copied from [github.com/grpc/grpc](https://github.com/grpc/grpc/blob/master/etc/roots.pem).
+This file should be updated regularly.

endpoints/bookstore-grpc/Dockerfile

@@ -17,6 +17,4 @@ ADD . /bookstore/
 WORKDIR /bookstore
 RUN pip install -r requirements.txt
 
-EXPOSE 8000
-
 ENTRYPOINT ["python", "/bookstore/bookstore_server.py"]

endpoints/bookstore-grpc/bookstore_client.py

@@ -22,10 +22,15 @@
 import bookstore_pb2_grpc
 
 
-def run(host, port, api_key, auth_token, timeout):
+def run(host, port, api_key, auth_token, timeout, use_tls):
     """Makes a basic ListShelves call against a gRPC Bookstore server."""
 
-    channel = grpc.insecure_channel('{}:{}'.format(host, port))
+    if use_tls:
+        with open('../roots.pem', 'rb') as f:
+            creds = grpc.ssl_channel_credentials(f.read())
+        channel = grpc.secure_channel('{}:{}'.format(host, port), creds)
+    else:
+        channel = grpc.insecure_channel('{}:{}'.format(host, port))
 
     stub = bookstore_pb2_grpc.BookstoreStub(channel)
     metadata = []
@@ -52,5 +57,8 @@ def run(host, port, api_key, auth_token, timeout):
     parser.add_argument(
         '--auth_token', default=None,
         help='The JWT auth token to use for the call')
+    parser.add_argument(
+        '--use_tls', type=bool, default=False,
+        help='Enable when the server requires TLS')
     args = parser.parse_args()
-    run(args.host, args.port, args.api_key, args.auth_token, args.timeout)
+    run(args.host, args.port, args.api_key, args.auth_token, args.timeout, args.use_tls)

endpoints/bookstore-grpc/bookstore_server.py

@@ -17,6 +17,7 @@
 import argparse
 from concurrent import futures
 import time
+import os
 
 from google.protobuf import struct_pb2
 import grpc
@@ -109,6 +110,8 @@ def serve(port, shutdown_grace_duration):
     server.add_insecure_port('[::]:{}'.format(port))
     server.start()
 
+    print('Listening on port {}'.format(port))
+
     try:
         while True:
             time.sleep(_ONE_DAY_IN_SECONDS)
@@ -121,11 +124,20 @@ def serve(port, shutdown_grace_duration):
         description=__doc__,
         formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument(
-        '--port', type=int, default=8000, help='The port to listen on')
+        '--port', type=int, default=None,
+        help='The port to listen on.'
+             'If arg is not set, will listen on the $PORT env var.'
+             'If env var is empty, defaults to 8000.')
     parser.add_argument(
         '--shutdown_grace_duration', type=int, default=5,
         help='The shutdown grace duration, in seconds')
 
     args = parser.parse_args()
 
-    serve(args.port, args.shutdown_grace_duration)
+    port = args.port
+    if not port:
+        port = os.environ.get('PORT')
+    if not port:
+        port = 8000
+
+    serve(port, args.shutdown_grace_duration)