Merge branch 'main' into ariwete-imagemagick

glasnt · web-flow · commit cdcb8d5eec9c · 2025-03-06T16:17:54.000+11:00
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
@@ -40,6 +40,10 @@ assign_issues_by:
   - "api: routeoptimization"
   to:
   - GoogleCloudPlatform/geo-routeoptimization
+- labels:
+  - "api: parametermanager"
+  to:
+  - GoogleCloudPlatform/cloud-parameters-team
 
 assign_prs_by:
 - labels:
@@ -69,3 +73,7 @@ assign_prs_by:
   - "api: routeoptimization"
   to:
   - GoogleCloudPlatform/geo-routeoptimization
+- labels:
+  - "api: parametermanager"
+  to:
+  - GoogleCloudPlatform/cloud-parameters-team
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
@@ -23,6 +23,7 @@ orgpolicy @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-rev
 recaptcha_enterprise @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 recaptcha_enterprise/demosite @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/recaptcha-customer-obsession-reviewers @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 secret-manager @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-secrets-team
+parametermanager @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-secrets-team @GoogleCloudPlatform/cloud-parameters-team
 service-directory @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 tpu @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 webrisk @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
diff --git a/parametermanager/README.md b/parametermanager/README.md
@@ -0,0 +1 @@
+### Initial README.md placeholder file.
diff --git a/tpu/package.json b/tpu/package.json
@@ -21,4 +21,4 @@
     "c8": "^10.0.0",
     "mocha": "^10.0.0"
   }
-}
+}
diff --git a/tpu/queuedResources/createQueuedResource.js b/tpu/queuedResources/createQueuedResource.js
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+
+'use strict';
+
+async function main(tpuClient) {
+  // [START tpu_queued_resources_create]
+  // Import the TPUClient
+  // TODO(developer): Uncomment below line before running the sample.
+  // const {TpuClient} = require('@google-cloud/tpu').v2alpha1;
+  const {Node, NetworkConfig, QueuedResource} =
+    require('@google-cloud/tpu').protos.google.cloud.tpu.v2alpha1;
+
+  // Instantiate a tpuClient
+  // TODO(developer): Uncomment below line before running the sample.
+  // tpuClient = new TpuClient();
+
+  /**
+   * TODO(developer): Update these variables before running the sample.
+   */
+  // Project ID or project number of the Google Cloud project, where you want to create queued resource.
+  const projectId = await tpuClient.getProjectId();
+
+  // The name of the network you want the node to connect to. The network should be assigned to your project.
+  const networkName = 'compute-tpu-network';
+
+  // The region of the subnetwork, that you want the node to connect to.
+  const region = 'us-central1';
+
+  // The name for your queued resource.
+  const queuedResourceName = 'queued-resource-1';
+
+  // The name for your node.
+  const nodeName = 'node-name-1';
+
+  // The zone in which to create the node.
+  // For more information about supported TPU types for specific zones,
+  // see https://cloud.google.com/tpu/docs/regions-zones
+  const zone = `${region}-f`;
+
+  // The accelerator type that specifies the version and size of the node you want to create.
+  // For more information about supported accelerator types for each TPU version,
+  // see https://cloud.google.com/tpu/docs/system-architecture-tpu-vm#versions.
+  const tpuType = 'v2-8';
+
+  // Software version that specifies the version of the node runtime to install. For more information,
+  // see https://cloud.google.com/tpu/docs/runtimes
+  const tpuSoftwareVersion = 'tpu-vm-tf-2.14.1';
+
+  async function callCreateQueuedResource() {
+    // Create a node
+    const node = new Node({
+      name: nodeName,
+      zone,
+      acceleratorType: tpuType,
+      runtimeVersion: tpuSoftwareVersion,
+      // Define network
+      networkConfig: new NetworkConfig({
+        enableExternalIps: true,
+        network: `projects/${projectId}/global/networks/${networkName}`,
+        subnetwork: `projects/${projectId}/regions/${region}/subnetworks/${networkName}`,
+      }),
+      queuedResource: `projects/${projectId}/locations/${zone}/queuedResources/${queuedResourceName}`,
+    });
+
+    // Define parent for requests
+    const parent = `projects/${projectId}/locations/${zone}`;
+
+    // Create queued resource
+    const queuedResource = new QueuedResource({
+      name: queuedResourceName,
+      tpu: {
+        nodeSpec: [
+          {
+            parent,
+            node,
+            nodeId: nodeName,
+          },
+        ],
+      },
+      // TODO(developer): Uncomment next line if you want to specify reservation.
+      // reservationName: 'reservation-name/ Before deleting the queued resource it is required to delete the TPU VM.'
+    });
+
+    const request = {
+      parent: `projects/${projectId}/locations/${zone}`,
+      queuedResource,
+      queuedResourceId: queuedResourceName,
+    };
+
+    const [operation] = await tpuClient.createQueuedResource(request);
+
+    // Wait for the create operation to complete.
+    const [response] = await operation.promise();
+
+    // You can wait until TPU Node is READY,
+    // and check its status using callGetTpuVm() from `tpu_vm_get` sample.
+    console.log(`Queued resource ${queuedResourceName} created.`);
+    return response;
+  }
+  return await callCreateQueuedResource();
+  // [END tpu_queued_resources_create]
+}
+
+module.exports = main;
+
+// TODO(developer): Uncomment below lines before running the sample.
+// main(...process.argv.slice(2)).catch(err => {
+//   console.error(err);
+//   process.exitCode = 1;
+// });
diff --git a/tpu/queuedResources/deleteQueuedResource.js b/tpu/queuedResources/deleteQueuedResource.js
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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.
+ */
+
+'use strict';
+
+async function main(tpuClient) {
+  // [START tpu_queued_resources_delete]
+  // Import the TPUClient
+  // TODO(developer): Uncomment below line before running the sample.
+  // const {TpuClient} = require('@google-cloud/tpu').v2alpha1;
+
+  // Instantiate a tpuClient
+  // TODO(developer): Uncomment below line before running the sample.
+  // tpuClient = new TpuClient();
+
+  /**
+   * TODO(developer): Update these variables before running the sample.
+   */
+  // Project ID or project number of the Google Cloud project, where you want to delete node.
+  const projectId = await tpuClient.getProjectId();
+
+  // The name of queued resource.
+  const queuedResourceName = 'queued-resource-1';
+
+  // The zone of your queued resource.
+  const zone = 'us-central1-f';
+
+  async function callDeleteTpuVM(nodeName) {
+    const request = {
+      name: `projects/${projectId}/locations/${zone}/nodes/${nodeName}`,
+    };
+
+    const [operation] = await tpuClient.deleteNode(request);
+
+    // Wait for the delete operation to complete.
+    await operation.promise();
+
+    console.log(`Node: ${nodeName} deleted.`);
+  }
+
+  async function callDeleteQueuedResource() {
+    const request = {
+      name: `projects/${projectId}/locations/${zone}/queuedResources/${queuedResourceName}`,
+    };
+
+    // Retrive node name
+    const [queuedResource] = await tpuClient.getQueuedResource(request);
+    const nodeName = queuedResource.tpu.nodeSpec[0].nodeId;
+
+    // Before deleting the queued resource it is required to delete the TPU VM.
+    await callDeleteTpuVM(nodeName);
+
+    const [operation] = await tpuClient.deleteQueuedResource(request);
+
+    // Wait for the delete operation to complete.
+    const [response] = await operation.promise();
+
+    console.log(`Queued resource ${queuedResourceName} deleted.`);
+    return response;
+  }
+  return await callDeleteQueuedResource();
+  // [END tpu_queued_resources_delete]
+}
+
+module.exports = main;
+
+// TODO(developer): Uncomment below lines before running the sample.
+// main(...process.argv.slice(2)).catch(err => {
+//   console.error(err);
+//   process.exitCode = 1;
+// });
diff --git a/tpu/queuedResources/forceDeleteQueuedResource.js b/tpu/queuedResources/forceDeleteQueuedResource.js
diff --git a/tpu/queuedResources/getQueuedResource.js b/tpu/queuedResources/getQueuedResource.js
diff --git a/tpu/queuedResources/getQueuedResourcesList.js b/tpu/queuedResources/getQueuedResourcesList.js
diff --git a/tpu/test/forceDeleteQueuedResource.test.js b/tpu/test/forceDeleteQueuedResource.test.js
diff --git a/tpu/test/queuedResource.test.js b/tpu/test/queuedResource.test.js
