Skip to content

Commit 721bd4b

Browse files
corymhallcorymhall
authored
fix(integ-runner): only diff registered stacks (#20100)
Currently the runner will perform a diff of all stacks in the snapshot, not just the stacks that have been "registered" as part of the test case. This PR changes the logic to only perform a diff on stacks that are part of the test case. This will allow us to use separate stacks for things like assertions that will not be part of the diff. As part of this change it was necessary to make some additional changes to the way the runner runs the tests, the main reason being that it is necessary to hold two different versions of the test, the "expected" version and the "actual" version. This PR updates the runner to read the "expected" version of the test from the `integ.json` manifest in the current snapshot and the "actual" version of the test from the changed integ test. Because the legacy tests (those that don't use the `IntegTest` construct) do not create an `integ.json` file, this PR updates the runner to create an `integ.json` file as part of the snapshot creation. This way on the next change the runner is able to read the `integ.json` file from the snapshot to get the "expected" view of the test. ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 91f9aff commit 721bd4b

File tree

518 files changed

+7543
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

518 files changed

+7543
-283
lines changed

‎packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"app-delivery/test/integ.cicd": {
5+
"stacks": [
6+
"CICD"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-amplify/test/app-asset-deployment.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-amplify/test/integ.app-asset-deployment": {
5+
"stacks": [
6+
"cdk-amplify-app-asset-deployment"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-amplify/test/app-codecommit.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-amplify/test/integ.app-codecommit": {
5+
"stacks": [
6+
"cdk-amplify-codecommit-app"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-amplify/test/app.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-amplify/test/integ.app": {
5+
"stacks": [
6+
"cdk-amplify-app"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/api-definition.asset.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.api-definition.asset": {
5+
"stacks": [
6+
"integtest-restapi-fromdefinition-asset"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/api-definition.inline.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.api-definition.inline": {
5+
"stacks": [
6+
"integtest-restapi-fromdefinition-inline"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/authorizers/cognito-authorizer.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/authorizers/integ.cognito-authorizer": {
5+
"stacks": [
6+
"CognitoUserPoolsAuthorizerInteg"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/authorizers/request-authorizer.lit.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/authorizers/integ.request-authorizer.lit": {
5+
"stacks": [
6+
"RequestAuthorizerInteg"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/authorizers/token-authorizer-iam-role.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/authorizers/integ.token-authorizer-iam-role": {
5+
"stacks": [
6+
"TokenAuthorizerIAMRoleInteg"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/authorizers/token-authorizer.lit.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/authorizers/integ.token-authorizer.lit": {
5+
"stacks": [
6+
"TokenAuthorizerInteg"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/cors.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.cors": {
5+
"stacks": [
6+
"cors-twitch-test"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/lambda-api.latebound-deploymentstage.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.lambda-api.latebound-deploymentstage": {
5+
"stacks": [
6+
"LateBoundDeploymentStageStack"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi-import.lit.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi-import.lit": {
5+
"stacks": [
6+
"integ-restapi-import-RootStack"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.books.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi.books": {
5+
"stacks": [
6+
"restapi-books-example"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.defaults.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi.defaults": {
5+
"stacks": [
6+
"test-apigateway-restapi-defaults"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi": {
5+
"stacks": [
6+
"test-apigateway-restapi"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.multistack.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi.multistack": {
5+
"stacks": [
6+
"*"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.multiuse.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi.multiuse": {
5+
"stacks": [
6+
"restapi-multiuse-example"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.vpc-endpoint.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.restapi.vpc-endpoint": {
5+
"stacks": [
6+
"test-apigateway-vpcendpoint"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/stepfunctions-api.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.stepfunctions-api": {
5+
"stacks": [
6+
"StepFunctionsRestApiDeploymentStack"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/usage-plan.multikey.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.usage-plan.multikey": {
5+
"stacks": [
6+
"test-apigateway-usageplan-multikey"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigateway/test/usage-plan.sharing.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigateway/test/integ.usage-plan.sharing": {
5+
"stacks": [
6+
"*"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/iam.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigatewayv2-authorizers/test/http/integ.iam": {
5+
"stacks": [
6+
"IntegApiGatewayV2Iam"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/lambda.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigatewayv2-authorizers/test/http/integ.lambda": {
5+
"stacks": [
6+
"AuthorizerInteg"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

‎packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/user-pool.integ.snapshot/integ.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "18.0.0",
3+
"testCases": {
4+
"aws-apigatewayv2-authorizers/test/http/integ.user-pool": {
5+
"stacks": [
6+
"AuthorizerInteg"
7+
],
8+
"diffAssets": false,
9+
"stackUpdateWorkflow": true
10+
}
11+
},
12+
"synthContext": {},
13+
"enableLookups": false
14+
}

0 commit comments

Comments
 (0)