Skip to content

Commit 16e1028

Browse files
committed
test(secret-manager): fix ALREADY_EXISTS in delayed destroy tests by using unique UUIDs
1 parent fd1aed3 commit 16e1028

1 file changed

Lines changed: 23 additions & 12 deletions

File tree

secret-manager/test/secretmanager.test.js

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -687,9 +687,12 @@ describe('Secret Manager samples', () => {
687687
});
688688

689689
it('disables a secret delayed destroy', async () => {
690+
const customSecretId = `${secretId}-${v4()}`;
691+
const fullSecretName = `projects/${projectId}/secrets/${customSecretId}`;
692+
690693
await client.createSecret({
691694
parent: `projects/${projectId}`,
692-
secretId: `${secretId}-delayedDestroy`,
695+
secretId: customSecretId,
693696
secret: {
694697
replication: {
695698
automatic: {},
@@ -701,20 +704,22 @@ describe('Secret Manager samples', () => {
701704
});
702705

703706
const output = execSync(
704-
`node disableSecretDelayedDestroy.js ${secret.name}-delayedDestroy`
707+
`node disableSecretDelayedDestroy.js ${fullSecretName}`
705708
);
706709
assert.match(output, new RegExp('Disabled delayed destroy'));
707710

708711
await client.deleteSecret({
709-
name: `${secret.name}-delayedDestroy`,
712+
name: fullSecretName,
710713
});
711714
});
712715

713716
it('updates a secret delayed destroy', async () => {
717+
const customSecretId = `${secretId}-${v4()}`;
718+
const fullSecretName = `projects/${projectId}/secrets/${customSecretId}`;
714719
const updatedTimeToLive = 24 * 60 * 60 * 2;
715720
await client.createSecret({
716721
parent: `projects/${projectId}`,
717-
secretId: `${secretId}-delayedDestroy`,
722+
secretId: customSecretId,
718723
secret: {
719724
replication: {
720725
automatic: {},
@@ -726,11 +731,11 @@ describe('Secret Manager samples', () => {
726731
});
727732

728733
const output = execSync(
729-
`node updateSecretWithDelayedDestroy.js ${secret.name}-delayedDestroy ${updatedTimeToLive}`
734+
`node updateSecretWithDelayedDestroy.js ${fullSecretName} ${updatedTimeToLive}`
730735
);
731736
assert.match(output, new RegExp('Updated secret'));
732737
await client.deleteSecret({
733-
name: `${secret.name}-delayedDestroy`,
738+
name: fullSecretName,
734739
});
735740
});
736741

@@ -743,9 +748,12 @@ describe('Secret Manager samples', () => {
743748
});
744749

745750
it('disables a regional secret delayed destroy', async () => {
751+
const customSecretId = `${secretId}-${v4()}`;
752+
const fullSecretName = `projects/${projectId}/locations/${locationId}/secrets/${customSecretId}`;
753+
746754
await regionalClient.createSecret({
747755
parent: `projects/${projectId}/locations/${locationId}`,
748-
secretId: `${secretId}-delayedDestroy`,
756+
secretId: customSecretId,
749757
secret: {
750758
version_destroy_ttl: {
751759
seconds: 24 * 60 * 60,
@@ -754,20 +762,23 @@ describe('Secret Manager samples', () => {
754762
});
755763

756764
const output = execSync(
757-
`node regional_samples/disableRegionalSecretDelayedDestroy.js ${projectId} ${locationId} ${secretId}-delayedDestroy`
765+
`node regional_samples/disableRegionalSecretDelayedDestroy.js ${projectId} ${locationId} ${customSecretId}`
758766
);
759767
assert.match(output, new RegExp('Disabled delayed destroy'));
760768

761769
await regionalClient.deleteSecret({
762-
name: `projects/${projectId}/locations/${locationId}/secrets/${secretId}-delayedDestroy`,
770+
name: fullSecretName,
763771
});
764772
});
765773

766774
it('updates a regional secret delayed destroy', async () => {
775+
const customSecretId = `${secretId}-${v4()}`;
776+
const fullSecretName = `projects/${projectId}/locations/${locationId}/secrets/${customSecretId}`;
777+
767778
const updatedTimeToLive = 24 * 60 * 60 * 2;
768779
await regionalClient.createSecret({
769780
parent: `projects/${projectId}/locations/${locationId}`,
770-
secretId: `${secretId}-delayedDestroy`,
781+
secretId: customSecretId,
771782
secret: {
772783
version_destroy_ttl: {
773784
seconds: 24 * 60 * 60,
@@ -776,11 +787,11 @@ describe('Secret Manager samples', () => {
776787
});
777788

778789
const output = execSync(
779-
`node regional_samples/updateRegionalSecretWithDelayedDestroy.js ${projectId} ${locationId} ${secretId}-delayedDestroy ${updatedTimeToLive}`
790+
`node regional_samples/updateRegionalSecretWithDelayedDestroy.js ${projectId} ${locationId} ${customSecretId} ${updatedTimeToLive}`
780791
);
781792
assert.match(output, new RegExp('Updated regional secret'));
782793
await regionalClient.deleteSecret({
783-
name: `projects/${projectId}/locations/${locationId}/secrets/${secretId}-delayedDestroy`,
794+
name: fullSecretName,
784795
});
785796
});
786797

0 commit comments

Comments
 (0)