Fix snapshot tests by normalizing asset hashes

Author: Michael Kaiser

typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts

@@ -9,10 +9,10 @@ describe('Snapshot', () => {
         const app = new App();
         const stack = new GatewayLambdaAuth(app, 'test-api-gateway-lambda-auth');
         const template = Template.fromStack(stack);
-
         // Normalize the template before snapshot comparison
         const normalizedTemplate = normalizeTemplate(template.toJSON());
         expect(normalizedTemplate).toMatchSnapshot();
     });
+
 })
 

typescript/ec2-instance-connect-endpoint/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/*.test.ts'],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  }
+};

typescript/ec2-instance-connect-endpoint/test/integ.default.test.ts

@@ -1,11 +1,14 @@
 import { Template } from 'aws-cdk-lib/assertions';
 import { IntegTesting } from '../src/integ.default';
+import { normalizeTemplate } from '../../test-utils/normalize-template';
 
 test('default validation', () => {
   const integ = new IntegTesting();
   integ.stack.forEach(stack => {
     const t = Template.fromStack(stack);
+    // Normalize the template before snapshot comparison
+    const normalizedTemplate = normalizeTemplate(t.toJSON());
     // should match snapshot
-    expect(t).toMatchSnapshot();
+    expect(normalizedTemplate).toMatchSnapshot();
   });
 });

typescript/ec2-instance-connect-endpoint/tsconfig.json

@@ -1,39 +1,24 @@
 {
   "compilerOptions": {
-    "outDir": "lib",
-    "rootDir": "src",
-    "declarationMap": false,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "alwaysStrict": true,
+    "target": "ES2018",
+    "module": "commonjs",
+    "lib": ["es2018"],
     "declaration": true,
-    "experimentalDecorators": true,
-    "incremental": true,
-    "lib": [
-      "es2020"
-    ],
-    "module": "CommonJS",
-    "noEmitOnError": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
     "strict": true,
+    "noImplicitAny": true,
     "strictNullChecks": true,
-    "strictPropertyInitialization": true,
-    "stripInternal": false,
-    "target": "ES2020",
-    "composite": false,
-    "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo"
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": false,
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "strictPropertyInitialization": false,
+    "typeRoots": ["./node_modules/@types"],
+    "outDir": "dist"
   },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+  "exclude": ["node_modules", "cdk.out"]
 }

typescript/ec2-instance/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/*.test.ts'],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  }
+};

typescript/ec2-instance/test/main.test.ts

@@ -2,6 +2,7 @@ import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
 import { EC2Example } from '../src/ec2-instance';
 import { InstanceSize, CPUTypes } from '../src/envValidator';
+import { normalizeTemplate } from '../../test-utils/normalize-template';
 
 const devEnv = {
   account: process.env.CDK_DEFAULT_ACCOUNT,
@@ -28,7 +29,8 @@ test('Snapshot', () => {
   });
 
   const template = Template.fromStack(stack);
-  expect(template.toJSON()).toMatchSnapshot();
+  const normalizedTemplate = normalizeTemplate(template.toJSON());
+  expect(normalizedTemplate).toMatchSnapshot();
 });
 
 test('LARGE', () => {

typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap

@@ -145,7 +145,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = `
           },
           "S3Key": "NORMALIZED_ASSET_HASH.zip",
         },
-        },
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
@@ -223,7 +222,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = `
           },
           "S3Key": "NORMALIZED_ASSET_HASH.zip",
         },
-        },
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [