fix(parametermanager): update testcases and function arguments

durgesh-ninave-crest · durgesh-ninave-crest · commit dcf70052600d · 2025-05-02T15:40:30.000+05:30
diff --git a/parametermanager/deleteParam.js b/parametermanager/deleteParam.js
@@ -20,7 +20,7 @@
  * @param {string} projectId - The Google Cloud project ID where the parameter is located.
  * @param {string} parameterId - The ID of the parameter to delete.
  */
-async function main(projectId = 'my-project', parameterId = 'my-parameter') {
+async function main(projectId, parameterId) {
   // [START parametermanager_delete_param]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/deleteParamVersion.js b/parametermanager/deleteParamVersion.js
@@ -22,11 +22,7 @@
  * @param {string} parameterId - The ID of the parameter for which version is to be deleted.
  * @param {string} versionId - The version ID of the parameter to delete.
  */
-async function main(
-  projectId = 'my-project',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, parameterId, versionId) {
   // [START parametermanager_delete_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/disableParamVersion.js b/parametermanager/disableParamVersion.js
@@ -23,11 +23,7 @@
  * @param {string} parameterId - The ID of the parameter for which version is to be disabled.
  * @param {string} versionId - The version ID of the parameter to be disabled.
  */
-async function main(
-  projectId = 'my-project',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, parameterId, versionId) {
   // [START parametermanager_disable_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/enableParamVersion.js b/parametermanager/enableParamVersion.js
@@ -23,11 +23,7 @@
  * @param {string} parameterId - The ID of the parameter for which version is to be enabled.
  * @param {string} versionId - The version ID of the parameter to be enabled.
  */
-async function main(
-  projectId = 'my-project',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, parameterId, versionId) {
   // [START parametermanager_enable_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/quickstart.js b/parametermanager/quickstart.js
@@ -29,11 +29,7 @@
  * @param {string} parameterId - The ID of the new parameter.
  * @param {string} parameterVersionId - The ID of the parameter version.
  */
-async function main(
-  projectId = 'my-project',
-  parameterId = 'my-parameter',
-  parameterVersionId = 'v1'
-) {
+async function main(projectId, parameterId, parameterVersionId) {
   // [START parametermanager_quickstart]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/deleteRegionalParam.js b/parametermanager/regional_samples/deleteRegionalParam.js
@@ -22,11 +22,7 @@
  * @param {string} locationId - The ID of the region where parameter is located.
  * @param {string} parameterId - The ID of the parameter to delete.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter'
-) {
+async function main(projectId, locationId, parameterId) {
   // [START parametermanager_delete_regional_param]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/deleteRegionalParamVersion.js b/parametermanager/regional_samples/deleteRegionalParamVersion.js
@@ -23,12 +23,7 @@
  * @param {string} parameterId - The ID of the parameter for which version is to be deleted.
  * @param {string} versionId - The version ID of the parameter to delete.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, locationId, parameterId, versionId) {
   // [START parametermanager_delete_regional_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/disableRegionalParamVersion.js b/parametermanager/regional_samples/disableRegionalParamVersion.js
@@ -26,12 +26,7 @@
  * @param {string} parameterId - The ID of the parameter for which version is to be disabled.
  * @param {string} versionId - The version ID of the parameter to be disabled.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, locationId, parameterId, versionId) {
   // [START parametermanager_disable_regional_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/enableRegionalParamVersion.js b/parametermanager/regional_samples/enableRegionalParamVersion.js
@@ -24,12 +24,7 @@
  * @param {string} parameterId - The ID of the parameter for which version is to be enabled.
  * @param {string} versionId - The version ID of the parameter to be enabled.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, locationId, parameterId, versionId) {
   // [START parametermanager_enable_regional_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/regionalQuickstart.js b/parametermanager/regional_samples/regionalQuickstart.js
@@ -24,12 +24,7 @@
  * @param {string} parameterId - The ID of the parameter to create.
  * @param {string} parameterVersionId - The ID of the parameter version to create.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  parameterVersionId = 'v1'
-) {
+async function main(projectId, locationId, parameterId, parameterVersionId) {
   // [START parametermanager_regional_quickstart]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/test/.eslintrc.yml b/parametermanager/test/.eslintrc.yml
@@ -14,4 +14,4 @@
 
 ---
 env:
-  mocha: true
+  mocha: true
diff --git a/parametermanager/test/parametermanager.test.js b/parametermanager/test/parametermanager.test.js
@@ -29,14 +29,18 @@ const regionalClient = new ParameterManagerClient(options);
 
 const parameterId = `test-parameter-${uuidv4()}`;
 const regionalParameterId = `test-regional-${uuidv4()}`;
-const parameterVersionId = 'v1';
+const parameterVersionId = `test-version-${uuidv4()}`;
 
 let parameter;
 let regionalParameter;
+let parameterVersion;
+let regionalParameterVersion;
 
 describe('Parameter Manager samples', () => {
   const parametersToDelete = [];
   const regionalParametersToDelete = [];
+  const regionalParameterVersionsToDelete = [];
+  const parameterVersionsToDelete = [];
 
   before(async () => {
     projectId = await client.getProjectId();
@@ -62,7 +66,7 @@ describe('Parameter Manager samples', () => {
     regionalParametersToDelete.push(regionalParameter.name);
 
     // Create a version for the global parameter
-    await client.createParameterVersion({
+    [parameterVersion] = await client.createParameterVersion({
       parent: parameter.name,
       parameterVersionId: parameterVersionId,
       parameterVersion: {
@@ -71,9 +75,10 @@ describe('Parameter Manager samples', () => {
         },
       },
     });
+    parameterVersionsToDelete.push(parameterVersion.name);
 
     // Create a version for the regional parameter
-    await regionalClient.createParameterVersion({
+    [regionalParameterVersion] = await regionalClient.createParameterVersion({
       parent: regionalParameter.name,
       parameterVersionId: parameterVersionId,
       parameterVersion: {
@@ -82,22 +87,67 @@ describe('Parameter Manager samples', () => {
         },
       },
     });
+    regionalParameterVersionsToDelete.push(regionalParameterVersion.name);
   });
 
   after(async () => {
-    // Clean up
-    parametersToDelete.forEach(async parameterName => {
-      await client.deleteParameterVersion({
-        name: `${parameterName}/versions/v1`,
-      });
-      await client.deleteParameter({name: parameterName});
-    });
-    regionalParametersToDelete.forEach(async regionalParameterName => {
-      await regionalClient.deleteParameterVersion({
-        name: `${regionalParameterName}/versions/v1`,
-      });
-      await regionalClient.deleteParameter({name: regionalParameterName});
-    });
+    // Delete all parameter versions first
+    await Promise.all(
+      regionalParameterVersionsToDelete.map(
+        async regionalParameterVersionName => {
+          try {
+            await regionalClient.deleteParameterVersion({
+              name: regionalParameterVersionName,
+            });
+          } catch (err) {
+            if (!err.message.includes('NOT_FOUND')) {
+              throw err;
+            }
+          }
+        }
+      )
+    );
+
+    await Promise.all(
+      parameterVersionsToDelete.map(async parameterVersionName => {
+        try {
+          await client.deleteParameterVersion({
+            name: parameterVersionName,
+          });
+        } catch (err) {
+          if (!err.message.includes('NOT_FOUND')) {
+            throw err;
+          }
+        }
+      })
+    );
+
+    // Delete all parameters
+    await Promise.all(
+      parametersToDelete.map(async parameterName => {
+        try {
+          await client.deleteParameter({
+            name: parameterName,
+          });
+        } catch (err) {
+          if (!err.message.includes('NOT_FOUND')) {
+            throw err;
+          }
+        }
+      })
+    );
+
+    await Promise.all(
+      regionalParametersToDelete.map(async regionalParameterName => {
+        try {
+          await regionalClient.deleteParameter({name: regionalParameterName});
+        } catch (err) {
+          if (!err.message.includes('NOT_FOUND')) {
+            throw err;
+          }
+        }
+      })
+    );
   });
 
   it('should runs the quickstart', async () => {
@@ -110,6 +160,7 @@ describe('Parameter Manager samples', () => {
     parametersToDelete.push(
       `projects/${projectId}/locations/global/parameters/${parameterId}-quickstart`
     );
+    parameterVersionsToDelete.push(parameterVersion.name);
     assert.exists(parameterVersion);
     assert.equal(
       parameterVersion.name,
@@ -128,6 +179,7 @@ describe('Parameter Manager samples', () => {
     regionalParametersToDelete.push(
       `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-quickstart`
     );
+    regionalParameterVersionsToDelete.push(parameterVersion.name);
     assert.exists(parameterVersion);
     assert.equal(
       parameterVersion.name,
