Merge branch 'main' into main

Author: NimJay

.eslintrc.json

@@ -12,6 +12,7 @@
     "node/no-unsupported-features/es-syntax": ["off"]
   },
   "parserOptions": {
+    "ecmaVersion": 2020,
     "sourceType": "module"
   }
 }

.github/config/nodejs-dev.jsonc

@@ -185,6 +185,7 @@
     "functions/v2/tips/retry",
     "functions/v2/typed/googlechatbot",
     "functions/v2/typed/greeting",
+    "genai", // parent directory
     "generative-ai/snippets",
     "healthcare/consent",
     "healthcare/datasets",

.github/config/nodejs.jsonc

@@ -70,6 +70,7 @@
     "functions/http/uploadFile", // no tests exist
     "functions/log", // parent directory
     "functions/pubsub", // parent directory
+    "genai", // parent directory
     "memorystore/redis", // parent directory
     "recaptcha_enterprise/demosite/app", // no tests exist
 

ai-platform/snippets/test/imagen.test.js

@@ -66,7 +66,8 @@ describe('AI platform edit image using Imagen inpainting and outpainting', () =>
   });
 });
 
-describe('AI platform get image captions and responses using Imagen', () => {
+// b/452720552
+describe.skip('AI platform get image captions and responses using Imagen', () => {
   it('should get short form captions for an image', async () => {
     const stdout = execSync('node ./imagen-get-short-form-image-captions.js', {
       cwd,

appengine/building-an-app/build/app.yaml

@@ -12,5 +12,5 @@
 # limitations under the License.
 
 # [START gae_build_app_yaml_node]
-runtime: nodejs20
+runtime: nodejs24
 # [END gae_build_app_yaml_node]

appengine/building-an-app/build/package.json

@@ -14,7 +14,7 @@
     "url": "https://github.com/GoogleCloudPlatform/nodejs-docs-samples.git"
   },
   "engines": {
-    "node": "20.x.x"
+    "node": "24.x.x"
   },
   "author": "Google Inc.",
   "license": "Apache-2.0",

appengine/hello-world/flexible/app.yaml

@@ -16,7 +16,7 @@
 runtime: nodejs
 env: flex
 runtime_config:
-  operating_system: ubuntu22
+  operating_system: ubuntu24
 # This sample incurs costs to run on the App Engine flexible environment.
 # The settings below are to reduce costs during testing and are not appropriate
 # for production use. For more information, see:

auth/.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../.eslintrc.json",
+  "rules": {
+    "no-unused-vars": "off"
+  }
+}

auth/README.md

@@ -64,4 +64,4 @@ information](https://developers.google.com/identity/protocols/application-defaul
 
 For more information on downscoped credentials you can visit:
 
-> https://github.com/googleapis/google-auth-library-nodejs
+> https://github.com/googleapis/google-auth-library-nodejs

auth/customcredentials/aws/Dockerfile

@@ -0,0 +1,15 @@
+FROM node:20-slim
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm install --omit=dev
+
+RUN useradd -m appuser
+
+COPY --chown=appuser:appuser . .
+
+USER appuser
+
+CMD [ "node", "customCredentialSupplierAws.js" ]