Merge branch 'main' into fix/optional-ttl-field-to-createSecret-function

hivanalejandro · web-flow · commit c115ac4f8c6a · 2025-03-11T17:10:16.000Z
diff --git a/.github/config/nodejs-dev.jsonc b/.github/config/nodejs-dev.jsonc
@@ -146,9 +146,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 +174,7 @@
     "functions/v2/helloGCS",
     "functions/v2/helloPubSub",
     "functions/v2/httpLogging",
+    "functions/v2/imagemagick",
     "functions/v2/log/processEntry",
     "functions/v2/ocr/app",
     "functions/v2/responseStreaming",
diff --git a/.github/config/nodejs-prod.jsonc b/.github/config/nodejs-prod.jsonc
@@ -89,10 +89,7 @@
     "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
diff --git a/.github/workflows/ai-platform-snippets.yaml b/.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@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -82,7 +82,7 @@ jobs:
         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@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
       env:
         MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
       with:
diff --git a/.github/workflows/ci-dev.yaml b/.github/workflows/ci-dev.yaml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           repository: GoogleCloudPlatform/cloud-samples-tools
           ref: v0.2.1
diff --git a/.github/workflows/ci-prod.yaml b/.github/workflows/ci-prod.yaml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           repository: GoogleCloudPlatform/cloud-samples-tools
           ref: v0.2.1
diff --git a/.github/workflows/dialogflow-cx.yaml b/.github/workflows/dialogflow-cx.yaml
@@ -62,7 +62,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -84,7 +84,7 @@ jobs:
         AGENT_PROJECT_ID: nodejs-docs-samples-tests
     - name: upload test results for FlakyBot workflow
       if: github.event.action == 'schedule' && always()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
       env:
         MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
       with:
diff --git a/.github/workflows/functions-slack.yaml b/.github/workflows/functions-slack.yaml
@@ -62,7 +62,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       id: npm-cache
       with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -83,7 +83,7 @@ jobs:
           KG_API_KEY: ${{ steps.secrets.outputs.kg_api_key }}
     - name: upload test results for FlakyBot workflow
       if: github.event.action == 'schedule' && always()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
       env:
           MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
       with:
diff --git a/.github/workflows/iam-deny.yaml b/.github/workflows/iam-deny.yaml
@@ -60,7 +60,7 @@ jobs:
          id: npm-cache-dir
          shell: bash
          run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-       - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+       - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
          id: npm-cache
          with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -81,7 +81,7 @@ jobs:
        - run: npm test
        - name: upload test results for FlakyBot workflow
          if: github.event.action == 'schedule' && always()
-         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
          env:
           MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
          with:
diff --git a/.github/workflows/storagetransfer.yaml b/.github/workflows/storagetransfer.yaml
@@ -65,7 +65,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -92,7 +92,7 @@ jobs:
         AZURE_SAS_TOKEN: ${{ fromJSON(steps.secrets.outputs.sts_azure_secret).SAS }}
     - name: upload test results for FlakyBot workflow
       if: github.event.action == 'schedule' && always()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
       env:
         MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
       with:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -47,7 +47,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -67,7 +67,7 @@ jobs:
         GOOGLE_SAMPLES_PROJECT: "long-door-651"
     - name: upload test results for FlakyBot workflow
       if: github.event.action == 'schedule' && always()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
       with:
         name: test-results
         path: ${{ inputs.path }}/${{ env.MOCHA_REPORTER_OUTPUT }}
diff --git a/.github/workflows/vision.yaml b/.github/workflows/vision.yaml
@@ -64,7 +64,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -87,7 +87,7 @@ jobs:
         REDIS_HOST: ${{ steps.secrets.outputs.vision.REDIS_HOST }}
     - name: upload test results for FlakyBot workflow
       if: github.event.action == 'schedule' && always()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
       env:
         MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
       with:
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -28,10 +28,10 @@ service-directory @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-sam
 tpu @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 webrisk @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 
-# SoDa teams
+# SDK teams
 cloud-sql @GoogleCloudPlatform/cloud-sql-connectors @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 datastore @GoogleCloudPlatform/cloud-native-db-dpes @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
-storagetransfer @GoogleCloudPlatform/cloud-storage-dpes @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
+storagetransfer @GoogleCloudPlatform/gcs-sdk-team @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 
 # One-offs
 composer @GoogleCloudPlatform/cloud-dpes-composer @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
diff --git a/appengine/building-an-app/update/app.yaml b/appengine/building-an-app/update/app.yaml
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gae_app_yaml]
 # [START app_yaml]
 runtime: nodejs20
 # [END app_yaml]
+# [END gae_app_yaml]
diff --git a/appengine/building-an-app/update/server.js b/appengine/building-an-app/update/server.js
@@ -15,8 +15,6 @@
 'use strict';
 
 // [START gae_update_web_server_app]
-// [START app]
-// [START gae_update_app]
 const express = require('express');
 const path = require('path');
 
@@ -31,15 +29,12 @@ app.get('/', (req, res) => {
   res.send('Hello from App Engine!');
 });
 
-// [START add_display_form]
 // [START gae_add_display_form]
 app.get('/submit', (req, res) => {
   res.sendFile(path.join(__dirname, '/views/form.html'));
 });
 // [END gae_add_display_form]
-// [END add_display_form]
 
-// [START add_post_handler]
 // [START gae_add_post_handler]
 app.post('/submit', (req, res) => {
   console.log({
@@ -49,15 +44,12 @@ app.post('/submit', (req, res) => {
   res.send('Thanks for your message!');
 });
 // [END gae_add_post_handler]
-// [END add_post_handler]
 
 // Listen to the App Engine-specified port, or 8080 otherwise
 const PORT = parseInt(process.env.PORT) || 8080;
 app.listen(PORT, () => {
   console.log(`Server listening on port ${PORT}...`);
 });
-// [END gae_update_app]
-// [END app]
 // [END gae_update_web_server_app]
 
 module.exports = app;
diff --git a/appengine/building-an-app/update/test/server.test.js b/appengine/building-an-app/update/test/server.test.js
@@ -36,17 +36,6 @@ const restoreConsole = function () {
 beforeEach(stubConsole);
 afterEach(restoreConsole);
 
-describe('gae_update_app', () => {
-  it('should send greetings', async () => {
-    await requestObj
-      .get('/')
-      .expect(200)
-      .expect(response => {
-        assert.strictEqual(response.text, 'Hello from App Engine!');
-      });
-  });
-});
-
 describe('gae_update_web_server_app', () => {
   it('should send greetings', async () => {
     await requestObj
@@ -58,7 +47,7 @@ describe('gae_update_web_server_app', () => {
   });
 });
 
-describe('gae_add_display_form add_display_form', () => {
+describe('gae_add_display_form', () => {
   it('should display form', async () => {
     await requestObj
       .get('/submit')
@@ -74,7 +63,7 @@ describe('gae_add_display_form add_display_form', () => {
   });
 });
 
-describe('gae_add_post_handler add_post_handler gae_enable_parser', () => {
+describe('gae_add_post_handler gae_enable_parser', () => {
   it('should record message', async () => {
     await requestObj
       .post('/submit', {
diff --git a/endpoints/getting-started/openapi-appengine.yaml b/endpoints/getting-started/openapi-appengine.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 Google LLC
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# [START endpoints_swagger_appengine_yaml_nodejs]
 # [START swagger]
 swagger: "2.0"
 info:
@@ -6,6 +20,7 @@ info:
   version: "1.0.0"
 host: "YOUR-PROJECT-ID.appspot.com"
 # [END swagger]
+# [END endpoints_swagger_appengine_yaml_nodejs]
 consumes:
 - "application/json"
 produces:
diff --git a/endpoints/getting-started/openapi.yaml b/endpoints/getting-started/openapi.yaml
@@ -1,3 +1,17 @@
+# Copyright 2016 Google LLC
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# [START endpoints_swagger_yaml_nodejs]
 # [START swagger]
 swagger: "2.0"
 info:
@@ -6,6 +20,7 @@ info:
   version: "1.0.0"
 host: "echo-api.endpoints.YOUR-PROJECT-ID.cloud.goog"
 # [END swagger]
+# [END endpoints_swagger_yaml_nodejs]
 consumes:
 - "application/json"
 produces:
diff --git a/functions/imagemagick/ci-setup.json b/functions/imagemagick/ci-setup.json
@@ -0,0 +1,6 @@
+{
+    "env": {
+        "FUNCTIONS_BUCKET": "nodejs-docs-samples-tests",
+        "BLURRED_BUCKET_NAME": "nodejs-docs-samples-tests-imagick"
+    }
+}
diff --git a/functions/imagemagick/package.json b/functions/imagemagick/package.json
@@ -12,7 +12,7 @@
     "node": ">=12.0.0"
   },
   "scripts": {
-    "test": "c8 mocha -p -j 2 test/*.test.js --timeout=20000 --exit"
+    "test": "c8 mocha -p -j 2 test/*.test.js --timeout=30000 --exit"
   },
   "dependencies": {
     "@google-cloud/storage": "^7.0.0",
diff --git a/functions/imagemagick/test/index.test.js b/functions/imagemagick/test/index.test.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const assert = require('assert');
-const {spawn} = require('child_process');
+const {execSync, spawn} = require('child_process');
 const {Storage} = require('@google-cloud/storage');
 const sinon = require('sinon');
 const {request} = require('gaxios');
@@ -47,13 +47,26 @@ async function startFF(port) {
     let stderr = '';
     ffProc.stdout.on('data', data => (stdout += data));
     ffProc.stderr.on('data', data => (stderr += data));
-    ffProc.on('error', reject);
-    ffProc.on('exit', c => (c === 0 ? resolve(stdout) : reject(stderr)));
+    ffProc.on('exit', code => {
+      if (code === 0 || code === null) {
+        // code === null corresponds to a signal-kill
+        // (which doesn't necessarily indicate a test failure)
+        resolve(stdout);
+      } else {
+        stderr = `Error code: ${code}\n${stderr}`;
+        reject(new Error(stderr));
+      }
+    });
   });
   await waitPort({host: 'localhost', port});
   return {ffProc, ffProcHandler};
 }
 
+// ImageMagick is available by default in Cloud Run Functions environments
+// https://cloud.google.com/functions/1stgendocs/tutorials/imagemagick-1st-gen.md#importing_dependencies
+// Manually install it for testing only.
+execSync('sudo apt-get install imagemagick -y');
+
 describe('functions/imagemagick tests', () => {
   before(async () => {
     let exists;
diff --git a/functions/ocr/app/ci-setup.json b/functions/ocr/app/ci-setup.json
@@ -0,0 +1,9 @@
+{
+    "env": {
+        "FUNCTIONS_BUCKET": "nodejs-docs-samples-tests",
+        "RESULT_BUCKET": "nodejs-docs-samples-tests",
+        "TRANSLATE_TOPIC": "integration-tests-instance",
+        "RESULT_TOPIC": "integration-tests-instance",
+        "TO_LANG": "en,es"
+    }
+}
diff --git a/functions/ocr/app/index.js b/functions/ocr/app/index.js
@@ -41,8 +41,7 @@ const translate = new Translate();
 const publishResult = async (topicName, data) => {
   const dataBuffer = Buffer.from(JSON.stringify(data));
 
-  const [topic] = await pubsub.topic(topicName).get({autoCreate: true});
-  topic.publishMessage({data: dataBuffer});
+  pubsub.topic(topicName).publishMessage(dataBuffer);
 };
 
 // [START functions_ocr_detect]
diff --git a/functions/v2/imagemagick/ci-setup.json b/functions/v2/imagemagick/ci-setup.json
diff --git a/functions/v2/imagemagick/test/integration.test.js b/functions/v2/imagemagick/test/integration.test.js
diff --git a/speech/profanityFilter.js b/speech/profanityFilter.js
