Merge branch 'main' into hivanalejandro-delete-region-401222835

Author: iennae

.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",

.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

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]

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;

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', {

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:

functions/imagemagick/ci-setup.json

@@ -0,0 +1,6 @@
+{
+    "env": {
+        "FUNCTIONS_BUCKET": "nodejs-docs-samples-tests",
+        "BLURRED_BUCKET_NAME": "nodejs-docs-samples-tests-imagick"
+    }
+}

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",

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;

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"
+    }
+}