aws · mergify · Oct 10, 2023 · Oct 2, 2023 · Oct 3, 2023 · Oct 3, 2023
diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/private/deploy-assert.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/private/deploy-assert.ts
@@ -50,6 +50,7 @@ export class DeployAssert extends Construct implements IDeployAssert {
   }
 
   public scope: Stack;
+  private assertionIdCounts = new Map<string, number>();
 
   constructor(scope: Construct, props?: DeployAssertProps) {
     super(scope, 'Default');
@@ -65,7 +66,7 @@ export class DeployAssert extends Construct implements IDeployAssert {
       hash = md5hash(this.scope.resolve(parameters));
     } catch {}
 
-    return new AwsApiCall(this.scope, `AwsApiCall${service}${api}${hash}`, {
+    return new AwsApiCall(this.scope, this.uniqueAssertionId(`AwsApiCall${service}${api}${hash}`), {
       api,
       service,
       parameters,
@@ -87,15 +88,15 @@ export class DeployAssert extends Construct implements IDeployAssert {
       const parsedUrl = new URL(url);
       append = `${parsedUrl.hostname}${parsedUrl.pathname}`;
     }
-    return new HttpApiCall(this.scope, `HttpApiCall${append}${hash}`, {
+    return new HttpApiCall(this.scope, this.uniqueAssertionId(`HttpApiCall${append}${hash}`), {
       url,
       fetchOptions: options,
     });
   }
 
   public invokeFunction(props: LambdaInvokeFunctionProps): IApiCall {
     const hash = md5hash(this.scope.resolve(props));
-    return new LambdaInvokeFunction(this.scope, `LambdaInvoke${hash}`, props);
+    return new LambdaInvokeFunction(this.scope, this.uniqueAssertionId(`LambdaInvoke${hash}`), props);
   }
 
   public expect(id: string, expected: ExpectedResult, actual: ActualResult): void {
@@ -104,4 +105,22 @@ export class DeployAssert extends Construct implements IDeployAssert {
       actual,
     });
   }
+
+  /**
+   * Gets a unique logical id based on a proposed assertion id.
+   */
+  private uniqueAssertionId(id: string): string {
+    const count = this.assertionIdCounts.get(id);
+
+    if (count === undefined) {
+      // If we've never seen this id before, we'll return the id unchanged
+      // to maintain backward compatibility.
+      this.assertionIdCounts.set(id, 1);
+      return id;
+    }
+
+    // Otherwise, we'll increment the counter and return a unique id.
+    this.assertionIdCounts.set(id, count + 1);
+    return `${id}${count}`;
+  }
 }
diff --git a/packages/@aws-cdk/integ-tests-alpha/test/assertions/deploy-assert.test.ts b/packages/@aws-cdk/integ-tests-alpha/test/assertions/deploy-assert.test.ts
@@ -145,6 +145,21 @@ describe('DeployAssert', () => {
       template.resourceCountIs('Custom::DeployAssert@SdkCallMyServiceMyApi2', 1);
     });
 
+    test('multiple identical calls can be configured', () => {
+      // GIVEN
+      const app = new App();
+
+      // WHEN
+      const deplossert = new DeployAssert(app);
+      deplossert.awsApiCall('MyService', 'MyApi');
+      deplossert.awsApiCall('MyService', 'MyApi');
+
+      // THEN
+      const template = Template.fromStack(deplossert.scope);
+      template.resourceCountIs('AWS::Lambda::Function', 1);
+      template.resourceCountIs('Custom::DeployAssert@SdkCallMyServiceMyApi', 2);
+    });
+
     test('custom resource type length is truncated when greater than 60 characters', () => {
       // GIVEN
       const app = new App();
@@ -203,6 +218,21 @@ describe('DeployAssert', () => {
       template.resourceCountIs('Custom::DeployAssert@HttpCallexamplecomtest789', 1);
     });
 
+    test('multiple identical calls can be configured', () => {
+      // GIVEN
+      const app = new App();
+
+      // WHEN
+      const deplossert = new DeployAssert(app);
+      deplossert.httpApiCall('https://example.com/test');
+      deplossert.httpApiCall('https://example.com/test');
+
+      // THEN
+      const template = Template.fromStack(deplossert.scope);
+      template.resourceCountIs('AWS::Lambda::Function', 1);
+      template.resourceCountIs('Custom::DeployAssert@HttpCallexamplecomtest', 2);
+    });
+
     test('call with fetch options', () => {
       // GIVEN
       const app = new App();

diff --git a/...tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/Assertions.assets.json b/...tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/Assertions.assets.json
diff --git a/...rs/integ.assertions.js.snapshot/AssertionsTestDefaultTestDeployAssertDC0672BB.assets.json b/...rs/integ.assertions.js.snapshot/AssertionsTestDefaultTestDeployAssertDC0672BB.assets.json
diff --git a/.../integ.assertions.js.snapshot/AssertionsTestDefaultTestDeployAssertDC0672BB.template.json b/.../integ.assertions.js.snapshot/AssertionsTestDefaultTestDeployAssertDC0672BB.template.json
diff --git a/...@aws-cdk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/cdk.out b/...@aws-cdk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/cdk.out
diff --git a/...s-cdk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/integ.json b/...s-cdk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/integ.json
diff --git a/...dk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/manifest.json b/...dk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/manifest.json
diff --git a/...ws-cdk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/tree.json b/...ws-cdk/integ-tests-alpha/test/assertions/providers/integ.assertions.js.snapshot/tree.json