Skip to content

Commit e732e33

Browse files
Merge branch 'main' into hivanalejandro-migrate-region-step1-392698287
2 parents 4c0cc44 + 88f483a commit e732e33

Some content is hidden

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

41 files changed

+637
-831
lines changed

.github/config/nodejs-dev.jsonc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
1716
{
18-
"package-file": [ "package.json" ],
17+
"package-file": [
18+
"package.json"
19+
],
1920
"ci-setup-filename": "ci-setup.json",
2021
"ci-setup-defaults": {
2122
"node-version": 20,
@@ -24,8 +25,8 @@
2425
"workload-identity-provider": "projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider",
2526
"service-account": "[email protected]",
2627
"access-token-lifetime": "600s", // 10 minutes
27-
"env": { },
28-
"secrets": { }
28+
"env": {},
29+
"secrets": {}
2930
},
3031
"ignore": [
3132
".eslintignore",
@@ -71,7 +72,6 @@
7172
"functions/pubsub", // parent directory
7273
"memorystore/redis", // parent directory
7374
"recaptcha_enterprise/demosite/app", // no tests exist
74-
7575
// These tests are already passing in prod, so skip them in dev.
7676
"appengine/building-an-app/build",
7777
"appengine/building-an-app/update",
@@ -145,7 +145,6 @@
145145
"functions/scheduleinstance",
146146
"functions/security",
147147
"functions/spanner",
148-
"functions/speech-to-speech/functions",
149148
"functions/tips",
150149
"functions/tips/avoidInfiniteRetries",
151150
"functions/tips/connectionPools",
@@ -201,4 +200,4 @@
201200
"tpu",
202201
"workflows/invoke-private-endpoint"
203202
]
204-
}
203+
}

.github/workflows/ai-platform-snippets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
create_credentials_file: 'true'
5151
access_token_lifetime: 600s
5252
- id: secrets
53-
uses: 'google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713' # v2
53+
uses: 'google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce' # v2
5454
with:
5555
secrets: |-
5656
caip_id:nodejs-docs-samples-tests/nodejs-docs-samples-ai-platform-caip-project-id
@@ -62,7 +62,7 @@ jobs:
6262
id: npm-cache-dir
6363
shell: bash
6464
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
65-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
65+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
6666
id: npm-cache
6767
with:
6868
path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -82,7 +82,7 @@ jobs:
8282
CAIP_PROJECT_ID: ${{ steps.secrets.outputs.caip_id }}
8383
- name: upload test results for FlakyBot workflow
8484
if: github.event.action == 'schedule' && always()
85-
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
85+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
8686
env:
8787
MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
8888
with:

.github/workflows/ci-dev.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
nodejs-paths: ${{ steps.nodejs.outputs.paths }}
3535
nodejs-setups: ${{ steps.nodejs.outputs.setups }}
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3838
with:
3939
fetch-depth: 0
40-
- uses: actions/setup-go@v5
40+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
4141
with:
4242
go-version: ${{ env.GO_VERSION }}
4343
- run: go build -o ${{ github.workspace }}/tools ./cmd/...
@@ -67,20 +67,20 @@ jobs:
6767
steps:
6868
- name: CI Setup
6969
run: echo "${{ env.CI_SETUP }}"
70-
- uses: actions/checkout@v4
70+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
7171
with:
7272
ref: ${{ github.event.pull_request.head.sha }}
73-
- uses: actions/setup-node@v4
73+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
7474
with:
7575
node-version: ${{ fromJson(env.CI_SETUP).node-version }}
76-
- uses: google-github-actions/auth@v2
76+
- uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2
7777
with:
7878
project_id: ${{ fromJson(env.CI_SETUP).project-id }}
7979
workload_identity_provider: ${{ fromJson(env.CI_SETUP).workload-identity-provider }}
8080
service_account: ${{ fromJson(env.CI_SETUP).service-account }}
8181
access_token_lifetime: ${{ fromJson(env.CI_SETUP).access-token-lifetime }}
8282
- name: Export environment variables
83-
uses: actions/github-script@v7
83+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
8484
id: vars
8585
with:
8686
script: |
@@ -99,7 +99,7 @@ jobs:
9999
.map(key => `${key}:${setup.secrets[key]}`)
100100
.join('\n'),
101101
}
102-
- uses: google-github-actions/get-secretmanager-secrets@v2
102+
- uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2
103103
if: ${{ fromJson(steps.vars.outputs.result).secrets }}
104104
with:
105105
secrets: ${{ fromJson(steps.vars.outputs.result).secrets }}

.github/workflows/ci-prod.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
nodejs-paths: ${{ steps.nodejs.outputs.paths }}
3535
nodejs-setups: ${{ steps.nodejs.outputs.setups }}
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3838
with:
3939
fetch-depth: 0
40-
- uses: actions/setup-go@v5
40+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
4141
with:
4242
go-version: ${{ env.GO_VERSION }}
4343
- run: go build -o ${{ github.workspace }}/tools ./cmd/...
@@ -56,8 +56,8 @@ jobs:
5656
runs-on: ubuntu-latest
5757
timeout-minutes: 5
5858
steps:
59-
- uses: actions/checkout@v4
60-
- uses: actions/setup-node@v4
59+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
60+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
6161
with:
6262
node-version: 20
6363
- run: make lint
@@ -79,20 +79,20 @@ jobs:
7979
steps:
8080
- name: CI Setup
8181
run: echo "${{ env.CI_SETUP }}"
82-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
8383
with:
8484
ref: ${{ github.event.pull_request.head.sha }}
85-
- uses: actions/setup-node@v4
85+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
8686
with:
8787
node-version: ${{ fromJson(env.CI_SETUP).node-version }}
88-
- uses: google-github-actions/auth@v2
88+
- uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2
8989
with:
9090
project_id: ${{ fromJson(env.CI_SETUP).project-id }}
9191
workload_identity_provider: ${{ fromJson(env.CI_SETUP).workload-identity-provider }}
9292
service_account: ${{ fromJson(env.CI_SETUP).service-account }}
9393
access_token_lifetime: ${{ fromJson(env.CI_SETUP).access-token-lifetime }}
9494
- name: Export environment variables
95-
uses: actions/github-script@v7
95+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
9696
id: vars
9797
with:
9898
script: |
@@ -111,7 +111,7 @@ jobs:
111111
.map(key => `${key}:${setup.secrets[key]}`)
112112
.join('\n'),
113113
}
114-
- uses: google-github-actions/get-secretmanager-secrets@v2
114+
- uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2
115115
if: ${{ fromJson(steps.vars.outputs.result).secrets }}
116116
with:
117117
secrets: ${{ fromJson(steps.vars.outputs.result).secrets }}

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
29-
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
29+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
3030
with:
3131
node-version: 18
3232
- run: npm install

.github/workflows/cloud-samples-tools-test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
run:
3636
working-directory: .github/cloud-samples-tools
3737
steps:
38-
- uses: actions/checkout@v4
39-
- uses: actions/setup-go@v5
38+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
39+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
4040
with:
4141
go-version: ${{ env.GO_VERSION }}
4242
- name: Go vet
@@ -52,8 +52,8 @@ jobs:
5252
run:
5353
working-directory: .github/cloud-samples-tools
5454
steps:
55-
- uses: actions/checkout@v4
56-
- uses: actions/setup-go@v5
55+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
56+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
5757
with:
5858
go-version: ${{ env.GO_VERSION }}
5959
- name: Run tests

.github/workflows/dialogflow-cx.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
create_credentials_file: 'true'
5151
access_token_lifetime: 600s
5252
- id: secrets
53-
uses: 'google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713' # v2
53+
uses: 'google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce' # v2
5454
with:
5555
secrets: |-
5656
agent_id:nodejs-docs-samples-tests/nodejs-docs-samples-dialogflow-cx-agent-id
@@ -62,7 +62,7 @@ jobs:
6262
id: npm-cache-dir
6363
shell: bash
6464
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
65-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
65+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
6666
id: npm-cache
6767
with:
6868
path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -84,7 +84,7 @@ jobs:
8484
AGENT_PROJECT_ID: nodejs-docs-samples-tests
8585
- name: upload test results for FlakyBot workflow
8686
if: github.event.action == 'schedule' && always()
87-
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
87+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
8888
env:
8989
MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
9090
with:

.github/workflows/functions-slack.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
create_credentials_file: 'true'
5151
access_token_lifetime: 600s
5252
- id: secrets
53-
uses: 'google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713' # v2
53+
uses: 'google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce' # v2
5454
with:
5555
secrets: |-
5656
slack_secret:nodejs-docs-samples-tests/nodejs-docs-samples-slack-secret
@@ -62,7 +62,7 @@ jobs:
6262
id: npm-cache-dir
6363
shell: bash
6464
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
65-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
65+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
6666
id: npm-cache
6767
with:
6868
path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -83,7 +83,7 @@ jobs:
8383
KG_API_KEY: ${{ steps.secrets.outputs.kg_api_key }}
8484
- name: upload test results for FlakyBot workflow
8585
if: github.event.action == 'schedule' && always()
86-
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
86+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
8787
env:
8888
MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
8989
with:

.github/workflows/functions-speech-to-speech-functions.yaml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/generative-ai-snippets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
create_credentials_file: 'true'
5454
access_token_lifetime: 600s
5555
- id: secrets
56-
uses: 'google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713' # v2
56+
uses: 'google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce' # v2
5757
with:
5858
secrets: |-
5959
caip_id:nodejs-docs-samples-tests/nodejs-docs-samples-ai-platform-caip-project-id
@@ -66,7 +66,7 @@ jobs:
6666
id: npm-cache-dir
6767
shell: bash
6868
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
69-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
69+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
7070
id: npm-cache
7171
with:
7272
path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -92,7 +92,7 @@ jobs:
9292
DATASTORE_ID: ${{ steps.secrets.outputs.datastore_id }}
9393
- name: upload test results for FlakyBot workflow
9494
if: github.event.action == 'schedule' && always()
95-
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
95+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
9696
env:
9797
MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
9898
with:

.github/workflows/iam-deny.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
id: npm-cache-dir
6161
shell: bash
6262
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
63-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
63+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
6464
id: npm-cache
6565
with:
6666
path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -81,7 +81,7 @@ jobs:
8181
- run: npm test
8282
- name: upload test results for FlakyBot workflow
8383
if: github.event.action == 'schedule' && always()
84-
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
84+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
8585
env:
8686
MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
8787
with:

.github/workflows/security-center-snippets.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
id: npm-cache-dir
6060
shell: bash
6161
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
62-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
62+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
6363
id: npm-cache
6464
with:
6565
path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -84,7 +84,7 @@ jobs:
8484
GOOGLE_SAMPLES_PROJECT: "long-door-651"
8585
- name: upload test results for FlakyBot workflow
8686
if: github.event.action == 'schedule' && always()
87-
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
87+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
8888
env:
8989
MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
9090
with:

0 commit comments

Comments
 (0)