Skip to content

Commit 241bd5c

Browse files
gaoshan2002gaoshan2002
authored
Merge branch 'GoogleCloudPlatform:main' into master
2 parents 480e82a + 1a1cfef commit 241bd5c

823 files changed

Lines changed: 32628 additions & 26894 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@
3131
/dns/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
3232
/iam/cloud-client/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
3333
/kms/**/** @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
34-
/media_cdn/**/* @justin-mp @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
34+
/media_cdn/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
3535
/privateca/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
3636
/recaptcha_enterprise/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
3737
/recaptcha_enterprise/demosite/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/recaptcha-customer-obsession-reviewers @GoogleCloudPlatform/python-samples-reviewers
3838
/secretmanager/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
3939
/securitycenter/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
40+
/service_extensions/**/* @GoogleCloudPlatform/service-extensions-samples-reviewers @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
4041
/vmwareengine/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
4142
/webrisk/**/* @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers
4243

@@ -71,6 +72,7 @@
7172
/speech/**/* @GoogleCloudPlatform/cloud-speech-eng @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/python-samples-reviewers
7273
/texttospeech/**/* @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/python-samples-reviewers
7374
/translate/**/* @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/python-samples-reviewers
75+
/videointelligence/**/* @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/python-samples-reviewers
7476
/video/transcoder/* @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/python-samples-reviewers
7577

7678
# Cloud SDK Databases & Data Analytics teams
@@ -82,14 +84,19 @@
8284
/storagetransfer/**/* @GoogleCloudPlatform/cloud-storage-dpes @GoogleCloudPlatform/python-samples-reviewers
8385
# ---* Infra DB
8486
/cloud-sql/**/* @GoogleCloudPlatform/infra-db-sdk @GoogleCloudPlatform/python-samples-reviewers
85-
/cloud_tasks/**/* @GoogleCloudPlatform/infra-db-sdk @GoogleCloudPlatform/python-samples-reviewers
8687

8788
# Self-service
8889
# ---* Shared with DEE Teams
8990
/functions/**/* @GoogleCloudPlatform/functions-framework-google @GoogleCloudPlatform/torus-dpe @GoogleCloudPlatform/python-samples-reviewers
9091
/composer/**/* @GoogleCloudPlatform/cloud-dpes-composer @GoogleCloudPlatform/python-samples-reviewers
9192
/pubsub/**/* @GoogleCloudPlatform/api-pubsub-and-pubsublite @GoogleCloudPlatform/python-samples-reviewers
9293
/pubsublite/**/* @GoogleCloudPlatform/api-pubsub-and-pubsublite @GoogleCloudPlatform/python-samples-reviewers
94+
/cloud_tasks/**/* @GoogleCloudPlatform/torus-dpe @GoogleCloudPlatform/python-samples-reviewers
95+
96+
# For practicing
97+
# ---* Use with codelabs to learn to submit samples
98+
/practice-folder/**/* engelke@google.com
99+
93100
# ---* Fully Eng Owned
94101
/appengine/**/* @GoogleCloudPlatform/serverless-runtimes @GoogleCloudPlatform/python-samples-reviewers
95102
/appengine/standard_python3/spanner/* @GoogleCloudPlatform/api-spanner-python @GoogleCloudPlatform/python-samples-reviewers
@@ -106,6 +113,7 @@
106113
/healthcare/**/* @GoogleCloudPlatform/healthcare-life-sciences @GoogleCloudPlatform/python-samples-reviewers
107114
/retail/**/* @GoogleCloudPlatform/cloud-retail-team @GoogleCloudPlatform/python-samples-reviewers
108115
/billing/**/* @GoogleCloudPlatform/billing-samples-maintainers @GoogleCloudPlatform/python-samples-reviewers
116+
/video/live-stream/* @GoogleCloudPlatform/cloud-media-team @GoogleCloudPlatform/python-samples-reviewers
109117
/video/stitcher/* @GoogleCloudPlatform/cloud-media-team @GoogleCloudPlatform/python-samples-reviewers
110118

111119
# Deprecated
@@ -121,6 +129,7 @@
121129
/vision/**/* @GoogleCloudPlatform/python-samples-reviewers
122130
/workflows/**/* @GoogleCloudPlatform/python-samples-reviewers
123131

132+
124133
# BEGIN - pending clarification
125134
/memorystore/**/* @GoogleCloudPlatform/python-samples-reviewers
126135
/opencensus/**/* @GoogleCloudPlatform/python-samples-reviewers

‎.github/auto-approve.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
# # AutoApproveBot - PythonSampleDependency Process Features:
16+
# - Checks that the author is 'renovate-bot'
17+
# - Checks that the title of the PR matches the regexp:
18+
# - /^(fix|chore)\(deps\): update dependency (@?\S*) to v(\S*)$/
19+
# - Each file path must match one of these regexps:
20+
# - /requirements.txt$/
21+
# - All files must:
22+
# - Match this regexp: /requirements.txt$/
23+
# - Ignore files with path /airflow/, /composer/
24+
# - Only change one dependency, that must be a google dependency
25+
# - Increase the non-major package version of a dependency
26+
# - Change the dependency that was there previously, and that is on the title of the PR
27+
# - Not match any regexes in the 'excluded' list
28+
#
29+
# ReadMe: https://github.com/googleapis/repo-automation-bots/tree/main/packages/auto-approve
30+
# SourceCode: https://github.com/googleapis/repo-automation-bots/blob/main/packages/auto-approve/src/process-checks/python/sample-dependency.ts
31+
processes:
32+
- "PythonSampleDependency"

‎.github/blunderbuss.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,6 @@ assign_issues_by:
145145
- "api: healthcare"
146146
to:
147147
- GoogleCloudPlatform/healthcare-life-sciences
148-
- labels:
149-
- "api: iot"
150-
- "api: cloudiot"
151-
to:
152-
- GoogleCloudPlatform/api-iot
153148
- labels:
154149
- "api: retail"
155150
to:
@@ -163,6 +158,10 @@ assign_issues_by:
163158
to:
164159
- GoogleCloudPlatform/cloud-speech-eng
165160
- GoogleCloudPlatform/dee-data-ai
161+
- labels:
162+
- "api: serviceextensions"
163+
to:
164+
- GoogleCloudPlatform/service-extensions-samples-reviewers
166165

167166
# Self-service individuals
168167
- labels:
@@ -233,14 +232,15 @@ assign_prs_by:
233232
- "api: transcoder"
234233
- "api: translate"
235234
- "api: vision"
235+
- "api: videointelligence"
236236
to:
237237
- GoogleCloudPlatform/dee-data-ai
238238

239239
# AppEco teams
240240
- labels:
241241
- "api: cloudsql"
242242
to:
243-
- GoogleCloudPlatform/infra-db-dpes
243+
- GoogleCloudPlatform/infra-db-sdk
244244
- labels:
245245
- "api: bigtable"
246246
- "api: datastore"
@@ -304,26 +304,26 @@ assign_prs_by:
304304
- "api: healthcare"
305305
to:
306306
- GoogleCloudPlatform/healthcare-life-sciences
307-
- labels:
308-
- "api: iot"
309-
- "api: cloudiot"
310-
to:
311-
- GoogleCloudPlatform/api-iot
312307
- labels:
313308
- "api: retail"
314309
to:
315310
- GoogleCloudPlatform/cloud-retail-team
316311
- labels:
317312
- "api: cloudmedia"
318313
- "api: videostitcher"
314+
- "api: videolivestream"
319315
to:
320316
- GoogleCloudPlatform/cloud-media-team
321317
- labels:
322318
- "api: speech"
323319
to:
324320
- GoogleCloudPlatform/cloud-speech-eng
325321
- GoogleCloudPlatform/dee-data-ai
326-
322+
- labels:
323+
- "api: serviceextensions"
324+
to:
325+
- GoogleCloudPlatform/service-extensions-samples-reviewers
326+
- GoogleCloudPlatform/dee-infra
327327
# Self-service individuals
328328
- labels:
329329
- "api: auth"

iot/api-client/codelabs/run-led-light renamed to .github/flakybot.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
#!/bin/bash
2-
3-
# Copyright 2019 Google LLC
1+
# Copyright 2023 Google LLC
42
#
53
# Licensed under the Apache License, Version 2.0 (the "License");
64
# you may not use this file except in compliance with the License.
75
# You may obtain a copy of the License at
86
#
9-
# https://www.apache.org/licenses/LICENSE-2.0
7+
# http://www.apache.org/licenses/LICENSE-2.0
108
#
119
# Unless required by applicable law or agreed to in writing, software
1210
# distributed under the License is distributed on an "AS IS" BASIS,
1311
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1412
# See the License for the specific language governing permissions and
1513
# limitations under the License.
1614

17-
python ./ledlight.py led-light
15+
issuePriority: p2

‎.github/header-checker-lint.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ ignoreFiles:
2525
- "dlp/snippets/resources/harmless.txt"
2626
- "dlp/snippets/resources/test.txt"
2727
- "dlp/snippets/resources/term_list.txt"
28+
- "service_extensions/callouts/add_header/service_pb2.py"
29+
- "service_extensions/callouts/add_header/service_pb2_grpc.py"
2830

2931
ignoreLicenseYear: true
3032

‎.github/sync-repo-settings.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ branchProtectionRules:
3434
isAdminEnforced: false
3535
# Number of approving reviews required to update matching branches.
3636
# Defaults to `1`
37-
requiredApprovingReviewCount: 2
37+
requiredApprovingReviewCount: 1
3838
# Are reviews from code owners required to update matching branches.
3939
# Defaults to `false`
4040
requiresCodeOwnerReviews: true
@@ -45,7 +45,7 @@ branchProtectionRules:
4545
- "Kokoro CI - Lint"
4646
- "Kokoro CI - Python 2.7 (App Engine Standard Only)"
4747
- "Kokoro CI - Python 3.8"
48-
- "Kokoro CI - Python 3.11"
48+
- "Kokoro CI - Python 3.12"
4949
- "cla/google"
5050
- "snippet-bot check"
5151
# List of explicit permissions to add (additive only)

‎.kokoro/docker/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414

1515
# We want to use LTS ubuntu from our mirror because dockerhub has a
1616
# rate limit.
17-
# FROM mirror.gcr.io/library/ubuntu:18.04
18-
# However, now the above image is not working, we're using our own cache
19-
FROM gcr.io/cloud-devrel-kokoro-resources/ubuntu:20.04
17+
FROM mirror.gcr.io/library/ubuntu:20.04
2018

2119
ENV DEBIAN_FRONTEND noninteractive
2220

@@ -117,7 +115,7 @@ RUN set -ex \
117115
&& export GNUPGHOME="$(mktemp -d)" \
118116
&& echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
119117
&& /tmp/fetch_gpg_keys.sh \
120-
&& for PYTHON_VERSION in 2.7.18 3.7.17 3.8.17 3.9.17 3.10.12 3.11.4; do \
118+
&& for PYTHON_VERSION in 2.7.18 3.7.17 3.8.18 3.9.18 3.10.13 3.11.6 3.12.0; do \
121119
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" \
122120
&& 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" \
123121
&& gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \
@@ -157,6 +155,7 @@ RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/ge
157155
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ]
158156

159157
# Ensure Pip for all python3 versions
158+
RUN python3.12 /tmp/get-pip.py
160159
RUN python3.11 /tmp/get-pip.py
161160
RUN python3.9 /tmp/get-pip.py
162161
RUN python3.8 /tmp/get-pip.py
@@ -170,6 +169,7 @@ RUN python3.8 -m pip
170169
RUN python3.9 -m pip
171170
RUN python3.10 -m pip
172171
RUN python3.11 -m pip
172+
RUN python3.12 -m pip
173173

174174
# Install "virtualenv", since the vast majority of users of this image
175175
# will want it.

‎.kokoro/docker/fetch_gpg_keys.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
5151
# 3.10.x and 3.11.x (Pablo Galindo Salgado)
5252
retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
5353
A035C8C19219BA821ECEA86B64E628F8D684696D
54+
55+
# 3.12.x and 3.13.x source files and tags (Thomas Wouters)
56+
retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
57+
A821E680E5FA6305

‎.kokoro/python3.12/common.cfg‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Format: //devtools/kokoro/config/proto/build.proto
16+
17+
timeout_mins: 300
18+
19+
# Configure the docker image for kokoro-trampoline.
20+
env_vars: {
21+
key: "TRAMPOLINE_IMAGE"
22+
value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
23+
}
24+
25+
# Download trampoline resources.
26+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
27+
28+
# Use the trampoline script to run in docker.
29+
build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
30+
31+
# Download secrets from Cloud Storage.
32+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
33+
34+
# Access btlr binaries used in the tests
35+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
36+
37+
# Copy results for Resultstore
38+
action {
39+
define_artifacts {
40+
regex: "**/*sponge_log.xml"
41+
}
42+
}
43+
44+
# Specify which tests to run
45+
env_vars: {
46+
key: "RUN_TESTS_SESSION"
47+
value: "py-3.12"
48+
}
49+
50+
# Declare build specific Cloud project. It still uses the common one,
51+
# but we'll update the value once we have more Cloud projects.
52+
env_vars: {
53+
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
54+
value: "python-docs-samples-tests-312"
55+
}
56+
57+
# Number of test workers.
58+
env_vars: {
59+
key: "NUM_TEST_WORKERS"
60+
value: "10"
61+
}

iot/api-client/codelabs/run-light-sensor renamed to .kokoro/python3.12/continuous.cfg

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
#!/bin/bash
2-
3-
# Copyright 2018 Google LLC
1+
# Copyright 2023 Google LLC
42
#
53
# Licensed under the Apache License, Version 2.0 (the "License");
64
# you may not use this file except in compliance with the License.
75
# You may obtain a copy of the License at
86
#
9-
# https://www.apache.org/licenses/LICENSE-2.0
7+
# http://www.apache.org/licenses/LICENSE-2.0
108
#
119
# Unless required by applicable law or agreed to in writing, software
1210
# distributed under the License is distributed on an "AS IS" BASIS,
1311
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1412
# See the License for the specific language governing permissions and
1513
# limitations under the License.
1614

17-
python ./lightsensor.py light-sensor
15+
# Format: //devtools/kokoro/config/proto/build.proto
16+
17+
# Tell the trampoline which build file to use.
18+
env_vars: {
19+
key: "TRAMPOLINE_BUILD_FILE"
20+
value: ".kokoro/tests/run_tests_diff_head.sh"
21+
}

0 commit comments

Comments
 (0)