Remove unneccessary samples

Author: Joanna Grycz

compute/reservations/createReservationGlobalInstanceTemplate.js

@@ -16,8 +16,8 @@
 
 'use strict';
 
-async function main() {
-  // [START compute_reservation_create_for_regional_instance_template]
+async function main(location, instanceTemplateName) {
+  // [START compute_reservation_create_template]
   // Import the Compute library
   const computeLib = require('@google-cloud/compute');
   const compute = computeLib.protos.google.cloud.compute.v1;
@@ -38,15 +38,27 @@ async function main() {
   const reservationName = 'reservation-01';
   // The number of VMs to reserve.
   const vmsNumber = 3;
-  // The name of an existing instance template.
-  const instanceTemplateName = 'region-template-name';
-  // The location of the instance template.
-  // For a regional instance template: regions/REGION. Replace REGION with the region where the instance template is located.
+
+  /**
+   * The name of an existing instance template.
+   * TODO(developer): Uncomment and update instanceTemplateName before running the sample.
+   */
+  // const instanceTemplateName = 'pernament-region-template-name';
+
+  /**
+   * // The location of the instance template.
+   * TODO(developer): Uncomment the `location` variable depending on which template you want to use.
+   */
+
+  // The location for a regional instance template: regions/{region}. Replace region with the region where the instance template is located.
   // If you specify a regional instance template, then you can only reserve VMs within the same region as the template's region.
-  const location = `regions/${zone.slice(0, -2)}`;
+  // const location = `regions/${zone.slice(0, -2)}`;
+
+  // The location for a global instance template.
+  // const location = 'global';
 
-  async function callCreateComputeReservationGlobalInstanceTemplate() {
-    // Create reservation for 3 VMs in zone us-central1-a by specifying a global instance template.
+  async function callCreateComputeReservationInstanceTemplate() {
+    // Create reservation for 3 VMs in zone us-central1-a by specifying a instance template.
     const specificReservation = new compute.AllocationSpecificSKUReservation({
       count: vmsNumber,
       sourceInstanceTemplate: `projects/${projectId}/${location}/instanceTemplates/${instanceTemplateName}`,
@@ -86,11 +98,11 @@ async function main() {
     console.log(JSON.stringify(createdReservation));
   }
 
-  await callCreateComputeReservationGlobalInstanceTemplate();
-  // [END compute_reservation_create_for_regional_instance_template]
+  await callCreateComputeReservationInstanceTemplate();
+  // [END compute_reservation_create_template]
 }
 
-main().catch(err => {
-  console.error(err);
+main(...process.argv.slice(2)).catch(err => {
+  console.error(err.message);
   process.exitCode = 1;
 });

…eateReservationRegionInstanceTemplate.js …ons/createReservationInstanceTemplate.jscompute/reservations/createReservationRegionInstanceTemplate.js renamed to compute/reservations/createReservationInstanceTemplate.js compute/reservations/createReservationRegionInstanceTemplate.js renamed to compute/reservations/createReservationInstanceTemplate.js

@@ -18,28 +18,19 @@
 
 const path = require('path');
 const assert = require('node:assert/strict');
-const {after, before, describe, it} = require('mocha');
+const {after, describe, it} = require('mocha');
 const cp = require('child_process');
-const {ReservationsClient} = require('@google-cloud/compute').v1;
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
 
 describe('Create compute reservation by specyfing properties directly', async () => {
   const reservationName = 'reservation-01';
-  const zone = 'us-central1-a';
-  const reservationsClient = new ReservationsClient();
-  let projectId;
-
-  before(async () => {
-    projectId = await reservationsClient.getProjectId();
-  });
 
   after(async () => {
-    await reservationsClient.delete({
-      project: projectId,
-      reservation: reservationName,
-      zone,
+    // // Delete reservation
+    execSync('node ./reservations/deleteReservation.js', {
+      cwd,
     });
   });
 

…stance-templates/createRegionTemplate.js compute/reservations/createTemplate.jscompute/create-instance-templates/createRegionTemplate.js renamed to compute/reservations/createTemplate.js compute/create-instance-templates/createRegionTemplate.js renamed to compute/reservations/createTemplate.js

@@ -27,13 +27,14 @@ const cwd = path.join(__dirname, '..');
 
 describe('Create compute reservation using global instance template', async () => {
   const reservationName = 'reservation-01';
-  const instanceTemplateName = 'global-template-name';
+  const instanceTemplateName = 'pernament-global-template-name';
+  const location = 'global';
   const reservationsClient = new ReservationsClient();
   let projectId;
 
   before(async () => {
     projectId = await reservationsClient.getProjectId();
-    // Create instance template
+    // Create template
     execSync(
       `node ./create-instance-templates/createTemplate.js ${projectId} ${instanceTemplateName}`,
       {
@@ -47,7 +48,6 @@ describe('Create compute reservation using global instance template', async () =
     execSync('node ./reservations/deleteReservation.js', {
       cwd,
     });
-
     // Delete template
     execSync(
       `node ./create-instance-templates/deleteInstanceTemplate.js ${projectId} ${instanceTemplateName}`,
@@ -60,7 +60,7 @@ describe('Create compute reservation using global instance template', async () =
   it('should create a new reservation', () => {
     const response = JSON.parse(
       execSync(
-        'node ./reservations/createReservationGlobalInstanceTemplate.js',
+        `node ./reservations/createReservationInstanceTemplate.js ${location} ${instanceTemplateName}`,
         {
           cwd,
         }
@@ -71,7 +71,7 @@ describe('Create compute reservation using global instance template', async () =
     assert.equal(response.specificReservation.count, '3');
     assert.equal(
       response.specificReservation.sourceInstanceTemplate,
-      `https://www.googleapis.com/compute/v1/projects/${projectId}/global/instanceTemplates/${instanceTemplateName}`
+      `https://www.googleapis.com/compute/v1/projects/${projectId}/${location}/instanceTemplates/${instanceTemplateName}`
     );
   });
 });

compute/test/createRegionTemplate.test.js

@@ -20,60 +20,33 @@ const path = require('path');
 const assert = require('node:assert/strict');
 const {after, before, describe, it} = require('mocha');
 const cp = require('child_process');
-const {
-  ReservationsClient,
-  RegionInstanceTemplatesClient,
-  RegionOperationsClient,
-} = require('@google-cloud/compute').v1;
+const {ReservationsClient} = require('@google-cloud/compute').v1;
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cwd = path.join(__dirname, '..');
 
 describe('Create compute reservation using regional instance template', async () => {
   const reservationName = 'reservation-01';
-  const instanceTemplateName = 'region-template-name';
-  const zone = 'us-central1-a';
+  const instanceTemplateName = 'pernament-region-template-name';
+  const location = 'regions/us-central1';
   const reservationsClient = new ReservationsClient();
-  const instanceTemplatesClient = new RegionInstanceTemplatesClient();
-  const regionOperationsClient = new RegionOperationsClient();
   let projectId;
 
   before(async () => {
     projectId = await reservationsClient.getProjectId();
-    // Create instance template
-    execSync('node ./create-instance-templates/createRegionTemplate.js', {
-      cwd,
-    });
   });
 
-  after(async () => {
+  after(() => {
     // Delete reservation
     execSync('node ./reservations/deleteReservation.js', {
       cwd,
     });
-
-    // Delete template
-    const [templateResponse] = await instanceTemplatesClient.delete({
-      project: projectId,
-      instanceTemplate: instanceTemplateName,
-      region: zone.slice(0, -2),
-    });
-    let templateOperation = templateResponse.latestResponse;
-
-    // Wait for the delete template operation to complete.
-    while (templateOperation.status !== 'DONE') {
-      [templateOperation] = await regionOperationsClient.wait({
-        operation: templateOperation.name,
-        project: projectId,
-        region: zone.slice(0, -2),
-      });
-    }
   });
 
   it('should create a new reservation', () => {
     const response = JSON.parse(
       execSync(
-        'node ./reservations/createReservationRegionInstanceTemplate.js',
+        `node ./reservations/createReservationInstanceTemplate.js ${location} ${instanceTemplateName}`,
         {
           cwd,
         }
@@ -84,7 +57,7 @@ describe('Create compute reservation using regional instance template', async ()
     assert.equal(response.specificReservation.count, '3');
     assert.equal(
       response.specificReservation.sourceInstanceTemplate,
-      `https://www.googleapis.com/compute/v1/projects/${projectId}/regions/${zone.slice(0, -2)}/instanceTemplates/${instanceTemplateName}`
+      `https://www.googleapis.com/compute/v1/projects/${projectId}/${location}/instanceTemplates/${instanceTemplateName}`
     );
   });
 });