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.

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
Prev Previous commit
Next Next commit
chore(s3): integ tests did not run
  • Loading branch information
corymhall committed Aug 31, 2022
commit f782f4776c4132a2f6c0f85d166e092fd6ad6f97
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ new Bucket(stack, 'MyBucket', {
expirationDate: new Date('2019-10-01'),
},
{
objectSizeLessThan: 500,
expirationDate: new Date('2019-10-01'),
objectSizeLessThan: 600,
objectSizeGreaterThan: 500,
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"Status": "Enabled"
},
{
"ObjectSizeLessThan": "500",
"ObjectSizeGreaterThan": "500",
"ExpirationDate": "2019-10-01T00:00:00",
"ObjectSizeGreaterThan": 500,
"ObjectSizeLessThan": 600,
"Status": "Enabled"
}
]
Expand All @@ -20,5 +21,39 @@
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
}
},
"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."
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"17.0.0"}
{"version":"20.0.0"}
Original file line number Diff line number Diff line change
@@ -1,25 +1,61 @@
{
"version": "17.0.0",
"version": "20.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
},
"aws-cdk-s3.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "aws-cdk-s3.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"aws-cdk-s3": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "aws-cdk-s3.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}/ec43659201be5ffe7c1311b82c63224f177655acd30be0d6f1b0b377a9915825.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"aws-cdk-s3.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": [
"aws-cdk-s3.assets"
],
"metadata": {
"/aws-cdk-s3/MyBucket/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "MyBucketF68F3FF0"
}
],
"/aws-cdk-s3/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/aws-cdk-s3/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "aws-cdk-s3"
Expand Down
18 changes: 12 additions & 6 deletions packages/@aws-cdk/aws-s3/test/lifecycle.integ.snapshot/tree.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "@aws-cdk/core.Construct",
"version": "0.0.0"
"fqn": "constructs.Construct",
"version": "10.1.85"
}
},
"aws-cdk-s3": {
Expand All @@ -31,6 +31,12 @@
{
"expirationDate": "2019-10-01T00:00:00.000Z",
"status": "Enabled"
},
{
"expirationDate": "2019-10-01T00:00:00.000Z",
"status": "Enabled",
"objectSizeLessThan": 600,
"objectSizeGreaterThan": 500
}
]
}
Expand All @@ -49,14 +55,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"
}
}
}