Merge branch 'main' into hivanalejandro/bigquery/create-sample/view-dataset-access-policy

Author: hivanalejandro

.github/config/nodejs-prod.jsonc

@@ -42,7 +42,7 @@
     ".kokoro/",
     ".prettierignore",
     ".prettierrc.js",
-    "cloud-samples-tools", // checked out by GH action in ci-*.yml 
+    "cloud-samples-tools", // checked out by GH action in ci-*.yml
     "CODEOWNERS",
     "CODE_OF_CONDUCT.md",
     "CONTRIBUTING.md",
@@ -70,7 +70,6 @@
     "ai-platform/snippets", // PERMISSION_DENIED: Permission denied: Consumer 'projects/undefined' has been suspended.
     "appengine/analytics", // [ERR_REQUIRE_ESM]: require() of ES Module
     "appengine/metadata/flexible", // [ERR_REQUIRE_ESM]: require() of ES Module
-    "appengine/metadata/standard", // [ERR_REQUIRE_ESM]: require() of ES Module
     "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'

.github/workflows/ci-dev.yaml

@@ -40,25 +40,25 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: GoogleCloudPlatform/cloud-samples-tools
-          ref: v0.1.0
+          ref: v0.2.1
           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
         with:
           go-version: ${{ env.GO_VERSION }}
-      - name: Build Ariwete (from cloud-samples-tools)
+      - name: Build Custard (from cloud-samples-tools)
         run: go build -o ../bin -v ./...
-        working-directory: cloud-samples-tools/ariwete
+        working-directory: cloud-samples-tools/custard
       - name: Get diffs
         run: git --no-pager diff --name-only HEAD origin/main | tee diffs.txt
       - name: Find Node.js affected packages
         id: nodejs
         run: |
-          echo "paths=$(./cloud-samples-tools/bin/ariwete affected .github/config/nodejs-dev.jsonc diffs.txt paths.txt)" >> $GITHUB_OUTPUT
+          echo "paths=$(./cloud-samples-tools/bin/custard affected .github/config/nodejs-dev.jsonc diffs.txt paths.txt)" >> $GITHUB_OUTPUT
           cat paths.txt
-          echo "setups=$(./cloud-samples-tools/bin/ariwete setup-files .github/config/nodejs-dev.jsonc paths.txt)" >> $GITHUB_OUTPUT
+          echo "setups=$(./cloud-samples-tools/bin/custard setup-files .github/config/nodejs-dev.jsonc paths.txt)" >> $GITHUB_OUTPUT
 
   nodejs-test:
     name: Node.js test

.github/workflows/ci-prod.yaml

@@ -40,25 +40,25 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: GoogleCloudPlatform/cloud-samples-tools
-          ref: v0.1.0
+          ref: v0.2.1
           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
         with:
           go-version: ${{ env.GO_VERSION }}
-      - name: Build Ariwete (from cloud-samples-tools)
+      - name: Build Custard (from cloud-samples-tools)
         run: go build -o ../bin -v ./...
-        working-directory: cloud-samples-tools/ariwete
+        working-directory: cloud-samples-tools/custard
       - name: Get diffs
         run: git --no-pager diff --name-only HEAD origin/main | tee diffs.txt
       - name: Find Node.js affected packages
         id: nodejs
         run: |
-          echo "paths=$(./cloud-samples-tools/bin/ariwete affected .github/config/nodejs-prod.jsonc diffs.txt paths.txt)" >> $GITHUB_OUTPUT
+          echo "paths=$(./cloud-samples-tools/bin/custard affected .github/config/nodejs-prod.jsonc diffs.txt paths.txt)" >> $GITHUB_OUTPUT
           cat paths.txt
-          echo "setups=$(./cloud-samples-tools/bin/ariwete setup-files .github/config/nodejs-prod.jsonc paths.txt)" >> $GITHUB_OUTPUT
+          echo "setups=$(./cloud-samples-tools/bin/custard setup-files .github/config/nodejs-prod.jsonc paths.txt)" >> $GITHUB_OUTPUT
 
   nodejs-lint:
     name: Node.js lint

appengine/metadata/standard/package.json

@@ -9,6 +9,7 @@
     "type": "git",
     "url": "https://github.com/GoogleCloudPlatform/nodejs-docs-samples.git"
   },
+  "type": "module",
   "engines": {
     "node": "20.x"
   },

appengine/metadata/standard/server.js

@@ -14,8 +14,8 @@
 
 'use strict';
 
-const express = require('express');
-const fetch = require('node-fetch');
+import express from 'express';
+import fetch from 'node-fetch';
 
 const app = express();
 app.enable('trust proxy');
@@ -57,4 +57,5 @@ app.listen(PORT, () => {
   console.log(`App listening on port ${PORT}`);
   console.log('Press Ctrl+C to quit.');
 });
-module.exports = app;
+
+export default app;

appengine/metadata/standard/test/server.test.js

@@ -1,6 +1,19 @@
-const path = require('path');
-const supertest = require('supertest');
-const app = require(path.join(__dirname, '../', 'server.js'));
+// Copyright 2020 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.
+
+import supertest from 'supertest';
+import app from '../server.js';
 
 it('should be listening', async () => {
   await supertest(app).get('/').expect(200);

datacatalog/README.md

@@ -0,0 +1,5 @@
+**Data Catalog API deprecation**
+
+Data Catalog is deprecated and will be discontinued on January 30, 2026. For steps to transition your Data Catalog users, workloads, and content to Dataplex Catalog, see [Transition from Data Catalog to Dataplex Catalog](https://cloud.google.com/dataplex/docs/transition-to-dataplex-catalog).
+
+All API code samples under this folder are subject to decommissioning and will be removed after January 30, 2026.