feat(assertions): match into serialized json

packages/@aws-cdk/assertions/lib/match.ts

@@ -292,16 +292,13 @@ class SerializedJson extends Matcher {
       parsed = JSON.parse(actual);
     } catch (err) {
       if (err instanceof SyntaxError) {
-        result.push(this, [], 'Invalid JSON string');
+        result.push(this, [], `Invalid JSON string: ${actual}`);
         return result;
       } else {
         throw err;
       }
     }
 
-    if (parsed == null) {
-      result.push(this, [], 'Invalid JSON string');
-    }
     const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
     const innerResult = matcher.test(parsed);
     result.compose(`(${this.name})`, innerResult);

packages/@aws-cdk/assertions/test/match.test.ts

@@ -356,6 +356,12 @@ describe('Matchers', () => {
       expectFailure(matcher, '{ "Foo": ["Baz"] }', ['Missing element [Bar] at pattern index 0 at (serializedJson)/Foo']);
       expectFailure(matcher, '{ "Bar": ["Baz"] }', ['Missing key at (serializedJson)/Foo']);
     });
+
+    test('invalid json string', () => {
+      matcher = Match.serializedJson({ Foo: 'Bar' });
+
+      expectFailure(matcher, '{ "Foo"', [/invalid JSON string/i]);
+    });
   });
 });
 

packages/@aws-cdk/pipelines/package.json

@@ -32,7 +32,6 @@
     "organization": true
   },
   "devDependencies": {
-    "@aws-cdk/assert-internal": "0.0.0",
     "@aws-cdk/assertions": "0.0.0",
     "@aws-cdk/aws-apigateway": "0.0.0",
     "@aws-cdk/aws-ecr-assets": "0.0.0",

packages/@aws-cdk/pipelines/test/compliance/assets.test.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { Capture, Match, Template } from '@aws-cdk/assertions';
-import '@aws-cdk/assert-internal/jest';
 import * as cb from '@aws-cdk/aws-codebuild';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import { Stack, Stage } from '@aws-cdk/core';

packages/@aws-cdk/pipelines/test/compliance/docker-credentials.test.ts

@@ -1,5 +1,4 @@
 import { Match, Template } from '@aws-cdk/assertions';
-import '@aws-cdk/assert-internal/jest';
 import * as cb from '@aws-cdk/aws-codebuild';
 import * as secretsmanager from '@aws-cdk/aws-secretsmanager';
 import { Stack } from '@aws-cdk/core';

packages/@aws-cdk/pipelines/test/compliance/security-check.test.ts

@@ -1,5 +1,4 @@
 import { Match, Template } from '@aws-cdk/assertions';
-import '@aws-cdk/assert-internal/jest';
 import { Topic } from '@aws-cdk/aws-sns';
 import { Stack } from '@aws-cdk/core';
 import * as cdkp from '../../lib';

packages/@aws-cdk/pipelines/test/compliance/self-mutation.test.ts

@@ -1,6 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { Match, Template } from '@aws-cdk/assertions';
-import '@aws-cdk/assert-internal/jest';
 import * as cb from '@aws-cdk/aws-codebuild';
 import * as cp from '@aws-cdk/aws-codepipeline';
 import { Stack, Stage } from '@aws-cdk/core';

packages/@aws-cdk/pipelines/test/compliance/stack-ordering.test.ts

@@ -1,7 +1,6 @@
-import { arrayWith, objectLike } from '@aws-cdk/assert-internal';
-import '@aws-cdk/assert-internal/jest';
+import { Match, Template } from '@aws-cdk/assertions';
 import { App, Stack } from '@aws-cdk/core';
-import { behavior, LegacyTestGitHubNpmPipeline, ModernTestGitHubNpmPipeline, OneStackApp, PIPELINE_ENV, sortedByRunOrder, TestApp, ThreeStackApp, TwoStackApp } from '../testhelpers';
+import { behavior, LegacyTestGitHubNpmPipeline, ModernTestGitHubNpmPipeline, OneStackApp, PIPELINE_ENV, sortByRunOrder, TestApp, ThreeStackApp, TwoStackApp } from '../testhelpers';
 
 let app: App;
 let pipelineStack: Stack;
@@ -28,16 +27,16 @@ behavior('interdependent stacks are in the right order', (suite) => {
 
   function THEN_codePipelineExpectation() {
     // THEN
-    expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', {
-      Stages: arrayWith({
+    Template.fromStack(pipelineStack).hasResourceProperties('AWS::CodePipeline::Pipeline', {
+      Stages: Match.arrayWith([{
         Name: 'MyApp',
-        Actions: sortedByRunOrder([
-          objectLike({ Name: 'Stack1.Prepare' }),
-          objectLike({ Name: 'Stack1.Deploy' }),
-          objectLike({ Name: 'Stack2.Prepare' }),
-          objectLike({ Name: 'Stack2.Deploy' }),
+        Actions: sortByRunOrder([
+          Match.objectLike({ Name: 'Stack1.Prepare' }),
+          Match.objectLike({ Name: 'Stack1.Deploy' }),
+          Match.objectLike({ Name: 'Stack2.Prepare' }),
+          Match.objectLike({ Name: 'Stack2.Deploy' }),
         ]),
-      }),
+      }]),
     });
   }
 });
@@ -59,20 +58,20 @@ behavior('multiple independent stacks go in parallel', (suite) => {
   });
 
   function THEN_codePipelineExpectation() {
-    expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', {
-      Stages: arrayWith({
+    Template.fromStack(pipelineStack).hasResourceProperties('AWS::CodePipeline::Pipeline', {
+      Stages: Match.arrayWith([{
         Name: 'MyApp',
-        Actions: sortedByRunOrder([
+        Actions: sortByRunOrder([
           // 1 and 2 in parallel
-          objectLike({ Name: 'Stack1.Prepare' }),
-          objectLike({ Name: 'Stack2.Prepare' }),
-          objectLike({ Name: 'Stack1.Deploy' }),
-          objectLike({ Name: 'Stack2.Deploy' }),
+          Match.objectLike({ Name: 'Stack1.Prepare' }),
+          Match.objectLike({ Name: 'Stack2.Prepare' }),
+          Match.objectLike({ Name: 'Stack1.Deploy' }),
+          Match.objectLike({ Name: 'Stack2.Deploy' }),
           // Then 3
-          objectLike({ Name: 'Stack3.Prepare' }),
-          objectLike({ Name: 'Stack3.Deploy' }),
+          Match.objectLike({ Name: 'Stack3.Prepare' }),
+          Match.objectLike({ Name: 'Stack3.Deploy' }),
         ]),
-      }),
+      }]),
     });
   }
 });
@@ -86,18 +85,18 @@ behavior('user can request manual change set approvals', (suite) => {
     });
 
     // THEN
-    expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', {
-      Stages: arrayWith({
+    Template.fromStack(pipelineStack).hasResourceProperties('AWS::CodePipeline::Pipeline', {
+      Stages: Match.arrayWith([{
         Name: 'MyApp',
-        Actions: sortedByRunOrder([
-          objectLike({ Name: 'Stack1.Prepare' }),
-          objectLike({ Name: 'ManualApproval' }),
-          objectLike({ Name: 'Stack1.Deploy' }),
-          objectLike({ Name: 'Stack2.Prepare' }),
-          objectLike({ Name: 'ManualApproval2' }),
-          objectLike({ Name: 'Stack2.Deploy' }),
+        Actions: sortByRunOrder([
+          Match.objectLike({ Name: 'Stack1.Prepare' }),
+          Match.objectLike({ Name: 'ManualApproval' }),
+          Match.objectLike({ Name: 'Stack1.Deploy' }),
+          Match.objectLike({ Name: 'Stack2.Prepare' }),
+          Match.objectLike({ Name: 'ManualApproval2' }),
+          Match.objectLike({ Name: 'Stack2.Deploy' }),
         ]),
-      }),
+      }]),
     });
   });
 
@@ -114,28 +113,28 @@ behavior('user can request extra runorder space between prepare and deploy', (su
     });
 
     // THEN
-    expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', {
-      Stages: arrayWith({
+    Template.fromStack(pipelineStack).hasResourceProperties('AWS::CodePipeline::Pipeline', {
+      Stages: Match.arrayWith([{
         Name: 'MyApp',
-        Actions: sortedByRunOrder([
-          objectLike({
+        Actions: sortByRunOrder([
+          Match.objectLike({
             Name: 'Stack1.Prepare',
             RunOrder: 1,
           }),
-          objectLike({
+          Match.objectLike({
             Name: 'Stack1.Deploy',
             RunOrder: 3,
           }),
-          objectLike({
+          Match.objectLike({
             Name: 'Stack2.Prepare',
             RunOrder: 4,
           }),
-          objectLike({
+          Match.objectLike({
             Name: 'Stack2.Deploy',
             RunOrder: 6,
           }),
         ]),
-      }),
+      }]),
     });
   });
 
@@ -153,24 +152,24 @@ behavior('user can request both manual change set approval and extraRunOrderSpac
     });
 
     // THEN
-    expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', {
-      Stages: arrayWith({
+    Template.fromStack(pipelineStack).hasResourceProperties('AWS::CodePipeline::Pipeline', {
+      Stages: Match.arrayWith([{
         Name: 'MyApp',
-        Actions: sortedByRunOrder([
-          objectLike({
+        Actions: sortByRunOrder([
+          Match.objectLike({
             Name: 'Stack.Prepare',
             RunOrder: 1,
           }),
-          objectLike({
+          Match.objectLike({
             Name: 'ManualApproval',
             RunOrder: 2,
           }),
-          objectLike({
+          Match.objectLike({
             Name: 'Stack.Deploy',
             RunOrder: 4,
           }),
         ]),
-      }),
+      }]),
     });
   });
 

packages/@aws-cdk/pipelines/test/compliance/synths.test.ts

@@ -1,5 +1,4 @@
 import { Capture, Match, Template } from '@aws-cdk/assertions';
-import '@aws-cdk/assert-internal/jest';
 import * as cbuild from '@aws-cdk/aws-codebuild';
 import * as codepipeline from '@aws-cdk/aws-codepipeline';
 import * as ec2 from '@aws-cdk/aws-ec2';