Merge branch 'main' into hivanalejandro-features-bigquery-2

Author: hivanalejandro

secret-manager/createSecret.js

@@ -14,13 +14,18 @@
 
 'use strict';
 
-async function main(parent = 'projects/my-project', secretId = 'my-secret') {
+async function main(
+  parent = 'projects/my-project',
+  secretId = 'my-secret',
+  ttl = undefined
+) {
   // [START secretmanager_create_secret]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
    */
   // const parent = 'projects/my-project';
   // const secretId = 'my-secret';
+  // const ttl = undefined // Optional: Specify TTL in seconds (e.g., '900s' for 15 minutes).
 
   // Imports the Secret Manager library
   const {SecretManagerServiceClient} = require('@google-cloud/secret-manager');
@@ -29,14 +34,24 @@ async function main(parent = 'projects/my-project', secretId = 'my-secret') {
   const client = new SecretManagerServiceClient();
 
   async function createSecret() {
+    const secretConfig = {
+      replication: {
+        automatic: {},
+      },
+    };
+
+    // Add TTL to the secret configuration if provided
+    if (ttl) {
+      secretConfig.ttl = {
+        seconds: parseInt(ttl.replace('s', ''), 10),
+      };
+      console.log(`Secret TTL set to ${ttl}`);
+    }
+
     const [secret] = await client.createSecret({
       parent: parent,
       secretId: secretId,
-      secret: {
-        replication: {
-          automatic: {},
-        },
-      },
+      secret: secretConfig,
     });
 
     console.log(`Created secret ${secret.name}`);

secret-manager/test/secretmanager.test.js

@@ -245,11 +245,21 @@ describe('Secret Manager samples', () => {
     assert.match(stdout, new RegExp('Payload: bar'));
   });
 
-  it('creates a secret', async () => {
+  it('creates a secret with TTL', async () => {
+    const ttl = '900s';
     const output = execSync(
-      `node createSecret.js projects/${projectId} ${secretId}-2`
+      `node createSecret.js projects/${projectId} ${secretId}-2 ${ttl}`
     );
     assert.match(output, new RegExp('Created secret'));
+    assert.match(output, new RegExp(`Secret TTL set to ${ttl}`));
+  });
+
+  it('creates a secret without TTL', async () => {
+    const output = execSync(
+      `node createSecret.js projects/${projectId} ${secretId}-7`
+    );
+    assert.match(output, new RegExp('Created secret'));
+    assert.notMatch(output, new RegExp('Secret TTL set to'));
   });
 
   it('creates a regional secret', async () => {

tpu/createStartupScriptVM.js

@@ -50,11 +50,11 @@ async function main(tpuClient) {
   // The accelerator type that specifies the version and size of the Cloud TPU 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';
+  const tpuType = 'v5litepod-4';
 
   // Software version that specifies the version of the TPU runtime to install. For more information,
   // see https://cloud.google.com/tpu/docs/runtimes
-  const tpuSoftwareVersion = 'tpu-vm-tf-2.17.0-pod-pjrt';
+  const tpuSoftwareVersion = 'v2-tpuv5-litepod';
 
   async function callCreateTpuVMStartupScript() {
     // Create a node

tpu/createTopologyVM.js

@@ -51,7 +51,7 @@ async function main(tpuClient) {
 
   // Software version that specifies the version of the TPU runtime to install. For more information,
   // see https://cloud.google.com/tpu/docs/runtimes
-  const tpuSoftwareVersion = 'tpu-vm-tf-2.17.0-pod-pjrt';
+  const tpuSoftwareVersion = 'v2-tpuv5-litepod';
 
   // The version of the Cloud TPU you want to create.
   // Available options: TYPE_UNSPECIFIED = 0, V2 = 2, V3 = 4, V4 = 7

tpu/createVM.js

@@ -49,11 +49,11 @@ async function main(tpuClient) {
   // The accelerator type that specifies the version and size of the Cloud TPU 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';
+  const tpuType = 'v5litepod-4';
 
   // Software version that specifies the version of the TPU runtime to install. For more information,
   // see https://cloud.google.com/tpu/docs/runtimes
-  const tpuSoftwareVersion = 'tpu-vm-tf-2.14.1';
+  const tpuSoftwareVersion = 'v2-tpuv5-litepod';
 
   async function callCreateTpuVM() {
     // Create a node

tpu/queuedResources/createQueuedResource.js

@@ -49,16 +49,16 @@ async function main(tpuClient) {
   // 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`;
+  const zone = `${region}-a`;
 
   // 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';
+  const tpuType = 'v5litepod-4';
 
   // 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';
+  const tpuSoftwareVersion = 'v2-tpuv5-litepod';
 
   async function callCreateQueuedResource() {
     // Create a node

tpu/queuedResources/deleteQueuedResource.js

@@ -36,7 +36,7 @@ async function main(tpuClient) {
   const queuedResourceName = 'queued-resource-1';
 
   // The zone of your queued resource.
-  const zone = 'us-central1-f';
+  const zone = 'us-central1-a';
 
   async function callDeleteTpuVM(nodeName) {
     const request = {

tpu/queuedResources/forceDeleteQueuedResource.js

@@ -36,7 +36,7 @@ async function main(tpuClient) {
   const queuedResourceName = 'queued-resource-1';
 
   // The zone of your queued resource.
-  const zone = 'us-central1-f';
+  const zone = 'us-central1-a';
 
   async function callForceDeleteQueuedResource() {
     const request = {

tpu/queuedResources/getQueuedResource.js

@@ -36,7 +36,7 @@ async function main(tpuClient) {
   const queuedResourceName = 'queued-resource-1';
 
   // The zone of your queued resource.
-  const zone = 'us-central1-f';
+  const zone = 'us-central1-a';
 
   async function callGetQueuedResource() {
     const request = {

tpu/queuedResources/getQueuedResourcesList.js

@@ -33,7 +33,7 @@ async function main(tpuClient) {
   const projectId = await tpuClient.getProjectId();
 
   // The zone from which the Queued Resources are retrived.
-  const zone = 'us-central1-f';
+  const zone = 'us-central1-a';
 
   async function callGetQueuedResourcesList() {
     const request = {