Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(integ-runner): use newStyleSynthesis by default #21856

Merged
merged 11 commits into from
Aug 31, 2022
Merged

chore(integ-runner): use newStyleSynthesis by default #21856

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9ca93ce
chore(integ-runner): use newStyleSynthesis by default
corymhall Aug 30, 2022
13c1d91
integ test snapshot updates
corymhall Aug 30, 2022
55a66e5
chore(cloudwatch-actions): ssmIncidents integ test did not run
corymhall Aug 30, 2022
51ac781
chore(congito-identitypool): integ test did not run
corymhall Aug 30, 2022
677e932
chore(ecs-patterns): integ tests did not run
corymhall Aug 30, 2022
f782f47
chore(s3): integ tests did not run
corymhall Aug 30, 2022
ef0664d
fixing snapshots after rebase
corymhall Aug 31, 2022
d83796c
Merge branch 'main' into corymhall/integ/newStyleSynthesis
corymhall Aug 31, 2022
759cca0
fixing more integration tests
corymhall Aug 31, 2022
064b644
unfortunately this test will not pass in both aws-amplify _and_
corymhall Aug 31, 2022
0150e65
Merge branch 'main' into corymhall/integ/newStyleSynthesis
mergify[bot] Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/CICD.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "17.0.0",
"version": "20.0.0",
"files": {
"df2531bee6d1a5c15a480c358ebc18e306c13a2c9e3ee55d1116b6ef3c327f34": {
"4844d07f1e19de1a0f6926b94b9bc19bf4e39bbb14b8511dee5d345f776182c7": {
"source": {
"path": "CICD.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "df2531bee6d1a5c15a480c358ebc18e306c13a2c9e3ee55d1116b6ef3c327f34.json",
"objectKey": "4844d07f1e19de1a0f6926b94b9bc19bf4e39bbb14b8511dee5d345f776182c7.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
34 changes: 34 additions & 0 deletions packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/CICD.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,5 +468,39 @@
]
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"17.0.0"}
{"version":"20.0.0"}
40 changes: 38 additions & 2 deletions packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,43 @@
{
"version": "17.0.0",
"version": "20.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
},
"CICD.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "CICD.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"CICD": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "CICD.template.json",
"validateOnSynth": false
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4844d07f1e19de1a0f6926b94b9bc19bf4e39bbb14b8511dee5d345f776182c7.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"CICD.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
"requiresBootstrapStackVersion": 8,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"dependencies": [
"CICD.assets"
],
"metadata": {
"/CICD/ArtifactBucket/Resource": [
{
Expand Down Expand Up @@ -74,6 +98,18 @@
"type": "aws:cdk:logicalId",
"data": "CodePipelineDeployChangeSetRoleDefaultPolicy289820BE"
}
],
"/CICD/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/CICD/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "CICD"
Expand Down
24 changes: 12 additions & 12 deletions packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
},
"CICD": {
Expand Down Expand Up @@ -288,13 +288,13 @@
"path": "CICD/CodePipeline/Source/GitHub",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
},
"Deploy": {
Expand Down Expand Up @@ -354,7 +354,7 @@
"path": "CICD/CodePipeline/Deploy/Execute/CodePipelineActionRole/8389e75f-0810-4838-bf64-d6f85a95cf83",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
},
"DefaultPolicy": {
Expand Down Expand Up @@ -433,7 +433,7 @@
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
},
"ChangeSet": {
Expand Down Expand Up @@ -489,7 +489,7 @@
"path": "CICD/CodePipeline/Deploy/ChangeSet/CodePipelineActionRole/8389e75f-0810-4838-bf64-d6f85a95cf83",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
},
"DefaultPolicy": {
Expand Down Expand Up @@ -708,13 +708,13 @@
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.9"
"version": "10.1.85"
}
}
},
Expand All @@ -725,14 +725,14 @@
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
"fqn": "constructs.Construct",
"version": "10.1.85"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.App",
"version": "0.0.0"
"fqn": "constructs.Construct",
"version": "10.1.85"
}
}
}
2 changes: 2 additions & 0 deletions ...b6b21b0be8fc9922ae2ef49bd22daecb/index.js → ...226dfc0a8f4b527609e98f0fd044deff/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
var ResourceHandler;
var init_common = __esm({
"packages/@aws-cdk/aws-amplify/lib/asset-deployment-handler/common.ts"() {
"use strict";
ResourceHandler = class {
constructor(event) {
this.requestType = event.RequestType;
Expand Down Expand Up @@ -72,6 +73,7 @@ function parseProps(props) {
var AmplifyAssetDeploymentHandler;
var init_handler = __esm({
"packages/@aws-cdk/aws-amplify/lib/asset-deployment-handler/handler.ts"() {
"use strict";
init_common();
AmplifyAssetDeploymentHandler = class extends ResourceHandler {
constructor(amplify2, s32, event) {
Expand Down
4 changes: 2 additions & 2 deletions ...05928021d029c5363584f11b9/cfn-response.js → ...51a70478e58258c8ef7471671/cfn-response.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...a7db4005928021d029c5363584f11b9/consts.js → ...95c82b51a70478e58258c8ef7471671/consts.js
View file
Open in desktop
File renamed without changes.
Loading