fix(parametermanager): update testcases and function arguments

durgesh-ninave-crest · durgesh-ninave-crest · commit 232099c54468 · 2025-05-02T10:31:47.000+05:30
diff --git a/parametermanager/regional_samples/createRegionalParam.js b/parametermanager/regional_samples/createRegionalParam.js
@@ -23,11 +23,7 @@
  * @param {string} locationId - The ID of the region where parameter is to be created.
  * @param {string} parameterId - The ID of the parameter to create. This ID must be unique within the project location.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-regional-parameter'
-) {
+async function main(projectId, locationId, parameterId) {
   // [START parametermanager_create_regional_param]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/createRegionalParamVersion.js b/parametermanager/regional_samples/createRegionalParamVersion.js
@@ -26,11 +26,11 @@
  * @param {string} payload - The unformatted string payload to be stored in the parameter version.
  */
 async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  parameterVersionId = 'v1',
-  payload = 'This is unstructured data'
+  projectId,
+  locationId,
+  parameterId,
+  parameterVersionId,
+  payload
 ) {
   // [START parametermanager_create_regional_param_version]
   /**
diff --git a/parametermanager/regional_samples/createRegionalParamVersionWithSecret.js b/parametermanager/regional_samples/createRegionalParamVersionWithSecret.js
@@ -26,11 +26,11 @@
  * @param {string} secretId - The ID of the secret to be referenced.
  */
 async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  parameterVersionId = 'v1',
-  secretId = 'projects/my-project/secrets/application-secret/version/latest'
+  projectId,
+  locationId,
+  parameterId,
+  parameterVersionId,
+  secretId
 ) {
   // [START parametermanager_create_regional_param_version_with_secret]
   /**
diff --git a/parametermanager/regional_samples/createStructuredRegionalParam.js b/parametermanager/regional_samples/createStructuredRegionalParam.js
@@ -14,8 +14,6 @@
 
 'use strict';
 
-const {protos} = require('@google-cloud/parametermanager');
-
 /**
  * Creates a parameter in the specified region of the specified project using the Google Cloud Parameter Manager SDK.
  * The parameter is created with the specified format type.
@@ -25,12 +23,7 @@ const {protos} = require('@google-cloud/parametermanager');
  * @param {string} parameterId - The ID of the parameter to create.
  * @param {string} formatType - The format type of the parameter (UNFORMATTED, YAML, JSON).
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-json-parameter',
-  formatType = protos.google.cloud.parametermanager.v1.ParameterFormat.JSON
-) {
+async function main(projectId, locationId, parameterId, formatType) {
   // [START parametermanager_create_structured_regional_param]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/createStructuredRegionalParamVersion.js b/parametermanager/regional_samples/createStructuredRegionalParamVersion.js
@@ -26,11 +26,11 @@
  * @param {Object} payload - The JSON data payload to be stored in the parameter version.
  */
 async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  parameterVersionId = 'v1',
-  payload = {username: 'test-user', host: 'localhost'}
+  projectId,
+  locationId,
+  parameterId,
+  parameterVersionId,
+  payload
 ) {
   // [START parametermanager_create_structured_regional_param_version]
   /**
diff --git a/parametermanager/regional_samples/getRegionalParam.js b/parametermanager/regional_samples/getRegionalParam.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 retrieve.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter'
-) {
+async function main(projectId, locationId, parameterId) {
   // [START parametermanager_get_regional_param]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/getRegionalParamVersion.js b/parametermanager/regional_samples/getRegionalParamVersion.js
@@ -23,12 +23,7 @@
  * @param {string} parameterId - The ID of the parameter for which version details are to be retrieved.
  * @param {string} versionId - The version ID of the parameter to retrieve.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  versionId = 'v1'
-) {
+async function main(projectId, locationId, parameterId, versionId) {
   // [START parametermanager_get_regional_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/listRegionalParamVersions.js b/parametermanager/regional_samples/listRegionalParamVersions.js
@@ -22,11 +22,7 @@
  * @param {string} locationId - The ID of the region where the parameter is located.
  * @param {string} parameterId - The parameter ID for which versions are to be listed.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter'
-) {
+async function main(projectId, locationId, parameterId) {
   // [START parametermanager_list_regional_param_versions]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/listRegionalParams.js b/parametermanager/regional_samples/listRegionalParams.js
@@ -21,7 +21,7 @@
  * @param {string} projectId - The Google Cloud project ID where the parameters are located.
  * @param {string} locationId - The ID of the region where parameters are located.
  */
-async function main(projectId = 'my-project', locationId = 'us-central1') {
+async function main(projectId, locationId) {
   // [START parametermanager_list_regional_params]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/regional_samples/renderRegionalParamVersion.js b/parametermanager/regional_samples/renderRegionalParamVersion.js
@@ -24,12 +24,7 @@
  * @param {string} parameterId - The ID of the parameter for which version details are to be rendered.
  * @param {string} parameterVersionId - The ID of the parameter version to be rendered.
  */
-async function main(
-  projectId = 'my-project',
-  locationId = 'us-central1',
-  parameterId = 'my-parameter',
-  parameterVersionId = 'v1'
-) {
+async function main(projectId, locationId, parameterId, parameterVersionId) {
   // [START parametermanager_render_regional_param_version]
   /**
    * TODO(developer): Uncomment these variables before running the sample.
diff --git a/parametermanager/test/parametermanager.test.js b/parametermanager/test/parametermanager.test.js
@@ -36,14 +36,18 @@ const regionalSecretClient = new SecretManagerServiceClient(secretOptions);
 
 const secretId = `test-secret-${uuidv4()}`;
 const regionalParameterId = `test-regional-${uuidv4()}`;
-const parameterVersionId = 'v1';
+const parameterVersionId = `test-version-${uuidv4()}`;
+
+const jsonPayload = '{username: "test-user", host: "localhost"}';
+const payload = 'This is unstructured data';
 
 let regionalParameter;
 let regionalSecret;
 let regionalSecretVersion;
 
 describe('Parameter Manager samples', () => {
   const regionalParametersToDelete = [];
+  const regionalParameterVersionsToDelete = [];
 
   before(async () => {
     projectId = await client.getProjectId();
@@ -74,21 +78,44 @@ describe('Parameter Manager samples', () => {
   });
 
   after(async () => {
-    // Clean up
-    regionalParametersToDelete.forEach(async regionalParameterName => {
-      await regionalClient.deleteParameterVersion({
-        name: `${regionalParameterName}/versions/v1`,
+    // Delete all parameter versions first
+    try {
+      await Promise.all(
+        regionalParameterVersionsToDelete.map(
+          async regionalParameterVersionName => {
+            await regionalClient.deleteParameterVersion({
+              name: regionalParameterVersionName,
+            });
+          }
+        )
+      );
+    } catch (err) {
+      if (!err.message.includes('NOT_FOUND')) {
+        throw err;
+      }
+    }
+
+    // Delete all parameters
+    try {
+      await Promise.all(
+        regionalParametersToDelete.map(async regionalParameterName => {
+          await regionalClient.deleteParameter({name: regionalParameterName});
+        })
+      );
+    } catch (err) {
+      if (!err.message.includes('NOT_FOUND')) {
+        throw err;
+      }
+    }
+    try {
+      await regionalSecretClient.deleteSecret({
+        name: regionalSecret.name,
       });
-      if (regionalParameterName === regionalParameter.name) {
-        await regionalClient.deleteParameterVersion({
-          name: `${regionalParameterName}/versions/v12`,
-        });
+    } catch (err) {
+      if (!err.message.includes('NOT_FOUND')) {
+        throw err;
       }
-      await regionalClient.deleteParameter({name: regionalParameterName});
-    });
-    await regionalSecretClient.deleteSecret({
-      name: regionalSecret.name,
-    });
+    }
   });
 
   it('should create regional parameter version with secret references', async () => {
@@ -97,13 +124,14 @@ describe('Parameter Manager samples', () => {
       projectId,
       locationId,
       regionalParameterId,
-      parameterVersionId + '2',
+      parameterVersionId + '-1',
       regionalSecretVersion.name
     );
+    regionalParameterVersionsToDelete.push(parameterVersion.name);
     assert.exists(parameterVersion);
     assert.equal(
       parameterVersion.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}/versions/${parameterVersionId}2`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}/versions/${parameterVersionId}-1`
     );
   });
 
@@ -112,15 +140,13 @@ describe('Parameter Manager samples', () => {
     const parameter = await sample.main(
       projectId,
       locationId,
-      regionalParameterId + '-2'
-    );
-    regionalParametersToDelete.push(
-      client.parameterPath(projectId, locationId, `${regionalParameterId}-2`)
+      regionalParameterId + '-1'
     );
+    regionalParametersToDelete.push(parameter.name);
     assert.exists(parameter);
     assert.equal(
       parameter.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-2`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-1`
     );
   });
 
@@ -129,15 +155,13 @@ describe('Parameter Manager samples', () => {
     const parameter = await sample.main(
       projectId,
       locationId,
-      regionalParameterId + '-3'
-    );
-    regionalParametersToDelete.push(
-      client.parameterPath(projectId, locationId, `${regionalParameterId}-3`)
+      regionalParameterId + '-2'
     );
+    regionalParametersToDelete.push(parameter.name);
     assert.exists(parameter);
     assert.equal(
       parameter.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-3`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-2`
     );
   });
 
@@ -146,13 +170,15 @@ describe('Parameter Manager samples', () => {
     const parameterVersion = await sample.main(
       projectId,
       locationId,
-      regionalParameterId + '-2',
-      parameterVersionId
+      regionalParameterId + '-1',
+      parameterVersionId + '-2',
+      jsonPayload
     );
+    regionalParameterVersionsToDelete.push(parameterVersion.name);
     assert.exists(parameterVersion);
     assert.equal(
       parameterVersion.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-2/versions/${parameterVersionId}`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-1/versions/${parameterVersionId}-2`
     );
   });
 
@@ -161,13 +187,15 @@ describe('Parameter Manager samples', () => {
     const parameterVersion = await sample.main(
       projectId,
       locationId,
-      regionalParameterId + '-3',
-      parameterVersionId
+      regionalParameterId + '-2',
+      parameterVersionId + '-3',
+      payload
     );
+    regionalParameterVersionsToDelete.push(parameterVersion.name);
     assert.exists(parameterVersion);
     assert.equal(
       parameterVersion.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-3/versions/${parameterVersionId}`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-2/versions/${parameterVersionId}-3`
     );
   });
 
@@ -182,23 +210,23 @@ describe('Parameter Manager samples', () => {
     const parameter = await sample.main(
       projectId,
       locationId,
-      regionalParameterId + '-2'
+      regionalParameterId
     );
     assert.exists(parameter);
     assert.equal(
       parameter.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}-2`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}`
     );
   });
 
   it('should list regional parameter versions', async () => {
     const sample = require('../regional_samples/listRegionalParamVersions');
-    const parameterVersion = await sample.main(
+    const parameterVersions = await sample.main(
       projectId,
       locationId,
       regionalParameterId
     );
-    assert.exists(parameterVersion);
+    assert.exists(parameterVersions);
   });
 
   it('should get a regional parameter version', async () => {
@@ -207,13 +235,14 @@ describe('Parameter Manager samples', () => {
       projectId,
       locationId,
       regionalParameterId,
-      parameterVersionId + '2'
+      parameterVersionId + '-1'
     );
     assert.exists(parameterVersion);
     assert.equal(
       parameterVersion.name,
-      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}/versions/${parameterVersionId}2`
+      `projects/${projectId}/locations/${locationId}/parameters/${regionalParameterId}/versions/${parameterVersionId}-1`
     );
+    assert.equal(parameterVersion.disabled, false);
   });
 
   it('should render regional parameter version', async () => {
@@ -241,7 +270,7 @@ describe('Parameter Manager samples', () => {
       projectId,
       locationId,
       regionalParameterId,
-      parameterVersionId + '2'
+      parameterVersionId + '-1'
     );
     assert.exists(parameterVersion);
   });
