Merge branch 'main' into appsync-association-depends-schema

packages/@aws-cdk/integ-tests-alpha/lib/assertions/common.ts

@@ -55,6 +55,8 @@ export abstract class ExpectedResult {
    * ExpectedResult.exact({
    *   stringParam: 'hello',
    * });
+   *
+   * @see https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.assertions.Match.html#static-exactpattern
    */
   public static exact(expected: any): ExpectedResult {
     return {
@@ -74,11 +76,15 @@ export abstract class ExpectedResult {
    *   stringParam: 'hello',
    *   numberParam: 3,
    *   booleanParam: true,
+   *   objectParam: { prop1: 'value', prop2: 'value' },
    * };
    * // pass
    * ExpectedResult.objectLike({
    *   stringParam: 'hello',
+   *   objectParam: { prop1: 'value' },
    * });
+   *
+   * @see https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.assertions.Match.html#static-objectwbrlikepattern
    */
   public static objectLike(expected: { [key: string]: any }): ExpectedResult {
     return {
@@ -108,6 +114,8 @@ export abstract class ExpectedResult {
    *     stringParam: 'hello',
    *   },
    * ]);
+   *
+   * @see https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.assertions.Match.html#static-arraywbrwithpattern
    */
   public static arrayWith(expected: any[]): ExpectedResult {
     return {
@@ -126,6 +134,8 @@ export abstract class ExpectedResult {
    *
    * // pass
    * ExpectedResult.stringLikeRegexp('value');
+   *
+   * @see https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.assertions.Match.html#static-stringwbrlikewbrregexppattern
    */
   public static stringLikeRegexp(expected: string): ExpectedResult {
     return {

packages/@aws-cdk/integ-tests-alpha/lib/assertions/http-call.ts

@@ -47,7 +47,7 @@ export class HttpApiCall extends ApiCallBase {
 
             new CfnOutput(node, 'AssertionResults', {
               value: result,
-            }).overrideLogicalId(`AssertionResults${id}`);
+            }).overrideLogicalId(`AssertionResults${id.replace(/[\W_]+/g, '')}`);
           }
         }
       },

packages/@aws-cdk/integ-tests-alpha/test/assertions/deploy-assert.test.ts

@@ -268,6 +268,27 @@ describe('DeployAssert', () => {
       }));
     });
 
+    test('expect creates a valid CfnOutput', () => {
+      // GIVEN
+      const app = new App();
+      const deplossert = new DeployAssert(app);
+
+      // WHEN
+      const query = deplossert.httpApiCall('https://example.com/test/123?param=value&param2#hash');
+      query.expect(ExpectedResult.objectLike({ status: 200 }));
+
+      // THEN
+      Template.fromStack(deplossert.scope).hasOutput(
+        // Output name should only contain alphanumeric characters
+        'AssertionResultsHttpApiCallexamplecomtest1237c0018be9f253e38cad30092c2fa2a91',
+        {
+          Value: {
+            'Fn::GetAtt': ['HttpApiCallexamplecomtest1237c0018be9f253e38cad30092c2fa2a91', 'assertion'],
+          },
+        },
+      );
+    });
+
     test('multiple calls can be configured', () => {
       // GIVEN
       const app = new App();