Merge branch 'main' into main

Author: glasnt

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,10 +8,13 @@ Note: Before submitting a pull request, please open an issue for discussion if y
 - [ ] I have followed guidelines from [CONTRIBUTING.MD](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md) and [Samples Style Guide](https://googlecloudplatform.github.io/samples-style-guide/)
 - [ ] **Tests** pass:   `npm test` (see [Testing](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#run-the-tests-for-a-single-sample))
 - [ ] **Lint** pass:   `npm run lint` (see [Style](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#style))
+- [ ] **Required CI tests** pass (see [CI testing](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#ci-testing))
 - [ ] 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)
 - [ ] This pull request is from a branch created directly off of `GoogleCloudPlatform/nodejs-docs-samples`. Not a fork.
 - [ ] This sample adds a new sample directory, and I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CODEOWNERS) with the codeowners for this sample
 - [ ] This sample adds a new sample directory, and I created [GitHub Actions workflow](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#adding-new-samples) for this sample
 - [ ] This sample adds a new **Product API**, and I updated the [Blunderbuss issue/PR auto-assigner](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/.github/blunderbuss.yml) with the codeowners for this sample
 - [ ] Please **merge** this PR for me once it is approved
+
+> **Note**: Any check with `(dev)`, `(experimental)`, or `(legacy)` can be ignored and should **not block** your PR from merging (see [CI testing](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#ci-testing)).

.github/blunderbuss.yml

@@ -44,6 +44,10 @@ assign_issues_by:
   - "api: parametermanager"
   to:
   - GoogleCloudPlatform/cloud-parameters-team
+- labels:
+  - "api: modelarmor"
+  to:
+  - GoogleCloudPlatform/cloud-modelarmor-team
 
 assign_prs_by:
 - labels:
@@ -77,3 +81,7 @@ assign_prs_by:
   - "api: parametermanager"
   to:
   - GoogleCloudPlatform/cloud-parameters-team
+- labels:
+  - "api: modelarmor"
+  to:
+  - GoogleCloudPlatform/cloud-modelarmor-team

.github/config/nodejs-dev.jsonc

@@ -36,9 +36,9 @@
     ".github/ISSUE_TEMPLATE/",
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/auto-label.yaml",
-    ".github/blunderbuss.yaml",
+    ".github/blunderbuss.yml",
     ".github/flakybot.yaml",
-    ".github/header-checker-lint.yaml",
+    ".github/header-checker-lint.yml",
     ".github/scripts/",
     ".github/snippet-bot.yml",
     ".github/trusted-contribution.yml",
@@ -100,6 +100,10 @@
     "auth",
     "batch",
     "cloud-language",
+    "cloud-sql/mysql/mysql",
+    "cloud-sql/mysql/mysql2",
+    "cloud-sql/postgres/knex",
+    "cloud-sql/sqlserver/mssql",
     "cloud-tasks/snippets",
     "cloud-tasks/tutorial-gcf/app",
     "cloud-tasks/tutorial-gcf/function",
@@ -146,9 +150,11 @@
     "functions/http/httpContent",
     "functions/http/httpMethods",
     "functions/http/parseXML",
+    "functions/imagemagick",
     "functions/log/helloWorld",
     "functions/log/processEntry",
     "functions/memorystore/redis",
+    "functions/ocr/app",
     "functions/pubsub/publish",
     "functions/pubsub/subscribe",
     "functions/scheduleinstance",
@@ -172,6 +178,7 @@
     "functions/v2/helloGCS",
     "functions/v2/helloPubSub",
     "functions/v2/httpLogging",
+    "functions/v2/imagemagick",
     "functions/v2/log/processEntry",
     "functions/v2/ocr/app",
     "functions/v2/responseStreaming",
@@ -199,6 +206,7 @@
     "run/image-processing",
     "run/jobs",
     "run/logging-manual",
+    "run/idp-sql",
     "run/markdown-preview/editor",
     "run/markdown-preview/renderer",
     "run/pubsub",
@@ -214,6 +222,7 @@
     "texttospeech",
     "tpu",
     "translate",
+    "vision",
     "workflows/invoke-private-endpoint"
   ]
 }

.github/config/nodejs-prod.jsonc .github/config/nodejs.jsonc.github/config/nodejs-prod.jsonc renamed to .github/config/nodejs.jsonc

@@ -36,9 +36,9 @@
     ".github/ISSUE_TEMPLATE/",
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/auto-label.yaml",
-    ".github/blunderbuss.yaml",
+    ".github/blunderbuss.yml",
     ".github/flakybot.yaml",
-    ".github/header-checker-lint.yaml",
+    ".github/header-checker-lint.yml",
     ".github/scripts/",
     ".github/snippet-bot.yml",
     ".github/trusted-contribution.yml",
@@ -77,10 +77,6 @@
     // TODO: fix these
     "ai-platform/snippets", // PERMISSION_DENIED: Permission denied: Consumer 'projects/undefined' has been suspended.
     "automl", // (untested) FAILED_PRECONDITION: Google Cloud AutoML Natural Language was retired on March 15, 2024. Please migrate to Vertex AI instead
-    "cloud-sql/mysql/mysql", // (untested) Error: expected 200 "OK", got 500 "Internal Server Error"
-    "cloud-sql/mysql/mysql2", // (untested) Error: Cannot find module './connect-connector-with-iam-authn.js'
-    "cloud-sql/postgres/knex", // (untested) CloudSQLConnectorError: Malformed instance connection name provided: expected format of "PROJECT:REGION:INSTANCE", got undefined
-    "cloud-sql/sqlserver/mssql", // (untested) TypeError: The "config.server" property is required and must be of type string.
     "cloud-sql/sqlserver/tedious", // (untested) TypeError: The "config.server" property is required and must be of type string.
     "compute", // GoogleError: The resource 'projects/long-door-651/zones/us-central1-a/disks/disk-from-pool-name' was not found
     "dataproc", // GoogleError: Error submitting create cluster request: Multiple validation errors
@@ -89,16 +85,11 @@
     "dlp", // [ERR_REQUIRE_ESM]: require() of ES Module
     "document-ai", // [ERR_REQUIRE_ESM]: require() of ES Module
     "functions/billing", // (untested) Error: Request failed with status code 500
-    "functions/imagemagick", // (untested) Error: A bucket name is needed to use Cloud Storage
-    "functions/ocr/app", // (untested) Error: Bucket not provided. Make sure you have a "bucket" property in your request
     "functions/slack", // TypeError [ERR_INVALID_ARG_TYPE]: The "key" argument must be of type ... Received undefined
-    "functions/v2/imagemagick", // (untested) Error: A bucket name is needed to use Cloud Storage.
     "healthcare/fhir", // Error: Cannot find module 'whatwg-url'
     "iam/deny", // PERMISSION_DENIED: Permission iam.googleapis.com/denypolicies.create denied on resource cloudresourcemanager.googleapis.com/projects/long-door-651
-    "run/idp-sql", // (untested) Error: Invalid contents in the credentials file
     "storagetransfer", // CredentialsError: Missing credentials in config, if using AWS_CONFIG_FILE, set AWS_SDK_LOAD_CONFIG=1
     "video-intelligence", // PERMISSION_DENIED: The caller does not have permission
-    "vision", // REDIS: Error: connect ECONNREFUSED 127.0.0.1:6379
     "workflows", // SyntaxError: Cannot use import statement outside a module
     "workflows/quickstart" // [ERR_MODULE_NOT_FOUND]: Cannot find package 'ts-node' imported from ...
   ]

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

@@ -62,7 +62,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
+    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -80,19 +80,3 @@ jobs:
         GOOGLE_SAMPLES_PROJECT: "long-door-651"
         LOCATION: ${{ steps.secrets.outputs.location }}
         CAIP_PROJECT_ID: ${{ steps.secrets.outputs.caip_id }}
-    - name: upload test results for FlakyBot workflow
-      if: github.event.action == 'schedule' && always()
-      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-      env:
-        MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
-      with:
-        name: test-results
-        path: ai-platform/snippets/${{ env.MOCHA_REPORTER_OUTPUT }}
-        retention-days: 1
-  flakybot:
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    if: github.event_name == 'schedule' && always() # always() submits logs even if tests fail
-    uses: ./.github/workflows/flakybot.yaml
-    needs: [test]

.github/workflows/appengine-analytics.yaml

@@ -31,7 +31,7 @@ jobs:
         working-directory: .github/scripts
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: 20
       - run: npm install

.github/workflows/appengine-metadata-flexible.yaml

@@ -43,10 +43,3 @@ jobs:
     with:
       name: 'compute'
       path: 'compute'
-  flakybot:
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    if: github.event_name == 'schedule' && always() # always() submits logs even if tests fail
-    uses: ./.github/workflows/flakybot.yaml
-    needs: [test]

.github/workflows/ci-scripts.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: custard CI (dev)
+name: (legacy dev) Custard CI
 on:
   push:
     branches:
@@ -27,7 +27,7 @@ env:
 
 jobs:
   affected:
-    name: Finding affected tests
+    name: (legacy) Finding affected tests
     runs-on: ubuntu-latest
     timeout-minutes: 2
     outputs:
@@ -40,12 +40,12 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           repository: GoogleCloudPlatform/cloud-samples-tools
-          ref: v0.2.1
+          ref: v0.3.2
           path: cloud-samples-tools
       - name: Create `bin` directory for cloud-samples-tools binaries
         run: mkdir bin
         working-directory: cloud-samples-tools
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Build Custard (from cloud-samples-tools)
@@ -61,7 +61,8 @@ jobs:
           echo "setups=$(./cloud-samples-tools/bin/custard setup-files .github/config/nodejs-dev.jsonc paths.txt)" >> $GITHUB_OUTPUT
 
   nodejs-test:
-    name: test
+    if: github.event.pull_request && github.event.pull_request.head.repo.fork == false
+    name: (legacy) test
     needs: affected
     runs-on: ubuntu-latest
     timeout-minutes: 120 # 2 hours hard limit
@@ -81,7 +82,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ fromJson(env.CI_SETUP).node-version }}
       - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2