improvement: Refactor for compute samples and their tests (#3868)

* improvement: Refactor for compute samples and their tests * removed chai module
GoogleCloudPlatform · Oct 3, 2024 · 6e61e3d · 6e61e3d
1 parent c1643a1
commit 6e61e3d
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 203 deletions.
diff --git a/compute/disks/createComputeHyperdisk.js b/compute/disks/createComputeHyperdisk.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main() {
+async function main(diskName) {
   // [START compute_hyperdisk_create]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -28,14 +28,14 @@ async function main() {
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // Project ID or project number of the Google Cloud project you want to use.
   const projectId = await disksClient.getProjectId();
   // The zone where your VM and new disk are located.
   const zone = 'europe-central2-b';
   // The name of the new disk
-  const diskName = 'disk-name';
+  // diskName = 'disk-name';
   // The type of disk. This value uses the following format:
   // "zones/{zone}/diskTypes/(hyperdisk-balanced|hyperdisk-extreme|hyperdisk-ml|hyperdisk-throughput)".
   // For example: "zones/us-west3-b/diskTypes/hyperdisk-balanced"
@@ -78,22 +78,14 @@ async function main() {
       });
     }
 
-    const hyperdisk = (
-      await disksClient.get({
-        project: projectId,
-        zone,
-        disk: diskName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(hyperdisk));
+    console.log(`Disk: ${diskName} created.`);
   }
 
   await callCreateComputeHyperdisk();
   // [END compute_hyperdisk_create]
 }
 
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });
diff --git a/compute/disks/createComputeHyperdiskFromPool.js b/compute/disks/createComputeHyperdiskFromPool.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main() {
+async function main(diskName, storagePoolName) {
   // [START compute_hyperdisk_create_from_pool]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -28,16 +28,16 @@ async function main() {
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // Project ID or project number of the Google Cloud project you want to use.
   const projectId = await disksClient.getProjectId();
   // The zone where your VM and new disk are located.
   const zone = 'us-central1-a';
   // The name of the new disk
-  const diskName = 'disk-from-pool-name';
+  // diskName = 'disk-from-pool-name';
   // The name of the storage pool
-  const storagePoolName = 'storage-pool-name';
+  // storagePoolName = 'storage-pool-name';
   // Link to the storagePool you want to use. Use format:
   // https://www.googleapis.com/compute/v1/projects/{projectId}/zones/{zone}/storagePools/{storagePoolName}
   const storagePool = `https://www.googleapis.com/compute/v1/projects/${projectId}/zones/${zone}/storagePools/${storagePoolName}`;
@@ -84,22 +84,14 @@ async function main() {
       });
     }
 
-    const hyperdisk = (
-      await disksClient.get({
-        project: projectId,
-        zone,
-        disk: diskName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(hyperdisk));
+    console.log(`Disk: ${diskName} created.`);
   }
 
   await callCreateComputeHyperdiskFromPool();
   // [END compute_hyperdisk_create_from_pool]
 }
 
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });
diff --git a/compute/disks/createComputeHyperdiskPool.js b/compute/disks/createComputeHyperdiskPool.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main() {
+async function main(storagePoolName) {
   // [START compute_hyperdisk_pool_create]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -28,14 +28,14 @@ async function main() {
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // Project ID or project number of the Google Cloud project you want to use.
   const projectId = await storagePoolClient.getProjectId();
   // Name of the zone in which you want to create the storagePool.
   const zone = 'us-central1-a';
   // Name of the storagePool you want to create.
-  const storagePoolName = 'storage-pool-name';
+  // storagePoolName = 'storage-pool-name';
   // The type of disk you want to create. This value uses the following format:
   // "projects/{projectId}/zones/{zone}/storagePoolTypes/(hyperdisk-throughput|hyperdisk-balanced)"
   const storagePoolType = `projects/${projectId}/zones/${zone}/storagePoolTypes/hyperdisk-balanced`;
@@ -79,22 +79,14 @@ async function main() {
       });
     }
 
-    const createdStoragePool = (
-      await storagePoolClient.get({
-        project: projectId,
-        zone,
-        storagePool: storagePoolName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(createdStoragePool));
+    console.log(`Storage pool: ${storagePoolName} created.`);
   }
 
   await callCreateComputeHyperdiskPool();
   // [END compute_hyperdisk_pool_create]
 }
 
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });
diff --git a/compute/reservations/createReservationFromProperties.js b/compute/reservations/createReservationFromProperties.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main() {
+async function main(reservationName) {
   // [START compute_reservation_create]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -28,14 +28,14 @@ async function main() {
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // The ID of the project where you want to reserve resources.
   const projectId = await reservationsClient.getProjectId();
   // The zone in which to reserve resources.
   const zone = 'us-central1-a';
   // The name of the reservation to create.
-  const reservationName = 'reservation-01';
+  // reservationName = 'reservation-01';
   // The number of VMs to reserve.
   const vmsNumber = 3;
   // Machine type to use for each VM.
@@ -96,22 +96,14 @@ async function main() {
       });
     }
 
-    const createdReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(createdReservation));
+    console.log(`Reservation: ${reservationName} created.`);
   }
 
   await callCreateComputeReservationFromProperties();
   // [END compute_reservation_create]
 }
 
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });
diff --git a/compute/reservations/createReservationInstanceTemplate.js b/compute/reservations/createReservationInstanceTemplate.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main(location, instanceTemplateName) {
+async function main(reservationName, location, instanceTemplateName) {
   // [START compute_reservation_create_template]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -28,14 +28,14 @@ async function main(location, instanceTemplateName) {
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // The ID of the project where you want to reserve resources and where the instance template exists.
   const projectId = await reservationsClient.getProjectId();
   // The zone in which to reserve resources.
   const zone = 'us-central1-a';
   // The name of the reservation to create.
-  const reservationName = 'reservation-01';
+  // reservationName = 'reservation-01';
   // The number of VMs to reserve.
   const vmsNumber = 3;
 
@@ -87,15 +87,7 @@ async function main(location, instanceTemplateName) {
       });
     }
 
-    const createdReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(createdReservation));
+    console.log(`Reservation: ${reservationName} created.`);
   }
 
   await callCreateComputeReservationInstanceTemplate();

diff --git a/compute/reservations/deleteReservation.js b/compute/reservations/deleteReservation.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 'use strict';
-async function main() {
+async function main(reservationName) {
   // [START compute_reservation_delete]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -23,14 +23,14 @@ async function main() {
   // Instantiate a zoneOperationsClient
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // The ID of the project where your reservation is located.
   const projectId = await reservationsClient.getProjectId();
   // The zone where your reservation is located.
   const zone = 'us-central1-a';
   // The name of the reservation to delete.
-  const reservationName = 'reservation-01';
+  // reservationName = 'reservation-01';
 
   async function callDeleteReservation() {
     // Delete the reservation
@@ -50,11 +50,13 @@ async function main() {
         zone: operation.zone.split('/').pop(),
       });
     }
+
+    console.log(`Reservation: ${reservationName} deleted.`);
   }
   await callDeleteReservation();
   // [END compute_reservation_delete]
 }
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });
diff --git a/compute/reservations/getReservation.js b/compute/reservations/getReservation.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main() {
+async function main(reservationName) {
   // [START compute_reservation_get]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -25,14 +25,14 @@ async function main() {
   const reservationsClient = new computeLib.ReservationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // The ID of the project where your reservation is located.
   const projectId = await reservationsClient.getProjectId();
   // The zone where your reservation is located.
   const zone = 'us-central1-a';
   // The name of the reservation to return.
-  const reservationName = 'reservation-01';
+  // reservationName = 'reservation-01';
 
   async function callGetReservation() {
     const requestedReservation = (
@@ -50,7 +50,7 @@ async function main() {
   // [END compute_reservation_get]
 }
 
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });
diff --git a/compute/reservations/reservationVmsUpdate.js b/compute/reservations/reservationVmsUpdate.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-async function main() {
+async function main(reservationName) {
   // [START compute_reservation_vms_update]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
@@ -27,14 +27,14 @@ async function main() {
   const zoneOperationsClient = new computeLib.ZoneOperationsClient();
 
   /**
-   * TODO(developer): Update these variables before running the sample.
+   * TODO(developer): Update/uncomment these variables before running the sample.
    */
   // The ID of the project where the reservation is located.
   const projectId = await reservationsClient.getProjectId();
   // The zone where the reservation is located.
   const zone = 'us-central1-a';
   // The name of an existing reservation.
-  const reservationName = 'reservation-01';
+  // reservationName = 'reservation-01';
   // The new number of VMs to reserve(increase or decrease the number). Before modifying the number of VMs,
   // ensure that all required conditions are met. See: https://cloud.google.com/compute/docs/instances/reservations-modify#resizing_a_reservation.
   const vmsNumber = 1;
@@ -61,22 +61,14 @@ async function main() {
       });
     }
 
-    const updatedReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(updatedReservation));
+    console.log(`Reservation: ${reservationName} updated.`);
   }
 
   await callComputeReservationVmsUpdate();
   // [END compute_reservation_vms_update]
 }
 
-main().catch(err => {
+main(...process.argv.slice(2)).catch(err => {
   console.error(err);
   process.exitCode = 1;
 });