From 1ce7df821fef79ee00cf43a22d7adc05eed98db2 Mon Sep 17 00:00:00 2001 From: Niranjan Jayakar Date: Thu, 18 Feb 2021 19:17:24 +0000 Subject: [PATCH] chore: enable feature flags on all integ tests (#13133) This is the final part of the work started out in 200d52ef. Most feature flags will be expired in CDKv2 and their 'enabled' behaviour made the default. To keep the divergence between the two branches (`master` and `v2-main`) to a minimum, update all integration tests to have the flags enabled. If the flag needs to be different for any specific test, it can be overridden when constructing the `App` object. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../app-delivery/test/integ.cicd.expected.json | 4 ++-- .../aws-codebuild/test/integ.caching.expected.json | 4 ++-- .../integ.project-buildspec-artifacts.expected.json | 4 ++-- .../test/integ.project-logging.expected.json | 4 ++-- ...g.project-secondary-sources-artifacts.expected.json | 4 ++-- .../integ.cfn-template-from-repo.lit.expected.json | 4 ++-- ...bda-deployed-through-codepipeline.lit.expected.json | 10 +++++----- .../test/integ.lambda-pipeline.expected.json | 4 ++-- .../test/integ.pipeline-alexa-deploy.expected.json | 4 ++-- .../test/integ.pipeline-cfn-cross-region.expected.json | 6 +++--- .../integ.pipeline-cfn-with-action-role.expected.json | 6 +++--- .../test/integ.pipeline-cfn.expected.json | 6 +++--- .../test/integ.pipeline-code-build-batch.expected.json | 2 +- ...ne-code-build-multiple-inputs-outputs.expected.json | 6 +++--- .../integ.pipeline-code-commit-build.expected.json | 6 +++--- .../test/integ.pipeline-code-commit.expected.json | 4 ++-- .../test/integ.pipeline-code-deploy-ecs.expected.json | 6 +++--- .../test/integ.pipeline-code-deploy.expected.json | 6 +++--- .../test/integ.pipeline-ecr-source.expected.json | 6 +++--- .../test/integ.pipeline-ecs-deploy.expected.json | 8 ++++---- ...nteg.pipeline-ecs-separate-source.lit.expected.json | 8 ++++---- .../test/integ.pipeline-events.expected.json | 6 +++--- .../test/integ.pipeline-jenkins.expected.json | 6 +++--- .../test/integ.pipeline-manual-approval.expected.json | 6 +++--- .../test/integ.pipeline-s3-deploy.expected.json | 8 ++++---- .../test/integ.pipeline-stepfunctions.expected.json | 4 ++-- .../test/ec2/integ.environment-file.expected.json | 4 ++-- .../integ.pipeline-event-target.expected.json | 2 +- .../integ.kinesis-firehose-stream.expected.json | 4 ++-- .../@aws-cdk/aws-glue/test/integ.table.expected.json | 6 +++--- .../aws-rds/test/integ.cluster-s3.expected.json | 2 +- .../aws-rds/test/integ.instance-s3.expected.json | 2 +- .../integ.bucket-deployment-cloudfront.expected.json | 4 ++-- .../test/integ.bucket-deployment.expected.json | 8 ++++---- .../aws-s3/test/integ.bucket-sharing.lit.expected.json | 4 ++-- .../@aws-cdk/aws-s3/test/integ.bucket.expected.json | 4 ++-- .../test/sagemaker/integ.call-sagemaker.expected.json | 2 +- .../sagemaker/integ.create-training-job.expected.json | 2 +- .../test/integ.pipeline-with-assets.expected.json | 4 ++-- .../pipelines/test/integ.pipeline.expected.json | 4 ++-- packages/decdk/test/__snapshots__/synth.test.js.snap | 6 +++--- packages/decdk/test/synth.test.ts | 6 ++---- tools/cdk-integ-tools/lib/integ-helpers.ts | 6 ++---- 43 files changed, 104 insertions(+), 108 deletions(-) diff --git a/packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json b/packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json index da4773e7fb72e..9b2ed51da9ff2 100644 --- a/packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json +++ b/packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json @@ -33,7 +33,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -467,4 +467,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json index 248d2e31c9ac8..c1680ca40cea9 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json +++ b/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json @@ -33,7 +33,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -171,4 +171,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-buildspec-artifacts.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-buildspec-artifacts.expected.json index b2101c7135f2f..9ad98f441d7a6 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.project-buildspec-artifacts.expected.json +++ b/packages/@aws-cdk/aws-codebuild/test/integ.project-buildspec-artifacts.expected.json @@ -33,7 +33,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -163,4 +163,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-logging.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-logging.expected.json index e68bc6b47d2b4..722f076547ea3 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.project-logging.expected.json +++ b/packages/@aws-cdk/aws-codebuild/test/integ.project-logging.expected.json @@ -38,7 +38,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -220,4 +220,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.expected.json index 7d6a3f783c899..c346580c024f1 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.expected.json +++ b/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.expected.json @@ -63,7 +63,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -215,4 +215,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.expected.json index 8f708cfa71a21..2ce8cf8f817bf 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.expected.json @@ -111,7 +111,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -392,7 +392,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.expected.json index 9547f050e1e8b..3605965c27ac5 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.expected.json @@ -105,7 +105,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -460,7 +460,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -573,7 +573,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -1302,7 +1302,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -1521,7 +1521,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json index 3ff81600a78eb..a273e176cd6e7 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json @@ -105,7 +105,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -340,7 +340,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.expected.json index 561b739cb4b1c..8e0fde48bed21 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.expected.json @@ -115,7 +115,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -339,7 +339,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.expected.json index 33fc6ee2f7b1e..127ce4b1fae86 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.expected.json @@ -38,7 +38,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -264,7 +264,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -482,4 +482,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.expected.json index c9511c58846fa..9c3b1e1940fde 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.expected.json @@ -163,7 +163,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -383,7 +383,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -485,4 +485,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.expected.json index 67aaceac34f75..4b54eb7757227 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.expected.json @@ -105,7 +105,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -392,7 +392,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -515,7 +515,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.expected.json index 3e9b5d76ec027..67025b2e96c68 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.expected.json @@ -109,7 +109,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.expected.json index ce11844d4a671..c5041087d978a 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.expected.json @@ -109,7 +109,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -195,7 +195,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -556,7 +556,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.expected.json index e2292c1bbbdbd..6292ae43e5811 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.expected.json @@ -91,7 +91,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -362,7 +362,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -620,7 +620,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.expected.json index bde54408d887d..fe71ea09ade8d 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.expected.json @@ -176,7 +176,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -382,7 +382,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.expected.json index bf74072797472..90ac50068841e 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.expected.json @@ -38,7 +38,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -257,7 +257,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -470,4 +470,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.expected.json index 6f9ce9cbd417f..78e721477f5ce 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.expected.json @@ -123,7 +123,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -340,7 +340,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -548,4 +548,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.expected.json index 9610c9c53705a..384e784a5ca76 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.expected.json @@ -33,7 +33,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -216,7 +216,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -412,4 +412,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json index 90360e47b3b27..5704161a5f89c 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json @@ -426,7 +426,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -572,7 +572,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -839,7 +839,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -1043,4 +1043,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.expected.json index 5b487d51f1219..e8cbcadeef665 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.expected.json @@ -393,7 +393,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -632,7 +632,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -955,7 +955,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -1052,7 +1052,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.expected.json index 50e081f6300f9..7506be08efa70 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.expected.json @@ -105,7 +105,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -326,7 +326,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -713,7 +713,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.expected.json index 631c4bb0795a3..a77528a3a8240 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.expected.json @@ -38,7 +38,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -275,7 +275,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -372,4 +372,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json index 5e1ea9110c95e..1730744a18c4d 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json @@ -33,7 +33,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -242,7 +242,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -349,4 +349,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.expected.json index d37bdc0c6798c..6f0330fa93862 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.expected.json @@ -43,7 +43,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -260,7 +260,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -338,7 +338,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -425,4 +425,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.expected.json index da70221749108..973a1d986205a 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.expected.json @@ -148,7 +148,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -385,7 +385,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.environment-file.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.environment-file.expected.json index 9376c507c20cf..b287e6ffc33fa 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/integ.environment-file.expected.json +++ b/packages/@aws-cdk/aws-ecs/test/ec2/integ.environment-file.expected.json @@ -1176,7 +1176,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -1385,4 +1385,4 @@ "Description": "Artifact hash for asset \"872561bf078edd1685d50c9ff821cdd60d2b2ddfb0013c4087e79bf2bb50724d\"" } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json b/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json index 333930c6c23ff..85af1bfde21c1 100644 --- a/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json +++ b/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json @@ -111,7 +111,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.expected.json b/packages/@aws-cdk/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.expected.json index 8cc4f2c5bbe65..6b76a3d96a32e 100644 --- a/packages/@aws-cdk/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.expected.json +++ b/packages/@aws-cdk/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.expected.json @@ -33,7 +33,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -161,4 +161,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-glue/test/integ.table.expected.json b/packages/@aws-cdk/aws-glue/test/integ.table.expected.json index c95d567dfa2bd..9d00dcfffab63 100644 --- a/packages/@aws-cdk/aws-glue/test/integ.table.expected.json +++ b/packages/@aws-cdk/aws-glue/test/integ.table.expected.json @@ -482,7 +482,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -560,7 +560,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -673,7 +673,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-rds/test/integ.cluster-s3.expected.json b/packages/@aws-cdk/aws-rds/test/integ.cluster-s3.expected.json index 394c50be1df78..6cafa81fad6a5 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.cluster-s3.expected.json +++ b/packages/@aws-cdk/aws-rds/test/integ.cluster-s3.expected.json @@ -547,7 +547,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-rds/test/integ.instance-s3.expected.json b/packages/@aws-cdk/aws-rds/test/integ.instance-s3.expected.json index cd2478b15b818..49c70139f3394 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.instance-s3.expected.json +++ b/packages/@aws-cdk/aws-rds/test/integ.instance-s3.expected.json @@ -453,7 +453,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.expected.json b/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.expected.json index fa5e26b9d57e9..76f906941f2bd 100644 --- a/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.expected.json +++ b/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.expected.json @@ -244,7 +244,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -390,4 +390,4 @@ "Description": "Artifact hash for asset \"fc4481abf279255619ff7418faa5d24456fef3432ea0da59c95542578ff0222e\"" } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.expected.json b/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.expected.json index 92d6c5bb8514b..877298773816b 100644 --- a/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.expected.json +++ b/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.expected.json @@ -195,7 +195,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -228,7 +228,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -261,7 +261,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -725,4 +725,4 @@ "Description": "Artifact hash for asset \"fc4481abf279255619ff7418faa5d24456fef3432ea0da59c95542578ff0222e\"" } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.expected.json index 04e17f51774e9..4197e9179b4ff 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.expected.json @@ -37,7 +37,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -71,4 +71,4 @@ } } } -] \ No newline at end of file +] diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json index e816e78115fde..58cd3c5760961 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json @@ -88,7 +88,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -173,4 +173,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.expected.json index 699a2ff2d686b..1e8f55ca57056 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.expected.json +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.expected.json @@ -147,7 +147,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.expected.json index 5b60bc0b1e500..209c5520c1c64 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.expected.json +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.expected.json @@ -147,7 +147,7 @@ { "Action": [ "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json index f0427b95f7b51..248e3b79911c9 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.expected.json @@ -133,7 +133,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -688,7 +688,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json index 787f89f4c09fb..5d1569fbadc84 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json @@ -133,7 +133,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", @@ -621,7 +621,7 @@ "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/decdk/test/__snapshots__/synth.test.js.snap b/packages/decdk/test/__snapshots__/synth.test.js.snap index 1e8c00e6bd957..939497257dbc5 100644 --- a/packages/decdk/test/__snapshots__/synth.test.js.snap +++ b/packages/decdk/test/__snapshots__/synth.test.js.snap @@ -1786,7 +1786,7 @@ Object { "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*", ], "Effect": "Allow", @@ -2458,7 +2458,7 @@ Object { "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*", ], "Effect": "Allow", @@ -2585,7 +2585,7 @@ Object { "s3:GetBucket*", "s3:List*", "s3:DeleteObject*", - "s3:PutObject*", + "s3:PutObject", "s3:Abort*", ], "Effect": "Allow", diff --git a/packages/decdk/test/synth.test.ts b/packages/decdk/test/synth.test.ts index 8c3a27e056d52..8952a9aa11fd8 100644 --- a/packages/decdk/test/synth.test.ts +++ b/packages/decdk/test/synth.test.ts @@ -2,6 +2,7 @@ import * as cdk from '@aws-cdk/core'; import * as fs from 'fs'; import * as reflect from 'jsii-reflect'; import * as path from 'path'; +import { FUTURE_FLAGS } from '@aws-cdk/cx-api'; import { DeclarativeStack, loadTypeSystem, readTemplate, stackNameFromFileName } from '../lib'; const VALIDATE_ASSEMBLIES = true; @@ -33,10 +34,7 @@ for (const templateFile of fs.readdirSync(dir)) { const app = new cdk.App({ context: { - '@aws-cdk/aws-ecr-assets:dockerIgnoreSupport': true, - '@aws-cdk/aws-kms:defaultKeyPolicies': true, - '@aws-cdk/core:enableStackNameDuplicates': true, - '@aws-cdk/aws-secretsmanager:parseOwnedSecretName': true, + ...FUTURE_FLAGS, } }); const stackName = stackNameFromFileName(templateFile); diff --git a/tools/cdk-integ-tools/lib/integ-helpers.ts b/tools/cdk-integ-tools/lib/integ-helpers.ts index 7e7e4ee460e7f..bf65e8cbb8b9a 100644 --- a/tools/cdk-integ-tools/lib/integ-helpers.ts +++ b/tools/cdk-integ-tools/lib/integ-helpers.ts @@ -1,6 +1,7 @@ // Helper functions for integration tests import { spawnSync } from 'child_process'; import * as path from 'path'; +import { FUTURE_FLAGS } from '@aws-cdk/cx-api'; import * as fs from 'fs-extra'; import { AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY } from '../../../packages/@aws-cdk/cx-api/lib'; @@ -338,10 +339,7 @@ export const DEFAULT_SYNTH_OPTIONS = { ], }, // Enable feature flags for all integ tests - '@aws-cdk/aws-ecr-assets:dockerIgnoreSupport': true, - '@aws-cdk/aws-kms:defaultKeyPolicies': true, - '@aws-cdk/core:enableStackNameDuplicates': true, - '@aws-cdk/aws-secretsmanager:parseOwnedSecretName': true, + ...FUTURE_FLAGS, }, env: { CDK_INTEG_ACCOUNT: '12345678',