Skip to content

Commit e2dc2cb

Browse files
authored
fix(integ): write assertion stack name to integ manifest (#21809)
In #21646 we updated the `assertionStack` value to be the `node.id` of the assertion stack since that is what the CDK CLI requires to deploy the stack. The change in #21646 fixed that bug, but it introduced a new one where the assertion results are no longer read and reported on by the integ-runner. The integ-runner reads the results of the assertions from the stack outputs which are written to a file (with `cdk deploy --output `assertion-results.json`). The outputs use the stack _name_ not the _node.id_. As a result, the integ-runner was looking for outputs for an invalid stack name. This PR fixes that by: - Adding `assertionStackName` property to the `integ.json` manifest - Updates the integ-runner to use the `assertionsStackName` to lookup the assertion results. - Add reporting on assertion results (previously only reported failures). - Updates all integ snapshots which currently use assertions. ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/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/main/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 7e9bd7d commit e2dc2cb

File tree

70 files changed

+3302
-2760
lines changed

Some content is hidden

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

70 files changed

+3302
-2760
lines changed

packages/@aws-cdk/aws-appsync/test/log-retention.integ.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
},
2727
"flattenResponse": "false",
28-
"salt": "1660753153241"
28+
"salt": "1661796816388"
2929
},
3030
"UpdateReplacePolicy": "Delete",
3131
"DeletionPolicy": "Delete"
@@ -57,7 +57,7 @@
5757
]
5858
]
5959
},
60-
"salt": "1660753153242"
60+
"salt": "1661796816388"
6161
},
6262
"UpdateReplacePolicy": "Delete",
6363
"DeletionPolicy": "Delete"
@@ -109,7 +109,7 @@
109109
"Runtime": "nodejs14.x",
110110
"Code": {
111111
"S3Bucket": {
112-
"Ref": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3BucketF94385B7"
112+
"Ref": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3BucketA2BC9E80"
113113
},
114114
"S3Key": {
115115
"Fn::Join": [
@@ -122,7 +122,7 @@
122122
"Fn::Split": [
123123
"||",
124124
{
125-
"Ref": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3VersionKey66DB0F9E"
125+
"Ref": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3VersionKeyB8E92EFE"
126126
}
127127
]
128128
}
@@ -135,7 +135,7 @@
135135
"Fn::Split": [
136136
"||",
137137
{
138-
"Ref": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3VersionKey66DB0F9E"
138+
"Ref": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3VersionKeyB8E92EFE"
139139
}
140140
]
141141
}
@@ -167,17 +167,17 @@
167167
}
168168
},
169169
"Parameters": {
170-
"AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3BucketF94385B7": {
170+
"AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3BucketA2BC9E80": {
171171
"Type": "String",
172-
"Description": "S3 bucket for asset \"0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd\""
172+
"Description": "S3 bucket for asset \"84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7\""
173173
},
174-
"AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3VersionKey66DB0F9E": {
174+
"AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3VersionKeyB8E92EFE": {
175175
"Type": "String",
176-
"Description": "S3 key for asset version \"0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd\""
176+
"Description": "S3 key for asset version \"84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7\""
177177
},
178-
"AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdArtifactHash2AC894D9": {
178+
"AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7ArtifactHashB8137036": {
179179
"Type": "String",
180-
"Description": "Artifact hash for asset \"0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd\""
180+
"Description": "Artifact hash for asset \"84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7\""
181181
}
182182
}
183183
}
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ var AssertionHandler = class extends CustomResourceHandler {
493493
} else {
494494
result = {
495495
data: JSON.stringify({
496-
status: "pass"
496+
status: "success"
497497
})
498498
};
499499
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
2-
"version": "20.0.0",
2+
"version": "21.0.0",
33
"testCases": {
44
"Integ/DefaultTest": {
55
"stacks": [
66
"AppSyncIntegLogRetention"
77
],
8-
"assertionStack": "Integ/DefaultTest/DeployAssert"
8+
"assertionStack": "Integ/DefaultTest/DeployAssert",
9+
"assertionStackName": "IntegDefaultTestDeployAssert4E6713E1"
910
}
1011
}
1112
}

packages/@aws-cdk/aws-appsync/test/log-retention.integ.snapshot/manifest.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "20.0.0",
2+
"version": "21.0.0",
33
"artifacts": {
44
"Tree": {
55
"type": "cdk:tree",
@@ -119,13 +119,13 @@
119119
{
120120
"type": "aws:cdk:asset",
121121
"data": {
122-
"path": "asset.0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd.bundle",
123-
"id": "0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd",
122+
"path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
123+
"id": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7",
124124
"packaging": "zip",
125-
"sourceHash": "0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd",
126-
"s3BucketParameter": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3BucketF94385B7",
127-
"s3KeyParameter": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3VersionKey66DB0F9E",
128-
"artifactHashParameter": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdArtifactHash2AC894D9"
125+
"sourceHash": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7",
126+
"s3BucketParameter": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3BucketA2BC9E80",
127+
"s3KeyParameter": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3VersionKeyB8E92EFE",
128+
"artifactHashParameter": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7ArtifactHashB8137036"
129129
}
130130
}
131131
],
@@ -159,22 +159,22 @@
159159
"data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
160160
}
161161
],
162-
"/Integ/DefaultTest/DeployAssert/AssetParameters/0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd/S3Bucket": [
162+
"/Integ/DefaultTest/DeployAssert/AssetParameters/84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7/S3Bucket": [
163163
{
164164
"type": "aws:cdk:logicalId",
165-
"data": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3BucketF94385B7"
165+
"data": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3BucketA2BC9E80"
166166
}
167167
],
168-
"/Integ/DefaultTest/DeployAssert/AssetParameters/0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd/S3VersionKey": [
168+
"/Integ/DefaultTest/DeployAssert/AssetParameters/84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7/S3VersionKey": [
169169
{
170170
"type": "aws:cdk:logicalId",
171-
"data": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdS3VersionKey66DB0F9E"
171+
"data": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7S3VersionKeyB8E92EFE"
172172
}
173173
],
174-
"/Integ/DefaultTest/DeployAssert/AssetParameters/0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbd/ArtifactHash": [
174+
"/Integ/DefaultTest/DeployAssert/AssetParameters/84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7/ArtifactHash": [
175175
{
176176
"type": "aws:cdk:logicalId",
177-
"data": "AssetParameters0d8d96305807ac805d23c6d7b279eef238715605efad63c839ad1e7e8236bdbdArtifactHash2AC894D9"
177+
"data": "AssetParameters84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7ArtifactHashB8137036"
178178
}
179179
]
180180
},

0 commit comments

Comments
 (0)