Merge remote-tracking branch 'origin/demosite-app-recaptcha' into demosite-app-recaptcha

Sita04 · Sita04 · commit d66aa837a27a · 2023-02-17T15:06:31.000-05:00
diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
@@ -156,7 +156,7 @@ RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/ge
   # https://github.com/docker-library/python/pull/100
   && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ]
 
-# Ensure Pip for all python3 versions
+# Ensure Pip for all python3 versions.
 RUN python3.9 /tmp/get-pip.py
 RUN python3.8 /tmp/get-pip.py
 RUN python3.7 /tmp/get-pip.py
diff --git a/.kokoro/lint/common.cfg b/.kokoro/lint/common.cfg
@@ -44,8 +44,3 @@ env_vars: {
     key: "RUN_TESTS_SESSION"
     value: "lint"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python2.7/common.cfg b/.kokoro/python2.7/common.cfg
@@ -52,8 +52,3 @@ env_vars: {
     key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
     value: "python-docs-samples-tests"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.10/common.cfg b/.kokoro/python3.10/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.7/common.cfg b/.kokoro/python3.7/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.8/common.cfg b/.kokoro/python3.8/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.9/common.cfg b/.kokoro/python3.9/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.trampolinerc b/.trampolinerc
@@ -47,7 +47,7 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
 fi
 
 if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
-    TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
+    TRAMPOLINE_DOCKERFILE=""
 fi
 
 if [[ -z "${RUN_TESTS_SESSION:-}" ]]; then
diff --git a/appengine/flexible/websockets/requirements.txt b/appengine/flexible/websockets/requirements.txt
@@ -2,4 +2,4 @@ Flask==1.1.4 # it seems like Flask-sockets doesn't play well with 2.0+
 Flask-Sockets==0.2.1
 gunicorn==20.1.0
 requests==2.27.1
-markupsafe==2.0.1
+markupsafe===2.0.1
diff --git a/appengine/standard/endpoints-frameworks-v2/echo/requirements-test.txt b/appengine/standard/endpoints-frameworks-v2/echo/requirements-test.txt
@@ -1,3 +1,3 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock==3.0.5; python_version < '3.0'
+mock===3.0.5; python_version < '3.0'
diff --git a/appengine/standard/endpoints-frameworks-v2/quickstart/requirements-test.txt b/appengine/standard/endpoints-frameworks-v2/quickstart/requirements-test.txt
@@ -1,3 +1,3 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock==3.0.5; python_version < '3.0'
+mock===3.0.5; python_version < '3.0'
diff --git a/appengine/standard/firebase/firenotes/backend/requirements-test.txt b/appengine/standard/firebase/firenotes/backend/requirements-test.txt
@@ -1,3 +1,3 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock==3.0.5; python_version < '3.0'
+mock===3.0.5; python_version < '3.0'
diff --git a/appengine/standard/firebase/firetactoe/requirements-test.txt b/appengine/standard/firebase/firetactoe/requirements-test.txt
@@ -1,4 +1,4 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
 WebTest==2.0.35; python_version < '3.0'
-mock==3.0.5; python_version < "3"
+mock===3.0.5; python_version < "3"
diff --git a/appengine/standard/mailgun/requirements-test.txt b/appengine/standard/mailgun/requirements-test.txt
@@ -1,5 +1,5 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
 google-api-python-client==1.12.11; python_version < '3.0'
-mock==3.0.5; python_version < '3.0'
+mock===3.0.5; python_version < '3.0'
 WebTest==2.0.35; python_version < '3.0'
diff --git a/appengine/standard/migration/memorystore/requirements-test.txt b/appengine/standard/migration/memorystore/requirements-test.txt
@@ -1,4 +1,4 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock==4.0.3; python_version > '3.0'
-mock==3.0.5; python_version < '3.0'
+mock==5.0.1; python_version > '3.0'
+mock===3.0.5; python_version < '3.0'
diff --git a/appengine/standard/sendgrid/requirements-test.txt b/appengine/standard/sendgrid/requirements-test.txt
@@ -1,4 +1,4 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock==3.0.5; python_version < '3.0'
+mock===3.0.5; python_version < '3.0'
 WebTest==2.0.35; python_version < '3.0'
diff --git a/auth/api-client/requirements-test.txt b/auth/api-client/requirements-test.txt
@@ -1,3 +1,3 @@
 pytest==7.1.2
-mock==4.0.3
-backoff==2.2.1
+mock==5.0.1
+backoff==2.2.1
diff --git a/auth/cloud-client/requirements-test.txt b/auth/cloud-client/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
diff --git a/bigquery/bqml/requirements-test.txt b/bigquery/bqml/requirements-test.txt
@@ -1,3 +1,3 @@
 flaky==3.7.0
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/bigquery/bqml/requirements.txt b/bigquery/bqml/requirements.txt
@@ -5,4 +5,4 @@ pandas==1.3.5; python_version > '3.6'
 # pyarrow must stay under 8
 pyarrow==7.0.0
 flaky==3.7.0
-mock==4.0.3
+mock==5.0.1
diff --git a/bigquery/pandas-gbq-migration/requirements-test.txt b/bigquery/pandas-gbq-migration/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
diff --git a/composer/2022_airflow_summit/requirements-test.txt b/composer/2022_airflow_summit/requirements-test.txt
@@ -1,4 +1,4 @@
 pytest==7.0.1
 cloud-composer-dag-test-utils==1.0.0
-markupsafe==2.0.1
+markupsafe==2.1.2
 backoff==2.0.1
diff --git a/composer/functions/requirements-test.txt b/composer/functions/requirements-test.txt
@@ -1,2 +1,2 @@
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/compute/auth/requirements-test.txt b/compute/auth/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
diff --git a/compute/metadata/requirements-test.txt b/compute/metadata/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
diff --git a/contact-center-insights/snippets/requirements.txt b/contact-center-insights/snippets/requirements.txt
@@ -1,3 +1,3 @@
 google-api-core==2.11.0
 google-cloud-bigquery==3.5.0
-google-cloud-contact-center-insights==1.6.1
+google-cloud-contact-center-insights==1.7.0
diff --git a/containeranalysis/snippets/requirements.txt b/containeranalysis/snippets/requirements.txt
@@ -3,4 +3,4 @@ google-cloud-containeranalysis==2.10.0
 grafeas==1.6.1
 pytest==7.2.0
 flaky==3.7.0
-mock==4.0.3
+mock==5.0.1
diff --git a/contentwarehouse/snippets/requirements-test.txt b/contentwarehouse/snippets/requirements-test.txt
@@ -1,3 +1,3 @@
 pytest==7.2.0
-mock==5.0.0
+mock==5.0.1
 google-cloud-resource-manager==1.8.0
diff --git a/documentai/snippets/requirements-test.txt b/documentai/snippets/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.2.0
-mock==5.0.0
+mock==5.0.1
diff --git a/error_reporting/fluent_on_compute/requirements-test.txt b/error_reporting/fluent_on_compute/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.2.0
-mock==4.0.3
+mock==5.0.1
diff --git a/functions/firebase/requirements-test.txt b/functions/firebase/requirements-test.txt
@@ -1,2 +1,2 @@
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/functions/helloworld/requirements-test.txt b/functions/helloworld/requirements-test.txt
@@ -1,4 +1,4 @@
 functions-framework==3.2.1
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
 uuid==1.30
diff --git a/functions/imagemagick/requirements-test.txt b/functions/imagemagick/requirements-test.txt
@@ -1,2 +1,2 @@
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/functions/ocr/app/requirements-test.txt b/functions/ocr/app/requirements-test.txt
@@ -1,2 +1,2 @@
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/functions/pubsub/requirements-test.txt b/functions/pubsub/requirements-test.txt
@@ -1,2 +1,2 @@
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/functions/security/requirements-test.txt b/functions/security/requirements-test.txt
@@ -1,3 +1,3 @@
 flask==2.1.0
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/functions/slack/requirements-test.txt b/functions/slack/requirements-test.txt
@@ -1,2 +1,2 @@
-mock==4.0.3
+mock==5.0.1
 pytest==7.0.1
diff --git a/functions/v2/imagemagick/requirements-test.txt b/functions/v2/imagemagick/requirements-test.txt
@@ -1,4 +1,4 @@
-mock==4.0.3
+mock==5.0.1
 six==1.16.0
 uuid==1.30
 pytest==7.0.1
diff --git a/functions/v2/ocr/requirements-test.txt b/functions/v2/ocr/requirements-test.txt
@@ -1,3 +1,3 @@
 cloudevents==1.6.2
-mock==4.0.3
+mock==5.0.1
 pytest==7.2.0
diff --git a/iot/api-client/gcs_file_to_device/requirements-test.txt b/iot/api-client/gcs_file_to_device/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
diff --git a/monitoring/snippets/v3/cloud-client/requirements-test.txt b/monitoring/snippets/v3/cloud-client/requirements-test.txt
@@ -1,3 +1,3 @@
 backoff==2.2.1
 pytest==7.2.0
-mock==4.0.3
+mock==5.0.1
diff --git a/people-and-planet-ai/timeseries-classification/requirements-test.txt b/people-and-planet-ai/timeseries-classification/requirements-test.txt
@@ -1,3 +1,3 @@
-google-api-python-client==2.47.0
-pytest-xdist==2.5.0
-pytest==7.0.1
+google-api-python-client==2.76.0
+pytest-xdist==3.1.0
+pytest==7.2.1
diff --git a/people-and-planet-ai/timeseries-classification/requirements.txt b/people-and-planet-ai/timeseries-classification/requirements.txt
@@ -1,6 +1,6 @@
-Flask==2.1.0
-apache-beam[gcp]==2.35.0
-google-cloud-aiplatform==1.12.1
+Flask==2.2.2
+apache-beam[gcp]==2.44.0
+google-cloud-aiplatform==1.21.0
 gunicorn==20.1.0
-pandas==1.3.5
-tensorflow==2.9.1
+pandas==1.5.3
+tensorflow==2.9.3
diff --git a/recaptchaenterprise/samples/demosite/app/static/scripts/component.js b/recaptchaenterprise/samples/demosite/app/static/scripts/component.js
@@ -1555,7 +1555,7 @@ class RecaptchaDemo extends LitElement {
               class="documentation"
               href="https://cloud.google.com/recaptcha-enterprise/docs/instrument-web-pages#html-button"
               target="_blank"
-              ><span>Learn more about adding reCATPCHA on an HTML button</span
+              ><span>Learn more about adding reCAPTCHA on an HTML button</span
               ><mwc-icon>launch</mwc-icon></a
             >
           </section>
diff --git a/recaptchaenterprise/samples/demosite/app/static/styles/local.css b/recaptchaenterprise/samples/demosite/app/static/styles/local.css
@@ -11,4 +11,4 @@
   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.
-*/
+*/
diff --git a/recaptchaenterprise/samples/demosite/app/urls.py b/recaptchaenterprise/samples/demosite/app/urls.py
@@ -15,9 +15,10 @@
 import json
 import os
 
+from flask import jsonify, render_template, request, Response
+
 from backend import create_recaptcha_assessment
 
-from flask import jsonify, render_template, request, Response
 
 context = {
     "project_id": os.environ["GOOGLE_CLOUD_PROJECT"],
diff --git a/recaptchaenterprise/samples/demosite/docker-compose.yaml b/recaptchaenterprise/samples/demosite/docker-compose.yaml
@@ -25,6 +25,7 @@ services:
         - "GOOGLE_CLOUD_PROJECT=${GOOGLE_CLOUD_PROJECT}"
         - "SITE_KEY=${SITE_KEY}"
     command: gunicorn main:app --workers 4 --name main --reload -b 0.0.0.0:8080
+    user: "${DOCKER_COMPOSE_USER}"
     ports: ["8080:8080"]
     volumes:
       - "./app:/app"
diff --git a/run/deployment-previews/requirements-test.txt b/run/deployment-previews/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
diff --git a/run/image-processing/requirements-test.txt b/run/image-processing/requirements-test.txt
@@ -1,3 +1,3 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1
 google-cloud-pubsub==2.9.0
diff --git a/speech/microphone/requirements.txt b/speech/microphone/requirements.txt
@@ -1,4 +1,4 @@
-google-cloud-speech==2.16.2
+google-cloud-speech==2.17.3
 pyaudio==0.2.13
 six==1.16.0
 
diff --git a/speech/snippets/requirements.txt b/speech/snippets/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-speech==2.16.2
+google-cloud-speech==2.17.3
 google-cloud-storage==2.7.0
diff --git a/trace/cloud-trace-demo-app-opentelemetry/app/requirements-test.txt b/trace/cloud-trace-demo-app-opentelemetry/app/requirements-test.txt
@@ -1,2 +1,2 @@
 pytest==7.0.1
-mock==4.0.3
+mock==5.0.1

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,3 @@ env_vars: {`
`44`	`44`	`key: "RUN_TESTS_SESSION"`
`45`	`45`	`value: "lint"`
`46`	`46`	`}`
`47`		`-`
`48`		`-env_vars: {`
`49`		`- key: "TRAMPOLINE_DOCKERFILE"`
`50`		`- value: ".kokoro/docker/Dockerfile"`
`51`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,3 @@ env_vars: {`
`52`	`52`	`key: "BUILD_SPECIFIC_GCLOUD_PROJECT"`
`53`	`53`	`value: "python-docs-samples-tests"`
`54`	`54`	`}`
`55`		`-`
`56`		`-env_vars: {`
`57`		`- key: "TRAMPOLINE_DOCKERFILE"`
`58`		`- value: ".kokoro/docker/Dockerfile"`
`59`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,3 @@ env_vars: {`
`59`	`59`	`key: "NUM_TEST_WORKERS"`
`60`	`60`	`value: "10"`
`61`	`61`	`}`
`62`		`-`
`63`		`-env_vars: {`
`64`		`- key: "TRAMPOLINE_DOCKERFILE"`
`65`		`- value: ".kokoro/docker/Dockerfile"`
`66`		`-}`