Merge remote-tracking branch 'upstream/master'

noerog · noerog · commit 5fcd89197fbc · 2020-06-26T13:42:36.000-04:00
diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
@@ -15,7 +15,7 @@
 # Sometimes renovate tries to update it to 16.10. I don't think it's
 # worthwhile because 16.04 is an LTS release. Maybe we should think
 # about upgrading to 18.04 (the next LTS) instead.
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -34,7 +34,9 @@ RUN apt-get update \
     build-essential \
     ca-certificates \
     curl \
+    dirmngr \
     git \
+    gpg-agent \
     graphviz \
     libbz2-dev \
     libdb5.3-dev \
@@ -51,6 +53,7 @@ RUN apt-get update \
     software-properties-common \
     ssh \
     sudo \
+    systemd \
     tcl \
     tcl-dev \
     tk \
@@ -91,18 +94,12 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
   && rm -rf /var/lib/apt/lists/* \
   && rm -f /var/cache/apt/archives/*.deb
 
+COPY fetch_gpg_keys.sh /tmp
 # Install the desired versions of Python.
 RUN set -ex \
     && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
-      # 2.7.17 (Benjamin Peterson)
-      C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF \
-      # 3.4.10, 3.5.9 (Larry Hastings)
-      97FC712E4C024BBEA48A61ED3A5CA953F73C700D \
-      # 3.6.9, 3.7.5 (Ned Deily)
-      0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D \
-      # 3.8.0 (Łukasz Langa)
-      E3FF2839C048B25C084DEBE9B26995E310250568 \
+    && echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
+    && /tmp/fetch_gpg_keys.sh \
     && for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3; do \
         wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
         && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -123,7 +120,7 @@ RUN set -ex \
         && make install \
         && ldconfig \
   ; done \
-  && rm -r "${GNUPGHOME}" \
+  && rm -rf "${GNUPGHOME}" \
   && rm -rf /usr/src/python* \
   && rm -rf ~/.cache/
 
diff --git a/.kokoro/docker/fetch_gpg_keys.sh b/.kokoro/docker/fetch_gpg_keys.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# Copyright 2020 Google LLC
+#
+# 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.
+
+# A script to fetch gpg keys with retry.
+
+function retry {
+    if [[ "${#}" -le 1 ]]; then
+	echo "Usage: ${0} retry_count commands.."
+	exit 1
+    fi
+    local retries=${1}
+    local command="${@:2}"
+    until [[ "${retries}" -le 0 ]]; do
+	$command && return 0
+	if [[ $? -ne 0 ]]; then
+	    echo "command failed, retrying"
+	    ((retries--))
+	fi
+    done
+    return 1
+}
+
+# 2.7.17 (Benjamin Peterson)
+retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+      C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
+
+# 3.4.10, 3.5.9 (Larry Hastings)
+retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+      97FC712E4C024BBEA48A61ED3A5CA953F73C700D
+
+# 3.6.9, 3.7.5 (Ned Deily)
+retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+      0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
+
+# 3.8.0 (Łukasz Langa)
+retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+      E3FF2839C048B25C084DEBE9B26995E310250568
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -120,15 +120,16 @@ PROGRAM_PATH="$(realpath "$0")"
 PROGRAM_DIR="$(dirname "${PROGRAM_PATH}")"
 PROJECT_ROOT="$(repo_root "${PROGRAM_DIR}")"
 
-RUNNING_IN_CI="false"
-TRAMPOLINE_V2="true"
+RUNNING_IN_CI="${RUNNING_IN_CI:-false}"
+TRAMPOLINE_VERSION="2.0.0"
 
 # The workspace in the container, defaults to /workspace.
 TRAMPOLINE_WORKSPACE="${TRAMPOLINE_WORKSPACE:-/workspace}"
 
-# If it's running on Kokoro, RUNNING_IN_CI will be true and
-# TRAMPOLINE_CI is set to 'kokoro'. Both envvars will be passing down
-# to the container for telling which CI system we're in.
+# Detect which CI systems we're in. If we're in any of the CI systems
+# we support, `RUNNING_IN_CI` will be true and `TRAMPOLINE_CI` will be
+# the name of the CI system. Both envvars will be passing down to the
+# container for telling which CI system we're in.
 if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then
     # descriptive env var for indicating it's on CI.
     RUNNING_IN_CI="true"
@@ -137,6 +138,9 @@ if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then
     log_yellow "Configuring Container Registry access"
     gcloud auth list
     gcloud auth configure-docker --quiet
+elif [[ "${TRAVIS:-}" == "true" ]]; then
+    RUNNING_IN_CI="true"
+    TRAMPOLINE_CI="travis"
 fi
 
 # Configure the service account for pulling the docker image.
@@ -171,8 +175,8 @@ pass_down_envvars=(
     "RUNNING_IN_CI"
     # Indicates which CI system we're in.
     "TRAMPOLINE_CI"
-    # Indicates we're running trampoline_v2.
-    "TRAMPOLINE_V2"
+    # Indicates the version of the script.
+    "TRAMPOLINE_VERSION"
     # KOKORO dynamic variables.
     "KOKORO_BUILD_NUMBER"
     "KOKORO_BUILD_ID"
@@ -249,12 +253,28 @@ if [[ "${TRAMPOLINE_DOCKERFILE:-none}" != "none" ]]; then
     if [[ "${TRAMPOLINE_SHOW_COMMAND:-false}" == "true" ]]; then
 	echo "docker build" "${docker_build_flags[@]}" "${context_dir}"
     fi
-    if docker build "${docker_build_flags[@]}" "${context_dir}"; then
-	log_green "Finished building the docker image."
-	update_cache="true"
+
+    # ON CI systems, we want to suppress docker build logs, only
+    # output the logs when it fails.
+    if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then
+	if docker build "${docker_build_flags[@]}" "${context_dir}" \
+		  > "${tmpdir}/docker_build.log" 2>&1; then
+	    log_green "Finished building the docker image."
+	    update_cache="true"
+	else
+	    log_red "Failed to build the Docker image, aborting."
+	    log_yellow "Dumping the build logs:"
+	    cat "${tmpdir}/docker_build.log"
+	    exit 1
+	fi
     else
-	log_red "Failed to build the Docker image. Aborting."
-	exit 1
+	if docker build "${docker_build_flags[@]}" "${context_dir}"; then
+	    log_green "Finished building the docker image."
+	    update_cache="true"
+	else
+	    log_red "Failed to build the Docker image, aborting."
+	    exit 1
+	fi
     fi
 else
     if [[ "${has_cache}" != "true" ]]; then
diff --git a/AUTHORING_GUIDE.md b/AUTHORING_GUIDE.md
@@ -532,6 +532,13 @@ $ ../scripts/run_tests_local.sh . lint
 If your test needs a service account, you have to create a service
 account and download the JSON key to `testing/service-account.json`.
 
+On MacOS systems, you also need to install `coreutils` to use
+`scripts/run_tests_local.sh`. Here is how to install it with `brew`:
+
+```sh
+$ brew install coreutils
+```
+
 ### Google Cloud Storage Resources
 
 Certain samples require integration with Google Cloud Storage (GCS), most
diff --git a/appengine/flexible/sendgrid/requirements.txt b/appengine/flexible/sendgrid/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.2
-sendgrid==6.3.1
+sendgrid==6.4.1
 gunicorn==20.0.4
diff --git a/appengine/flexible/twilio/requirements.txt b/appengine/flexible/twilio/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.2
 gunicorn==20.0.4
-twilio==6.42.0
+twilio==6.43.0
diff --git a/appengine/standard/sendgrid/requirements.txt b/appengine/standard/sendgrid/requirements.txt
@@ -1 +1 @@
-sendgrid==6.3.1
+sendgrid==6.4.1
diff --git a/appengine/standard_python3/spanner/requirements.txt b/appengine/standard_python3/spanner/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-spanner==1.17.0
+google-cloud-spanner==1.17.1
 Flask==1.1.2
diff --git a/appengine/standard_python37/spanner/requirements.txt b/appengine/standard_python37/spanner/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-spanner==1.17.0
+google-cloud-spanner==1.17.1
 Flask==1.1.2
diff --git a/functions/spanner/requirements.txt b/functions/spanner/requirements.txt
@@ -1 +1 @@
-google-cloud-spanner==1.17.0
+google-cloud-spanner==1.17.1
diff --git a/run/README.md b/run/README.md
@@ -15,6 +15,8 @@ This directory contains samples for [Google Cloud Run](https://cloud.run). [Clou
 |[Cloud Pub/Sub][pubsub] | Handling Pub/Sub push messages | [<img src="https://storage.googleapis.com/cloudrun/button.svg" alt="Run on Google Cloud" height="30">][run_button_pubsub] |
 |[Cloud SQL (MySQL)][mysql]        | Use MySQL with Cloud Run    |      -        |
 |[Cloud SQL (Postgres)][postgres]  | Use Postgres with Cloud Run |      -        |
+|[Events – Pub/Sub][events_pubsub]  | Event-driven service with Events for Cloud Run for Pub/Sub	|      -        |
+|[Events – GCS][events_storage]  | Event-driven service with Events for Cloud Run for GCS	 |      -        |
 
 For more Cloud Run samples beyond Python, see the main list in the [Cloud Run Samples repository](https://github.com/GoogleCloudPlatform/cloud-run-samples).
 
@@ -109,6 +111,8 @@ for more information.
 [pubsub]: pubsub/
 [mysql]: ../cloud-sql/mysql/sqlalchemy
 [postgres]: ../cloud-sql/postgres/sqlalchemy
+[events_pubsub]: events-pubsub/
+[events_storage]: events-storage/
 [run_button_helloworld]: https://deploy.cloud.run/?git_repo=https://github.com/knative/docs&dir=docs/serving/samples/hello-world/helloworld-python
 [run_button_pubsub]: https://deploy.cloud.run/?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&dir=run/pubsub
 [testing]: https://cloud.google.com/run/docs/testing/local#running_locally_using_docker_with_access_to_services
diff --git a/run/events-storage/Dockerfile b/run/events-storage/Dockerfile
diff --git a/run/events-storage/README.md b/run/events-storage/README.md
diff --git a/run/events-storage/main.py b/run/events-storage/main.py
diff --git a/run/events-storage/main_test.py b/run/events-storage/main_test.py
diff --git a/run/events-storage/requirements-test.txt b/run/events-storage/requirements-test.txt
diff --git a/run/events-storage/requirements.txt b/run/events-storage/requirements.txt
diff --git a/spanner/cloud-client/requirements.txt b/spanner/cloud-client/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-spanner==1.17.0
+google-cloud-spanner==1.17.1
 futures==3.3.0; python_version < "3"
diff --git a/storage/s3-sdk/requirements.txt b/storage/s3-sdk/requirements.txt
@@ -1 +1 @@
-boto3==1.14.9
+boto3==1.14.11
diff --git a/vision/automl/edge_container_predict/automl_vision_edge_container_predict_test.py b/vision/automl/edge_container_predict/automl_vision_edge_container_predict_test.py
@@ -59,7 +59,7 @@ def edge_container_predict_server_port():
         ['docker', 'pull', CPU_DOCKER_GCS_PATH],
         env={'DOCKER_API_VERSION': '1.38'})
 
-    if os.environ.get('TRAMPOLINE_V2') == 'true':
+    if os.environ.get('TRAMPOLINE_VERSION'):
         # Use /tmp
         model_path = tempfile.TemporaryDirectory()
     else:

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-google-cloud-spanner==1.17.0`
	`1`	`+google-cloud-spanner==1.17.1`
`2`	`2`	`Flask==1.1.2`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-google-cloud-spanner==1.17.0`
	`1`	`+google-cloud-spanner==1.17.1`