Skip to content

Commit b1657f3

Browse files
TheRealAmazonKendraTheRealAmazonKendra
committed
chore(s3-deployment): update failing integ tests
The resources in these tests were colliding, causing failures. This change removes those collisions and updates the tests so they pass when run locally.
1 parent b8708e9 commit b1657f3

15 files changed

Lines changed: 199 additions & 220 deletions

‎packages/@aws-cdk/aws-s3-deployment/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"@aws-cdk/assertions": "0.0.0",
9090
"@aws-cdk/cdk-build-tools": "0.0.0",
9191
"@aws-cdk/integ-runner": "0.0.0",
92+
"@aws-cdk/integ-tests": "0.0.0",
9293
"@aws-cdk/cx-api": "0.0.0",
9394
"@aws-cdk/pkglint": "0.0.0",
9495
"@types/jest": "^27.5.2",

‎packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment-data.integ.snapshot/TestBucketDeploymentContent.assets.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "20.0.0",
33
"files": {
4-
"672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262": {
4+
"1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa": {
55
"source": {
6-
"path": "asset.672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262.zip",
6+
"path": "asset.1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa.zip",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262.zip",
12+
"objectKey": "1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
@@ -66,15 +66,15 @@
6666
}
6767
}
6868
},
69-
"3ed0eab4bbbed28428c86b436726f701c9ddf664e0069753d3a5ebc00f0edcd9": {
69+
"97f1f2782ed2a51e2aa5805216fb492cbfb832a8733398a70c42862645c449ba": {
7070
"source": {
7171
"path": "TestBucketDeploymentContent.template.json",
7272
"packaging": "file"
7373
},
7474
"destinations": {
7575
"current_account-current_region": {
7676
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
77-
"objectKey": "3ed0eab4bbbed28428c86b436726f701c9ddf664e0069753d3a5ebc00f0edcd9.json",
77+
"objectKey": "97f1f2782ed2a51e2aa5805216fb492cbfb832a8733398a70c42862645c449ba.json",
7878
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
7979
}
8080
}

‎packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment-data.integ.snapshot/TestBucketDeploymentContent.template.json‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
"Properties": {
66
"Tags": [
77
{
8-
"Key": "aws-cdk:cr-owned:deploy/here/:588fbb1f",
8+
"Key": "aws-cdk:cr-owned:deploy/here/:ecfc6640",
99
"Value": "true"
1010
}
1111
]
1212
},
1313
"UpdateReplacePolicy": "Retain",
1414
"DeletionPolicy": "Retain"
1515
},
16-
"DeployMeAwsCliLayer5F9219E9": {
16+
"DeployMeHereAwsCliLayerDDC2FE7D": {
1717
"Type": "AWS::Lambda::LayerVersion",
1818
"Properties": {
1919
"Content": {
2020
"S3Bucket": {
21-
"Ref": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3Bucket2B5B33F4"
21+
"Ref": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3Bucket4457F0E8"
2222
},
2323
"S3Key": {
2424
"Fn::Join": [
@@ -31,7 +31,7 @@
3131
"Fn::Split": [
3232
"||",
3333
{
34-
"Ref": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3VersionKeyAD46A764"
34+
"Ref": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3VersionKeyD347D3A4"
3535
}
3636
]
3737
}
@@ -44,7 +44,7 @@
4444
"Fn::Split": [
4545
"||",
4646
{
47-
"Ref": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3VersionKeyAD46A764"
47+
"Ref": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3VersionKeyD347D3A4"
4848
}
4949
]
5050
}
@@ -57,7 +57,7 @@
5757
"Description": "/opt/awscli/aws"
5858
}
5959
},
60-
"DeployMeCustomResource4455EE35": {
60+
"DeployMeHereCustomResourceE86627A6": {
6161
"Type": "Custom::CDKBucketDeployment",
6262
"Properties": {
6363
"ServiceToken": {
@@ -198,6 +198,7 @@
198198
"Ref": "Bucket83908E77"
199199
},
200200
"DestinationBucketKeyPrefix": "deploy/here/",
201+
"RetainOnDelete": false,
201202
"Prune": true
202203
},
203204
"UpdateReplacePolicy": "Delete",
@@ -440,7 +441,7 @@
440441
"Handler": "index.handler",
441442
"Layers": [
442443
{
443-
"Ref": "DeployMeAwsCliLayer5F9219E9"
444+
"Ref": "DeployMeHereAwsCliLayerDDC2FE7D"
444445
}
445446
],
446447
"Runtime": "python3.9",
@@ -453,17 +454,17 @@
453454
}
454455
},
455456
"Parameters": {
456-
"AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3Bucket2B5B33F4": {
457+
"AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3Bucket4457F0E8": {
457458
"Type": "String",
458-
"Description": "S3 bucket for asset \"672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262\""
459+
"Description": "S3 bucket for asset \"1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa\""
459460
},
460-
"AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3VersionKeyAD46A764": {
461+
"AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3VersionKeyD347D3A4": {
461462
"Type": "String",
462-
"Description": "S3 key for asset version \"672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262\""
463+
"Description": "S3 key for asset version \"1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa\""
463464
},
464-
"AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262ArtifactHash9E8C5685": {
465+
"AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faArtifactHash79E5727E": {
465466
"Type": "String",
466-
"Description": "Artifact hash for asset \"672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262\""
467+
"Description": "Artifact hash for asset \"1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa\""
467468
},
468469
"AssetParametersf98b78092dcdd31f5e6d47489beb5f804d4835ef86a8085d0a2053cb9ae711daS3BucketF23C0DE7": {
469470
"Type": "String",

packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment-data.integ.snapshot/asset.672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262.zip renamed to packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment-data.integ.snapshot/asset.1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa.zip

13.1 MB
Binary file not shown.

‎packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment-data.integ.snapshot/manifest.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
{
2020
"type": "aws:cdk:asset",
2121
"data": {
22-
"path": "asset.672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262.zip",
23-
"id": "672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262",
22+
"path": "asset.1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa.zip",
23+
"id": "1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa",
2424
"packaging": "file",
25-
"sourceHash": "672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262",
26-
"s3BucketParameter": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3Bucket2B5B33F4",
27-
"s3KeyParameter": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3VersionKeyAD46A764",
28-
"artifactHashParameter": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262ArtifactHash9E8C5685"
25+
"sourceHash": "1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa",
26+
"s3BucketParameter": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3Bucket4457F0E8",
27+
"s3KeyParameter": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3VersionKeyD347D3A4",
28+
"artifactHashParameter": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faArtifactHash79E5727E"
2929
}
3030
},
3131
{
@@ -83,34 +83,34 @@
8383
"data": "Bucket83908E77"
8484
}
8585
],
86-
"/TestBucketDeploymentContent/DeployMe/AwsCliLayer/Resource": [
86+
"/TestBucketDeploymentContent/DeployMeHere/AwsCliLayer/Resource": [
8787
{
8888
"type": "aws:cdk:logicalId",
89-
"data": "DeployMeAwsCliLayer5F9219E9"
89+
"data": "DeployMeHereAwsCliLayerDDC2FE7D"
9090
}
9191
],
92-
"/TestBucketDeploymentContent/DeployMe/CustomResource/Default": [
92+
"/TestBucketDeploymentContent/DeployMeHere/CustomResource/Default": [
9393
{
9494
"type": "aws:cdk:logicalId",
95-
"data": "DeployMeCustomResource4455EE35"
95+
"data": "DeployMeHereCustomResourceE86627A6"
9696
}
9797
],
98-
"/TestBucketDeploymentContent/AssetParameters/672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262/S3Bucket": [
98+
"/TestBucketDeploymentContent/AssetParameters/1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa/S3Bucket": [
9999
{
100100
"type": "aws:cdk:logicalId",
101-
"data": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3Bucket2B5B33F4"
101+
"data": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3Bucket4457F0E8"
102102
}
103103
],
104-
"/TestBucketDeploymentContent/AssetParameters/672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262/S3VersionKey": [
104+
"/TestBucketDeploymentContent/AssetParameters/1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa/S3VersionKey": [
105105
{
106106
"type": "aws:cdk:logicalId",
107-
"data": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262S3VersionKeyAD46A764"
107+
"data": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faS3VersionKeyD347D3A4"
108108
}
109109
],
110-
"/TestBucketDeploymentContent/AssetParameters/672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262/ArtifactHash": [
110+
"/TestBucketDeploymentContent/AssetParameters/1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284fa/ArtifactHash": [
111111
{
112112
"type": "aws:cdk:logicalId",
113-
"data": "AssetParameters672cee2a3bc0f6f95dc287bbbcfca917f657efdac3d5cea83e0ceec6f1cdc262ArtifactHash9E8C5685"
113+
"data": "AssetParameters1d3b5490cd99feddeb525a62c046988997469f2a765d0f12b43cff9d87a284faArtifactHash79E5727E"
114114
}
115115
],
116116
"/TestBucketDeploymentContent/AssetParameters/f98b78092dcdd31f5e6d47489beb5f804d4835ef86a8085d0a2053cb9ae711da/S3Bucket": [

0 commit comments

Comments
 (0)