Refactor for compute samples

GoogleCloudPlatform · Sep 16, 2024 · bce6e24 · bce6e24
1 parent 7bc56c9
commit bce6e24
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 129 deletions.
diff --git a/compute/disks/createComputeHyperdisk.js b/compute/disks/createComputeHyperdisk.js
@@ -78,15 +78,7 @@ async function main(diskName) {
       });
     }
 
-    const hyperdisk = (
-      await disksClient.get({
-        project: projectId,
-        zone,
-        disk: diskName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(hyperdisk));
+    console.log(`Disk: ${diskName} created.`);
   }
 
   await callCreateComputeHyperdisk();

diff --git a/compute/disks/createComputeHyperdiskFromPool.js b/compute/disks/createComputeHyperdiskFromPool.js
@@ -84,15 +84,7 @@ async function main(diskName, storagePoolName) {
       });
     }
 
-    const hyperdisk = (
-      await disksClient.get({
-        project: projectId,
-        zone,
-        disk: diskName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(hyperdisk));
+    console.log(`Disk: ${diskName} created.`);
   }
 
   await callCreateComputeHyperdiskFromPool();

diff --git a/compute/disks/createComputeHyperdiskPool.js b/compute/disks/createComputeHyperdiskPool.js
@@ -79,15 +79,7 @@ async function main(storagePoolName) {
       });
     }
 
-    const createdStoragePool = (
-      await storagePoolClient.get({
-        project: projectId,
-        zone,
-        storagePool: storagePoolName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(createdStoragePool));
+    console.log(`Storage pool: ${storagePoolName} created.`);
   }
 
   await callCreateComputeHyperdiskPool();

diff --git a/compute/reservations/createReservationFromProperties.js b/compute/reservations/createReservationFromProperties.js
@@ -96,15 +96,7 @@ async function main(reservationName) {
       });
     }
 
-    const createdReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(createdReservation));
+    console.log(`Reservation: ${reservationName} created.`);
   }
 
   await callCreateComputeReservationFromProperties();

diff --git a/compute/reservations/createReservationInstanceTemplate.js b/compute/reservations/createReservationInstanceTemplate.js
@@ -87,15 +87,7 @@ async function main(reservationName, 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/createSharedReservation.js b/compute/reservations/createSharedReservation.js
@@ -88,15 +88,7 @@ async function main(reservationName, instanceTemplateName) {
       });
     }
 
-    const createdReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(createdReservation);
+    console.log(`Reservation: ${reservationName} created.`);
   }
 
   await callCreateComputeSharedReservation();

diff --git a/compute/reservations/deleteReservation.js b/compute/reservations/deleteReservation.js
@@ -50,6 +50,8 @@ async function main(reservationName) {
         zone: operation.zone.split('/').pop(),
       });
     }
+
+    console.log(`Reservation: ${reservationName} deleted.`);
   }
   await callDeleteReservation();
   // [END compute_reservation_delete]

diff --git a/compute/reservations/reservationVmsUpdate.js b/compute/reservations/reservationVmsUpdate.js
@@ -61,15 +61,7 @@ async function main(reservationName) {
       });
     }
 
-    const updatedReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(JSON.stringify(updatedReservation));
+    console.log(`Reservation: ${reservationName} updated.`);
   }
 
   await callComputeReservationVmsUpdate();

diff --git a/compute/reservations/sharedReservationConsumerProjectsUpdate.js b/compute/reservations/sharedReservationConsumerProjectsUpdate.js
@@ -77,15 +77,7 @@ async function main(reservationName) {
       });
     }
 
-    const updatedReservation = (
-      await reservationsClient.get({
-        project: projectId,
-        zone,
-        reservation: reservationName,
-      })
-    )[0];
-
-    console.log(updatedReservation);
+    console.log(`Reservation: ${reservationName} updated.`);
   }
 
   await callComputeSharedReservationConsumerProjectsUpdate();

diff --git a/compute/test/createComputeHyperdisk.test.js b/compute/test/createComputeHyperdisk.test.js
@@ -44,12 +44,13 @@ describe('Create compute hyperdisk', async () => {
   });
 
   it('should create a new hyperdisk', () => {
-    const response = JSON.parse(
-      execSync(`node ./disks/createComputeHyperdisk.js ${diskName}`, {
+    const response = execSync(
+      `node ./disks/createComputeHyperdisk.js ${diskName}`,
+      {
         cwd,
-      })
+      }
     );
 
-    assert.equal(response.name, diskName);
+    assert.equal(response, `Disk: ${diskName} created.`);
   });
 });
diff --git a/compute/test/createComputeHyperdiskFromPool.test.js b/compute/test/createComputeHyperdiskFromPool.test.js
@@ -81,28 +81,24 @@ describe('Create compute hyperdisk from pool', async () => {
   });
 
   it('should create a new storage pool', () => {
-    const response = JSON.parse(
-      execSync(
-        `node ./disks/createComputeHyperdiskPool.js ${storagePoolName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./disks/createComputeHyperdiskPool.js ${storagePoolName}`,
+      {
+        cwd,
+      }
     );
 
-    assert.equal(response.name, storagePoolName);
+    assert.equal(response, `Storage pool: ${storagePoolName} created.`);
   });
 
   it('should create a new hyperdisk from pool', () => {
-    const response = JSON.parse(
-      execSync(
-        `node ./disks/createComputeHyperdiskFromPool.js ${diskName} ${storagePoolName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./disks/createComputeHyperdiskFromPool.js ${diskName} ${storagePoolName}`,
+      {
+        cwd,
+      }
     );
 
-    assert.equal(response.name, diskName);
+    assert.equal(response, `Disk: ${diskName} created.`);
   });
 });
diff --git a/compute/test/createReservationGlobalInstanceTemplate.test.js b/compute/test/createReservationGlobalInstanceTemplate.test.js
@@ -58,15 +58,13 @@ describe('Create compute reservation using global instance template', async () =
   });
 
   it('should create a new reservation', () => {
-    const response = JSON.parse(
-      execSync(
-        `node ./reservations/createReservationInstanceTemplate.js ${reservationName} ${location} ${instanceTemplateName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./reservations/createReservationInstanceTemplate.js ${reservationName} ${location} ${instanceTemplateName}`,
+      {
+        cwd,
+      }
     );
 
-    assert.equal(response.name, reservationName);
+    assert.equal(response, `Reservation: ${reservationName} created.`);
   });
 });
diff --git a/compute/test/createReservationRegionalInstanceTemplate.test.js b/compute/test/createReservationRegionalInstanceTemplate.test.js
@@ -37,15 +37,12 @@ describe('Create compute reservation using regional instance template', async ()
   });
 
   it('should create a new reservation', () => {
-    const response = JSON.parse(
-      execSync(
-        `node ./reservations/createReservationInstanceTemplate.js ${reservationName} ${location} ${instanceTemplateName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./reservations/createReservationInstanceTemplate.js ${reservationName} ${location} ${instanceTemplateName}`,
+      {
+        cwd,
+      }
     );
-
-    assert.equal(response.name, reservationName);
+    assert.equal(response, `Reservation: ${reservationName} created.`);
   });
 });
diff --git a/compute/test/reservations.test.js b/compute/test/reservations.test.js
@@ -30,23 +30,19 @@ describe('Compute reservation', async () => {
   const zone = 'us-central1-a';
   const reservationsClient = new ReservationsClient();
   let projectId;
-  let reservation;
 
   before(async () => {
     projectId = await reservationsClient.getProjectId();
   });
 
   it('should create a new reservation', () => {
-    reservation = JSON.parse(
-      execSync(
-        `node ./reservations/createReservationFromProperties.js ${reservationName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./reservations/createReservationFromProperties.js ${reservationName}`,
+      {
+        cwd,
+      }
     );
-
-    assert.equal(reservation.name, reservationName);
+    assert.equal(response, `Reservation: ${reservationName} created.`);
   });
 
   it('should return reservation', () => {

diff --git a/compute/test/sharedReservation.test.js b/compute/test/sharedReservation.test.js
@@ -35,16 +35,13 @@ describe('Compute shared reservation', async () => {
   });
 
   it('should create new shared reservation', async () => {
-    const response = JSON.parse(
-      execSync(
-        `node ./reservations/createSharedReservation.js ${reservationName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./reservations/createSharedReservation.js ${reservationName}`,
+      {
+        cwd,
+      }
     );
-
-    assert.equal(response.name, reservationName);
+    assert.equal(response, `Reservation: ${reservationName} created.`);
   });
 
   it('should update consumer projects in shared reservation', async () => {
@@ -57,6 +54,6 @@ describe('Compute shared reservation', async () => {
       )
     );
 
-    assert.not.equal(response, null);
+    assert.equal(response, `Reservation: ${reservationName} updated.`);
   });
 });