Refactor for compute samples

Author: Joanna Grycz

compute/disks/createComputeHyperdisk.js

@@ -78,15 +78,7 @@ 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();

compute/disks/createComputeHyperdiskFromPool.js

@@ -84,15 +84,7 @@ 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();

compute/disks/createComputeHyperdiskPool.js

@@ -79,15 +79,7 @@ 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();

compute/reservations/createReservationFromProperties.js

@@ -96,15 +96,7 @@ 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();

compute/reservations/createReservationInstanceTemplate.js

@@ -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();

compute/reservations/deleteReservation.js

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

compute/reservations/reservationVmsUpdate.js

@@ -61,15 +61,7 @@ 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();

compute/test/createComputeHyperdisk.test.js

@@ -26,7 +26,7 @@ const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
 
 describe('Create compute hyperdisk', async () => {
-  const diskName = 'disk-name';
+  const diskName = `hyperdisk-name-941ad2d${Math.floor(Math.random() * 1000 + 1)}`;
   const zone = 'europe-central2-b';
   const disksClient = new DisksClient();
   let projectId;
@@ -54,12 +54,13 @@ describe('Create compute hyperdisk', async () => {
   });
 
   it('should create a new hyperdisk', () => {
-    const response = JSON.parse(
-      execSync('node ./disks/createComputeHyperdisk.js', {
+    const response = execSync(
+      `node ./disks/createComputeHyperdisk.js ${diskName}`,
+      {
         cwd,
-      })
+      }
     );
 
-    assert.equal(response.name, diskName);
+    assert.include(response, `Disk: ${diskName} created.`);
   });
 });

compute/test/createComputeHyperdiskFromPool.test.js

@@ -66,9 +66,9 @@ async function cleanupResources(projectId, zone, diskName, storagePoolName) {
 }
 
 describe('Create compute hyperdisk from pool', async () => {
-  const diskName = 'disk-from-pool-name';
+  const diskName = `disk-from-pool-name-745d98${Math.floor(Math.random() * 1000 + 1)}f`;
   const zone = 'us-central1-a';
-  const storagePoolName = 'storage-pool-name';
+  const storagePoolName = `storage-pool-name-745d9${Math.floor(Math.random() * 1000 + 1)}5f`;
   const disksClient = new DisksClient();
   let projectId;
 
@@ -89,26 +89,24 @@ describe('Create compute hyperdisk from pool', async () => {
   });
 
   it('should create a new storage pool', () => {
-    const response = JSON.parse(
-      execSync('node ./disks/createComputeHyperdiskPool.js', {
+    const response = execSync(
+      `node ./disks/createComputeHyperdiskPool.js ${storagePoolName}`,
+      {
         cwd,
-      })
+      }
     );
 
-    assert.equal(response.name, storagePoolName);
+    assert.include(response, `Storage pool: ${storagePoolName} created.`);
   });
 
   it('should create a new hyperdisk from pool', () => {
-    const response = JSON.parse(
-      execSync('node ./disks/createComputeHyperdiskFromPool.js', {
+    const response = execSync(
+      `node ./disks/createComputeHyperdiskFromPool.js ${diskName} ${storagePoolName}`,
+      {
         cwd,
-      })
+      }
     );
 
-    assert.equal(response.name, diskName);
-    assert.equal(
-      response.storagePool,
-      `https://www.googleapis.com/compute/v1/projects/${projectId}/zones/${zone}/storagePools/${storagePoolName}`
-    );
+    assert.include(response, `Disk: ${diskName} created.`);
   });
 });

compute/test/createReservationGlobalInstanceTemplate.test.js

@@ -17,7 +17,7 @@
 'use strict';
 
 const path = require('path');
-const assert = require('node:assert/strict');
+const {assert} = require('chai');
 const {after, before, describe, it} = require('mocha');
 const cp = require('child_process');
 const {ReservationsClient} = require('@google-cloud/compute').v1;
@@ -26,8 +26,8 @@ const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
 
 describe('Create compute reservation using global instance template', async () => {
-  const reservationName = 'reservation-01';
-  const instanceTemplateName = 'pernament-global-template-name';
+  const reservationName = `global-reservation-68ef06a${Math.floor(Math.random() * 1000 + 1)}`;
+  const instanceTemplateName = `pernament-global-template-68ef06a${Math.floor(Math.random() * 1000 + 1)}`;
   const location = 'global';
   const reservationsClient = new ReservationsClient();
   let projectId;
@@ -58,20 +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 ${location} ${instanceTemplateName}`,
-        {
-          cwd,
-        }
-      )
+    const response = execSync(
+      `node ./reservations/createReservationInstanceTemplate.js ${reservationName} ${location} ${instanceTemplateName}`,
+      {
+        cwd,
+      }
     );
 
-    assert.equal(response.name, reservationName);
-    assert.equal(response.specificReservation.count, '3');
-    assert.equal(
-      response.specificReservation.sourceInstanceTemplate,
-      `https://www.googleapis.com/compute/v1/projects/${projectId}/${location}/instanceTemplates/${instanceTemplateName}`
-    );
+    assert.include(response, `Reservation: ${reservationName} created.`);
   });
 });