Merge remote-tracking branch 'upstream/master'

Author: noerog

.github/CODEOWNERS

@@ -9,56 +9,60 @@
 # explicitly taken by someone else.
 *                               @GoogleCloudPlatform/python-samples-owners
 
-/auth/                          @busunkim96 @GoogleCloudPlatform/python-samples-owners
-/automl/                        @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/bigquery/                      @shollyman @GoogleCloudPlatform/python-samples-owners
-/bigquery_storage/              @shollyman @GoogleCloudPlatform/python-samples-owners
-/bigtable/                      @GoogleCloudPlatform/bigtable-dpe @GoogleCloudPlatform/python-samples-owners
-/blog/                          @GoogleCloudPlatform/python-samples-owners
-/cdn/                           @mpwarres @elithrar @GoogleCloudPlatform/python-samples-owners
-/cloud-sql/                     @GoogleCloudPlatform/cloud-sql-dpes @GoogleCloudPlatform/python-samples-owners
-/codelabs/                      @GoogleCloudPlatform/python-samples-owners
-/composer/                      @leahecole @GoogleCloudPlatform/python-samples-owners
-/compute/                       @djmailhot @GoogleCloudPlatform/python-samples-owners
-/container_registry/            @DanSanche @GoogleCloudPlatform/python-samples-owners
-/datacatalog/                   @shollyman @GoogleCloudPlatform/python-samples-owners
-/dataflow/                      @davidcavazos @GoogleCloudPlatform/python-samples-owners
-/datalabeling/                  @sgreenberg @GoogleCloudPlatform/python-samples-owners
-/dataproc/                      @bradmiro @GoogleCloudPlatform/python-samples-owners
-/datastore/                     @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/python-samples-owners
-/dialogflow/                    @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/dlp/                           @GoogleCloudPlatform/python-samples-owners
-/dns/                           @michaelawyu @GoogleCloudPlatform/python-samples-owners
-/endpoints/                     @DanSanche @GoogleCloudPlatform/python-samples-owners
-/error_reporting/               @GoogleCloudPlatform/python-samples-owners
-/firestore/                     @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/python-samples-owners
-/functions/                     @ace-n @GoogleCloudPlatform/python-samples-owners
-/healthcare/                    @noerog @GoogleCloudPlatform/python-samples-owners
-/iam/                           @melaniedejong @GoogleCloudPlatform/python-samples-owners
-/iap/                           @GoogleCloudPlatform/python-samples-owners
-/iot/                           @gguuss @GoogleCloudPlatform/python-samples-owners
-/jobs/                          @GoogleCloudPlatform/python-samples-owners
-/kms/                           @DanSanche @GoogleCloudPlatform/python-samples-owners
-/kubernetes_engine/             @GoogleCloudPlatform/python-samples-owners
-/language/                      @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/logging/                       @GoogleCloudPlatform/python-samples-owners
-/memorystore/                   @GoogleCloudPlatform/python-samples-owners
-/ml_engine/                     @alecglassford @GoogleCloudPlatform/python-samples-owners
-/monitoring/                    @GoogleCloudPlatform/python-samples-owners
-/notebooks/                     @alixhami @sirtorry @GoogleCloudPlatform/python-samples-owners
-/opencensus/                    @GoogleCloudPlatform/python-samples-owners
-/profiler/                      @jqll @GoogleCloudPlatform/python-samples-owners
-/pubsub/                        @anguillanneuf @hongalex @GoogleCloudPlatform/python-samples-owners
-/run/                           @dinagraves @GoogleCloudPlatform/python-samples-owners
-/scheduler/                     @averikitsch @GoogleCloudPlatform/python-samples-owners
-/spanner/                       @larkee @GoogleCloudPlatform/python-samples-owners
-/speech/                        @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/storage/                       @GoogleCloudPlatform/storage-dpe @GoogleCloudPlatform/python-samples-owners
-/tables/automl/                 @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/tasks/                         @averikitsch @GoogleCloudPlatform/python-samples-owners
-/texttospeech/                  @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/third_party/apache-airflow/    @leahecole @GoogleCloudPlatform/python-samples-owners
-/trace/                         @dukeng @ziweizhao @GoogleCloudPlatform/python-samples-owners
-/translate/                     @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/video/                         @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
-/vision/                        @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/appengine/**/*.py                     @engelke @GoogleCloudPlatform/python-samples-owners
+/auth/**/*.py                            @busunkim96 @GoogleCloudPlatform/python-samples-owners
+/automl/**/*.py                        @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/billing/**/*.py                       @GoogleCloudPlatform/billing-samples-maintainers @GoogleCloudPlatform/python-samples-owners
+/bigquery/**/*.py                      @shollyman @GoogleCloudPlatform/python-samples-owners
+/bigquery_storage/**/*.py              @shollyman @GoogleCloudPlatform/python-samples-owners
+/bigtable/**/*.py                      @GoogleCloudPlatform/bigtable-dpe @GoogleCloudPlatform/python-samples-owners
+/blog/**/*.py                          @GoogleCloudPlatform/python-samples-owners
+/cdn/**/*.py                           @mpwarres @elithrar @GoogleCloudPlatform/python-samples-owners
+/cloud-sql/**/*.py                     @GoogleCloudPlatform/cloud-sql-dpes @GoogleCloudPlatform/python-samples-owners
+/codelabs/**/*.py                      @GoogleCloudPlatform/python-samples-owners
+/composer/**/*.py                      @leahecole @GoogleCloudPlatform/python-samples-owners
+/compute/**/*.py                       @GoogleCloudPlatform/python-samples-owners
+/container_registry/**/*.py            @donmccasland @dinagraves @kelsk @GoogleCloudPlatform/python-samples-owners
+/data-science-onramp/                  @coleleah @bradmiro @GoogleCloudPlatform/python-samples-owners
+/datacatalog/**/*.py                   @shollyman @GoogleCloudPlatform/python-samples-owners
+/dataflow/**/*.py                      @davidcavazos @GoogleCloudPlatform/python-samples-owners
+/datalabeling/**/*.py                  @sgreenberg @GoogleCloudPlatform/python-samples-owners
+/dataproc/**/*.py                      @bradmiro @GoogleCloudPlatform/python-samples-owners
+/datastore/**/*.py                     @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/python-samples-owners
+/dialogflow/**/*.py                    @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/dlp/**/*.py                           @GoogleCloudPlatform/python-samples-owners
+/dns/**/*.py                           @michaelawyu @GoogleCloudPlatform/python-samples-owners
+/endpoints/**/*.py                     @GoogleCloudPlatform/python-samples-owners
+/error_reporting/**/*.py               @GoogleCloudPlatform/python-samples-owners
+/eventarc/**/*.py                      @averikitsch @grant @GoogleCloudPlatform/python-samples-owners
+/firestore/**/*.py                     @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/python-samples-owners
+/functions/**/*.py                     @ace-n @grant @GoogleCloudPlatform/python-samples-owners
+/healthcare/**/*.py                    @noerog @GoogleCloudPlatform/python-samples-owners
+/iam/**/*.py                           @GoogleCloudPlatform/python-samples-owners
+/iap/**/*.py                           @GoogleCloudPlatform/python-samples-owners
+/iot/**/*.py                           @gguuss @GoogleCloudPlatform/python-samples-owners
+/jobs/**/*.py                          @GoogleCloudPlatform/python-samples-owners
+/kms/**/*.py                           @GoogleCloudPlatform/python-samples-owners
+/kubernetes_engine/**/*.py             @GoogleCloudPlatform/python-samples-owners
+/language/**/*.py                      @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/logging/**/*.py                       @simonz130 @GoogleCloudPlatform/python-samples-owners
+/memorystore/**/*.py                   @GoogleCloudPlatform/python-samples-owners
+/ml_engine/**/*.py                     @alecglassford @GoogleCloudPlatform/python-samples-owners
+/monitoring/**/*.py                    @GoogleCloudPlatform/python-samples-owners
+/notebooks/**/*.py                     @alixhami @sirtorry @GoogleCloudPlatform/python-samples-owners
+/opencensus/**/*.py                    @GoogleCloudPlatform/python-samples-owners
+/profiler/**/*.py                      @kalyanac @GoogleCloudPlatform/python-samples-owners
+/pubsub/**/*.py                        @anguillanneuf @hongalex @GoogleCloudPlatform/python-samples-owners
+/run/**/*.py                           @averikitsch @grant @GoogleCloudPlatform/python-samples-owners
+/scheduler/**/*.py                     @averikitsch @GoogleCloudPlatform/python-samples-owners
+/spanner/**/*.py                       @larkee @GoogleCloudPlatform/python-samples-owners
+/speech/**/*.py                        @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/storage/**/*.py                       @GoogleCloudPlatform/storage-dpe @GoogleCloudPlatform/python-samples-owners
+/tables/automl/**/*.py                 @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/tasks/**/*.py                         @averikitsch @GoogleCloudPlatform/python-samples-owners
+/texttospeech/**/*.py                  @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/third_party/apache-airflow/**/*.py    @leahecole @GoogleCloudPlatform/python-samples-owners
+/trace/**/*.py                         @dukeng @ziweizhao @GoogleCloudPlatform/python-samples-owners
+/translate/**/*.py                     @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/video/**/*.py                         @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
+/vision/**/*.py                        @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,8 +7,9 @@ Note: It's a good idea to open an issue first for discussion.
 ## Checklist
 - [ ] I have followed [Sample Guidelines from AUTHORING_GUIDE.MD](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md)
 - [ ] README is updated to include [all relevant information](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#readme-file)
-- [ ] **Tests** pass:   `nox -s py-3.6` (see [Test Enviroment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup))
-- [ ] **Lint** pass:   `nox -s lint` (see [Test Enviroment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup))
+- [ ] **Tests** pass:   `nox -s py-3.6` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup))
+- [ ] **Lint** pass:   `nox -s lint` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup))
 - [ ] These samples need a new **API enabled** in testing projects to pass (let us know which ones)
 - [ ] These samples need a new/updated **env vars** in testing projects set to pass (let us know which ones)
 - [ ] Please **merge** this PR for me once it is approved.
+- [ ] This sample adds a new sample directory, and I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/.github/CODEOWNERS) with the codeowners for this sample

.github/blunderbuss.yml

@@ -1,14 +1,133 @@
+assign_issues_by:
+- labels:
+  - 'api: appengine'
+  to:
+  - engelke
+- labels:
+  - 'api: automl'
+  - 'api: dialogflow'
+  - 'api: language'
+  - 'api: speech'
+  - 'api: texttospeech'
+  - 'api: translate'
+  - 'api: videointelligence'
+  - 'api: vision'
+  to:
+  - sirtorry
+  - telpirion
+- labels:
+  - 'api: dataflow'
+  to:
+  - davidcavazos
+- labels:
+  - 'api: bigquery'
+  - 'api: datacatalog'
+  to:
+  - shollyman
+- labels:
+  - 'api: bigtable'
+  to:
+  - billyjacobson
+- labels:
+  - 'api: billingbudgets'
+  to:
+  - GoogleCloudPlatform/billing-samples-maintainers
+- labels:
+  - 'api: cloudsql'
+  to:
+  - GoogleCloudPlatform/cloud-sql-dpes
+- labels:
+  - 'api: containeranalysis'
+  to:
+  - donmccasland
+  - dinagraves
+  - kelsk
+- labels:
+  - 'api: datalabeling'
+  - 'api: iot'
+  to:
+  - sgreenberg
+- labels:
+  - 'api: dataproc'
+  to:
+  - bradmiro
+- labels:
+  - 'api: datastore'
+  - 'api: firestore'
+  to:
+  - GoogleCloudPlatform/firestore-dpe
+- labels:
+  - 'api: dns'
+  to:
+  - michaelawyu
+- labels:
+  - 'api: functions'
+  to:
+  - ace-n
+  - grant
+- labels:
+  - 'api: healthcare'
+  to:
+  - noerog
+- labels:
+  - 'api: logging'
+  to:
+  - simonz130
+- labels:
+  - 'api: ml'
+  to:
+  - alecglassford
+- labels:
+  - 'api: notebooks'
+  to:
+  - sirtorry
+- labels:
+  - 'api: cloudprofiler'
+  to:
+  - kalyanac
+- labels:
+  - 'api: pubsub'
+  to:
+  - anguillanneuf
+- labels:
+  - 'api: run'
+  to:
+  - averikitsch
+  - grant
+- labels:
+  - 'api: cloudscheduler'
+  - 'api: cloudtasks'
+  - 'api: tasks'
+  to:
+  - averikitsch
+- labels:
+  - 'api: spanner'
+  to:
+  - larkee
+- labels:
+  - 'api: storage'
+  to:
+  - GoogleCloudPlatform/storage-dpe
+- labels:
+  - 'api: cloudtrace'
+  - 'api: trace'
+  to:
+  - dukeng
+  - ziweizhao
+
+
 assign_issues:
   - busunkim96
-  - kurtisvg
   - leahecole
-  - gguuss
-  - crwilcox
   - tmatsuo
+  - engelke
+  - kurtisvg
+  - dinagraves
+
 assign_prs:
   - busunkim96
-  - kurtisvg
   - leahecole
-  - gguuss
-  - crwilcox
   - tmatsuo
+  - engelke
+  - kurtisvg
+  - dinagraves

appengine/standard_python37/django/mysite/__init__.py renamed to .github/snippet-bot.yml

@@ -148,7 +148,7 @@ RUN rm /tmp/get-pip.py
 RUN pip install --no-cache-dir virtualenv
 
 # Setup Cloud SDK
-ENV CLOUD_SDK_VERSION 293.0.0
+ENV CLOUD_SDK_VERSION 304.0.0
 # Use system python for cloud sdk.
 ENV CLOUDSDK_PYTHON python3.6
 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz

.kokoro/docker/Dockerfile

@@ -24,3 +24,9 @@ env_vars: {
     key: "REPORT_TO_BUILD_COP_BOT"
     value: "true"
 }
+
+# Tell Trampoline to upload the Docker image after successfull build.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE_UPLOAD"
+    value: "true"
+}

.kokoro/python3.6/periodic.cfg

@@ -24,3 +24,16 @@ env_vars: {
     key: "REPORT_TO_BUILD_COP_BOT"
     value: "true"
 }
+
+# Run DRIFT test result injection
+# (only for Python 3.7 builds)
+env_vars: {
+    key: "INJECT_REGION_TAGS"
+    value: "true"
+}
+
+# Tell Trampoline to upload the Docker image after successfull build.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE_UPLOAD"
+    value: "true"
+}

.kokoro/python3.7/periodic.cfg

@@ -41,6 +41,36 @@ fi
 nox -s "$RUN_TESTS_SESSION"
 EXIT=$?
 
+echo "PWD: ${PWD}"
+
+# Inject region tag data into the test log
+set +e  # Don't fail the entire test if this step fails
+if [[ "${INJECT_REGION_TAGS:-}" == "true" ]]; then
+
+    export XUNIT_PATH="$PWD/sponge_log.xml"
+    export XUNIT_TMP_PATH="$(mktemp)"
+
+    if [[ -f "$XUNIT_PATH" ]]; then
+        echo "=== Injecting region tags into XUnit output ==="
+        echo "Processing XUnit output file: $XUNIT_PATH (saving output to $XUNIT_TMP_PATH)"
+
+	# We use `python3` because it will work even if we remove old
+	# python versions from the docker image.
+	echo "Calling python3 ${PARSER_PATH} inject-snippet-mapping --output_file ${XUNIT_TMP_PATH} ${PWD}"
+        cat "$XUNIT_PATH" | \
+	    python3 "$PARSER_PATH" inject-snippet-mapping --output_file "$XUNIT_TMP_PATH" "$PWD"
+        if [[ $? -eq 0 ]] && [[ -s "$XUNIT_PATH" ]]; then
+            mv $XUNIT_TMP_PATH $XUNIT_PATH
+        else
+            echo "Region tag injection FAILED; XUnit file not modified."
+        fi
+    else
+        echo "No XUnit output file found!"
+    fi
+    echo "=== Region tag injection complete! ==="
+fi
+set -e
+
 # If REPORT_TO_BUILD_COP_BOT is set to "true", send the test log
 # to the Build Cop Bot.
 # See:

.kokoro/tests/run_single_test.sh

@@ -121,10 +121,32 @@ set +e
 RTN=0
 ROOT=$(pwd)
 
+# Setup DRIFT region tag injector
+# (only run on *some* builds)
+if [[ "${INJECT_REGION_TAGS:-}" == "true" ]]; then
+    echo "=== Setting up DRIFT region tag injector ==="
+    # install PyYaml (used by the DRIFT region tag parsing system)
+    echo "--- Installing PyYaml ---"
+    python3 -m pip install --user pyyaml
+
+    # Use ${HOME} because trampoline will automatically clean up this
+    # directory.
+    export REGION_TAG_PARSER_DIR="${HOME}/region-tag-parser"
+    export PARSER_PATH="${REGION_TAG_PARSER_DIR}/wizard-py/cli.py"
+
+    if [[ ! -f $PARSER_PATH ]]; then
+        echo "--- Fetching injection script from HEAD (via GitHub) ---"
+        git clone https://github.com/GoogleCloudPlatform/repo-automation-playground "$REGION_TAG_PARSER_DIR" --single-branch
+        chmod +x $PARSER_PATH
+    fi
+    echo "=== Region tag injector setup complete ==="
+fi
+
 test_prog="${PROJECT_ROOT}/.kokoro/tests/run_single_test.sh"
 
 btlr_args=(
     "run"
+    "--max-cmd-duration=30m"
     "**/requirements.txt"
 )
 

.kokoro/tests/run_tests.sh

@@ -75,12 +75,16 @@ if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
     ./scripts/decrypt-secrets.sh
 fi
 
-source ./testing/test-env.sh
+if [[ -f ./testing/test-env.sh ]]; then
+    source ./testing/test-env.sh
+fi
 export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/testing/service-account.json
 
 # For cloud-run session, we activate the service account for gcloud sdk.
-gcloud auth activate-service-account \
-       --key-file "${GOOGLE_APPLICATION_CREDENTIALS}"
+if [[ -f "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then
+    gcloud auth activate-service-account \
+	   --key-file "${GOOGLE_APPLICATION_CREDENTIALS}"
+fi
 
 export GOOGLE_CLIENT_SECRETS=$(pwd)/testing/client-secrets.json