From b273693d198245075cfcfd847008ea0d9d09e3b3 Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Tue, 18 Jan 2022 15:15:09 +0100 Subject: [PATCH 1/7] add missing safe actions to perms BUCKET_PUT_ACTIONS and s3:PutObjectVersionAcl to BUCKET_PUT_ACL_ACTIONS --- packages/@aws-cdk/aws-s3/lib/perms.ts | 5 +++ packages/@aws-cdk/aws-s3/test/bucket.test.ts | 39 ++++++++++++++++++- .../integ.bucket-sharing.lit.expected.json | 4 ++ .../aws-s3/test/integ.bucket.expected.json | 4 ++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-s3/lib/perms.ts b/packages/@aws-cdk/aws-s3/lib/perms.ts index f57b97153f27c..abfb00d852f6e 100644 --- a/packages/@aws-cdk/aws-s3/lib/perms.ts +++ b/packages/@aws-cdk/aws-s3/lib/perms.ts @@ -16,11 +16,16 @@ export const LEGACY_BUCKET_PUT_ACTIONS = [ export const BUCKET_PUT_ACTIONS = [ 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ]; export const BUCKET_PUT_ACL_ACTIONS = [ 's3:PutObjectAcl', + 's3:PutObjectVersionAcl', ]; export const BUCKET_DELETE_ACTIONS = [ diff --git a/packages/@aws-cdk/aws-s3/test/bucket.test.ts b/packages/@aws-cdk/aws-s3/test/bucket.test.ts index 574d0d38e4755..dbbd49420c493 100644 --- a/packages/@aws-cdk/aws-s3/test/bucket.test.ts +++ b/packages/@aws-cdk/aws-s3/test/bucket.test.ts @@ -809,6 +809,10 @@ describe('bucket', () => { 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', @@ -1084,6 +1088,10 @@ describe('bucket', () => { 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', @@ -1117,6 +1125,10 @@ describe('bucket', () => { 'Action': [ 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', @@ -1184,6 +1196,10 @@ describe('bucket', () => { 'Action': [ 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', @@ -1217,6 +1233,10 @@ describe('bucket', () => { { 'Action': [ 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', @@ -1247,8 +1267,23 @@ describe('bucket', () => { const resources = Template.fromStack(stack).toJSON().Resources; const actions = (id: string) => resources[id].Properties.PolicyDocument.Statement[0].Action; - expect(actions('WriterDefaultPolicyDC585BCE')).toEqual(['s3:DeleteObject*', 's3:PutObject', 's3:Abort*']); - expect(actions('PutterDefaultPolicyAB138DD3')).toEqual(['s3:PutObject', 's3:Abort*']); + expect(actions('WriterDefaultPolicyDC585BCE')).toEqual([ + 's3:DeleteObject*', + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ]); + expect(actions('PutterDefaultPolicyAB138DD3')).toEqual([ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ]); expect(actions('DeleterDefaultPolicyCD33B8A0')).toEqual('s3:DeleteObject*'); }); 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 4197e9179b4ff..85ece6ae7bf15 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 @@ -38,6 +38,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 58cd3c5760961..6a8b1e6567a0e 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json @@ -89,6 +89,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", From 53303898bf98559dc9e9554d742383463d814419 Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Tue, 18 Jan 2022 16:56:53 +0100 Subject: [PATCH 2/7] fix bucket integ tests --- ...g.bucket-auto-delete-objects.expected.json | 36 +++++++++---------- .../test/integ.bucket-inventory.expected.json | 2 +- .../integ.bucket-sharing.lit.expected.json | 8 ++--- .../aws-s3/test/integ.bucket.expected.json | 8 ++--- .../test/integ.bucket.url.lit.expected.json | 12 +++++-- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket-auto-delete-objects.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket-auto-delete-objects.expected.json index f5cf756e8a75d..da2c8cf503fe6 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket-auto-delete-objects.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket-auto-delete-objects.expected.json @@ -110,7 +110,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709S3Bucket2C6C817C" + "Ref": "AssetParametersbe270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824S3Bucket09A62232" }, "S3Key": { "Fn::Join": [ @@ -123,7 +123,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709S3VersionKeyFA215BD6" + "Ref": "AssetParametersbe270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824S3VersionKeyA28118BE" } ] } @@ -136,7 +136,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709S3VersionKeyFA215BD6" + "Ref": "AssetParametersbe270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824S3VersionKeyA28118BE" } ] } @@ -228,7 +228,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abfS3BucketE1985B35" + "Ref": "AssetParameters31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6S3BucketB51EC107" }, "S3Key": { "Fn::Join": [ @@ -241,7 +241,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abfS3VersionKey610C6DE2" + "Ref": "AssetParameters31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6S3VersionKey2B267DB5" } ] } @@ -254,7 +254,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abfS3VersionKey610C6DE2" + "Ref": "AssetParameters31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6S3VersionKey2B267DB5" } ] } @@ -297,29 +297,29 @@ } }, "Parameters": { - "AssetParameters84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709S3Bucket2C6C817C": { + "AssetParametersbe270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824S3Bucket09A62232": { "Type": "String", - "Description": "S3 bucket for asset \"84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709\"" + "Description": "S3 bucket for asset \"be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824\"" }, - "AssetParameters84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709S3VersionKeyFA215BD6": { + "AssetParametersbe270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824S3VersionKeyA28118BE": { "Type": "String", - "Description": "S3 key for asset version \"84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709\"" + "Description": "S3 key for asset version \"be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824\"" }, - "AssetParameters84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709ArtifactHash17D48178": { + "AssetParametersbe270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824ArtifactHash76F8FCF2": { "Type": "String", - "Description": "Artifact hash for asset \"84e9b89449fe2573e51d08cc143e21116ed4608c6db56afffcb4ad85c8130709\"" + "Description": "Artifact hash for asset \"be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824\"" }, - "AssetParameters618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abfS3BucketE1985B35": { + "AssetParameters31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6S3BucketB51EC107": { "Type": "String", - "Description": "S3 bucket for asset \"618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abf\"" + "Description": "S3 bucket for asset \"31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6\"" }, - "AssetParameters618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abfS3VersionKey610C6DE2": { + "AssetParameters31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6S3VersionKey2B267DB5": { "Type": "String", - "Description": "S3 key for asset version \"618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abf\"" + "Description": "S3 key for asset version \"31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6\"" }, - "AssetParameters618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abfArtifactHash467DFC33": { + "AssetParameters31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6ArtifactHashEE982197": { "Type": "String", - "Description": "Artifact hash for asset \"618bbe9863c0edd5c4ca2e24b5063762f020fafec018cd06f57e2bd9f2f48abf\"" + "Description": "Artifact hash for asset \"31552cb1c5c4cdb0d9502dc59c3cd63cb519dcb7e320e60965c75940297ae3b6\"" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket-inventory.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket-inventory.expected.json index f5610756ad71e..a142de99be8b0 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket-inventory.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket-inventory.expected.json @@ -155,4 +155,4 @@ } } } -} +} \ 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 85ece6ae7bf15..d3f68abaf02b5 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 @@ -38,9 +38,9 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", - "s3:PutObjectLegalHold", - "s3:PutObjectRetention", - "s3:PutObjectTagging", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", "s3:PutObjectVersionTagging", "s3:Abort*" ], @@ -75,4 +75,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 6a8b1e6567a0e..4352395e831c2 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json @@ -89,9 +89,9 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", - "s3:PutObjectLegalHold", - "s3:PutObjectRetention", - "s3:PutObjectTagging", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", "s3:PutObjectVersionTagging", "s3:Abort*" ], @@ -177,4 +177,4 @@ } } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.expected.json index 37a7d24a40029..6ab5dcbfef26e 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.expected.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.expected.json @@ -44,7 +44,10 @@ [ "https://", { - "Fn::GetAtt": ["MyBucketF68F3FF0", "RegionalDomainName"] + "Fn::GetAtt": [ + "MyBucketF68F3FF0", + "RegionalDomainName" + ] }, "/myfolder/myfile.txt" ] @@ -58,7 +61,10 @@ [ "https://", { - "Fn::GetAtt": ["MyBucketF68F3FF0", "DomainName"] + "Fn::GetAtt": [ + "MyBucketF68F3FF0", + "DomainName" + ] }, "/myfolder/myfile.txt" ] @@ -80,4 +86,4 @@ } } } -} +} \ No newline at end of file From 069b7452ff493335c51362aa600500617e127b3c Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Wed, 19 Jan 2022 09:09:41 +0100 Subject: [PATCH 3/7] fix other packages integ tests --- .../test/integ.cicd.expected.json | 4 ++++ .../test/integ.caching.expected.json | 6 +++++- ....project-buildspec-artifacts.expected.json | 6 +++++- .../test/integ.project-logging.expected.json | 6 +++++- ...-secondary-sources-artifacts.expected.json | 6 +++++- ...g.cfn-template-from-repo.lit.expected.json | 8 ++++++++ ...yed-through-codepipeline.lit.expected.json | 20 +++++++++++++++++++ .../test/integ.lambda-pipeline.expected.json | 8 ++++++++ .../integ.pipeline-alexa-deploy.expected.json | 8 ++++++++ ...eg.pipeline-cfn-cross-region.expected.json | 8 ++++++++ ...ipeline-cfn-with-action-role.expected.json | 8 ++++++++ .../test/integ.pipeline-cfn.expected.json | 12 +++++++++++ ...eg.pipeline-code-build-batch.expected.json | 4 ++++ ...uild-multiple-inputs-outputs.expected.json | 12 +++++++++++ ...g.pipeline-code-commit-build.expected.json | 12 +++++++++++ .../integ.pipeline-code-commit.expected.json | 8 ++++++++ ...teg.pipeline-code-deploy-ecs.expected.json | 8 ++++++++ .../integ.pipeline-code-deploy.expected.json | 8 ++++++++ .../integ.pipeline-ecr-source.expected.json | 8 ++++++++ .../integ.pipeline-ecs-deploy.expected.json | 12 +++++++++++ ...line-ecs-separate-source.lit.expected.json | 16 +++++++++++++++ .../test/integ.pipeline-events.expected.json | 12 +++++++++++ .../test/integ.pipeline-jenkins.expected.json | 8 ++++++++ ...teg.pipeline-manual-approval.expected.json | 8 ++++++++ .../integ.pipeline-s3-deploy.expected.json | 12 +++++++++++ ...integ.pipeline-stepfunctions.expected.json | 8 ++++++++ .../ec2/integ.environment-file.expected.json | 4 ++++ .../integ.pipeline-event-target.expected.json | 4 ++++ ...nteg.kinesis-firehose-stream.expected.json | 4 ++++ .../aws-glue/test/integ.job.expected.json | 4 ++++ .../aws-glue/test/integ.table.expected.json | 12 +++++++++++ ...g.firehose-put-record-action.expected.json | 4 ++++ .../test/integ.s3-bucket.lit.expected.json | 8 ++++++++ .../test/integ.delivery-stream.expected.json | 4 ++++ ...elivery-stream.source-stream.expected.json | 14 ++++++++----- .../test/integ.cluster-s3.expected.json | 4 ++++ .../integ.instance-s3-postgres.expected.json | 4 ++++ .../test/integ.instance-s3.expected.json | 4 ++++ ...bucket-deployment-cloudfront.expected.json | 4 ++++ .../integ.bucket-deployment.expected.json | 16 +++++++++++++++ ...nteg.job-submission-workflow.expected.json | 4 ++++ .../integ.call-sagemaker.expected.json | 4 ++++ .../integ.create-training-job.expected.json | 4 ++++ .../integ.newpipeline-with-vpc.expected.json | 8 ++++++++ .../test/integ.newpipeline.expected.json | 8 ++++++++ .../integ.pipeline-security.expected.json | 8 ++++++++ ...ne-with-assets-single-upload.expected.json | 8 ++++++++ .../integ.pipeline-with-assets.expected.json | 8 ++++++++ .../test/integ.pipeline.expected.json | 8 ++++++++ .../test/__snapshots__/synth.test.js.snap | 12 +++++++++++ 50 files changed, 389 insertions(+), 9 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 9b2ed51da9ff2..9d53a0d8b915c 100644 --- a/packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json +++ b/packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 c1680ca40cea9..d98388270cec6 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json +++ b/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -171,4 +175,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 17cec3ba454e2..011e192831fb9 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 @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -166,4 +170,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 6dbe8a8127224..03ffa27190981 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 @@ -39,6 +39,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -223,4 +227,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 a8c439a0eaad1..f8c74e1af60e6 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 @@ -64,6 +64,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -218,4 +222,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 3c59dc4a9305d..87d6594c254c4 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 @@ -159,6 +159,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -440,6 +444,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 61cef35a009c0..823b5af6c908b 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 @@ -153,6 +153,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -508,6 +512,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -621,6 +629,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1350,6 +1362,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1572,6 +1588,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 53614fd854b19..0c993b6ff4591 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 @@ -153,6 +153,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -388,6 +392,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 6662d025f667b..c255275baa82b 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 @@ -163,6 +163,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -387,6 +391,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 85ddb7d7dc4a9..167b278084683 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 @@ -39,6 +39,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -265,6 +269,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 81c9c5fc2a998..b3d024a33f2a8 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 @@ -164,6 +164,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -384,6 +388,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 707f673e11ea1..53189d1369dda 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 @@ -153,6 +153,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -440,6 +444,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -563,6 +571,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 3af1036c27a2b..854b01ae12ac6 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 @@ -110,6 +110,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 cd9a20670da04..c1624ab7e2f7b 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 @@ -110,6 +110,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -196,6 +200,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -557,6 +565,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 53dffb9a5b78c..cb437e83eb651 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 @@ -92,6 +92,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -413,6 +417,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -671,6 +679,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 ed452beed9f7a..23bdec497e551 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 @@ -224,6 +224,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -430,6 +434,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 ad229d36e2207..1b20a71fd7def 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 @@ -39,6 +39,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -258,6 +262,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 d2d0bea52821f..eb87655dd0e60 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 @@ -124,6 +124,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -341,6 +345,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 53c605d58da68..4720701233397 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 @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -217,6 +221,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 9f9f3404c1413..725008ba28aa8 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 @@ -427,6 +427,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -576,6 +580,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -843,6 +851,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 acee7feab59e6..a728e17a69655 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 @@ -397,6 +397,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -639,6 +643,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -962,6 +970,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1059,6 +1071,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 d464eef509bdd..0a7d958491359 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 @@ -153,6 +153,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -374,6 +378,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -761,6 +769,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 5c89d0d1119b9..eda778cf7ec55 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 @@ -39,6 +39,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -276,6 +280,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 f0c66384b1709..1193cbb2f30d0 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 @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -243,6 +247,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 ecd97ebdd239d..3f08d6c1ec9ad 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 @@ -44,6 +44,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -261,6 +265,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -339,6 +347,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 fe94e8c305ad7..d35d3f59e6bb2 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 @@ -196,6 +196,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -433,6 +437,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 2f4e3c8498ea6..6b3947da0089f 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 @@ -1346,6 +1346,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 bc6bec13d1d5f..912eb616ad2c8 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 @@ -159,6 +159,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 6b76a3d96a32e..0c7a34c7f4bd5 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 @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-glue/test/integ.job.expected.json b/packages/@aws-cdk/aws-glue/test/integ.job.expected.json index 61f4f60434db1..d50a9de59a00e 100644 --- a/packages/@aws-cdk/aws-glue/test/integ.job.expected.json +++ b/packages/@aws-cdk/aws-glue/test/integ.job.expected.json @@ -43,6 +43,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 32fda38f59b0f..c76cbb5544660 100644 --- a/packages/@aws-cdk/aws-glue/test/integ.table.expected.json +++ b/packages/@aws-cdk/aws-glue/test/integ.table.expected.json @@ -482,6 +482,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -559,6 +563,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -671,6 +679,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-put-record-action.expected.json b/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-put-record-action.expected.json index d1565669b5c04..5c484ba7f5049 100644 --- a/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-put-record-action.expected.json +++ b/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-put-record-action.expected.json @@ -123,6 +123,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations/test/integ.s3-bucket.lit.expected.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations/test/integ.s3-bucket.lit.expected.json index 5ae3347a50989..913dba1638ec3 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations/test/integ.s3-bucket.lit.expected.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations/test/integ.s3-bucket.lit.expected.json @@ -481,6 +481,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -527,6 +531,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.expected.json b/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.expected.json index 1c23bbcee1092..65ac018add362 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.expected.json +++ b/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.expected.json @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.source-stream.expected.json b/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.source-stream.expected.json index a37685e2e47e8..ccbca77c32829 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.source-stream.expected.json +++ b/packages/@aws-cdk/aws-kinesisfirehose/test/integ.delivery-stream.source-stream.expected.json @@ -34,6 +34,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -74,11 +78,8 @@ "SourceStream95FF52BE": { "Type": "AWS::Kinesis::Stream", "Properties": { - "ShardCount": 1, - "StreamModeDetails": { - "StreamMode": "PROVISIONED" - }, "RetentionPeriodHours": 24, + "ShardCount": 1, "StreamEncryption": { "Fn::If": [ "AwsCdkKinesisEncryptedStreamsUnsupportedRegions", @@ -90,6 +91,9 @@ "KeyId": "alias/aws/kinesis" } ] + }, + "StreamModeDetails": { + "StreamMode": "PROVISIONED" } } }, @@ -284,4 +288,4 @@ } } } -} +} \ No newline at end of file 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 a2631bd5991c8..d3127f0b8fdd9 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 @@ -548,6 +548,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-rds/test/integ.instance-s3-postgres.expected.json b/packages/@aws-cdk/aws-rds/test/integ.instance-s3-postgres.expected.json index c623afaf92464..f811978275863 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.instance-s3-postgres.expected.json +++ b/packages/@aws-cdk/aws-rds/test/integ.instance-s3-postgres.expected.json @@ -455,6 +455,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 5b851784caef0..f379bde6663f7 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 @@ -454,6 +454,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 ae66a97b871bc..e50759499b6cc 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 @@ -417,6 +417,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 26209e97d225e..51473300ac82b 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 @@ -378,6 +378,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -411,6 +415,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -444,6 +452,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1528,6 +1540,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.expected.json index ec1551086d626..ad853185040b4 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.expected.json +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.expected.json @@ -1342,6 +1342,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", 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 107fd16780144..942f72ba3d41b 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 @@ -148,6 +148,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 0cd3166d73138..3e069a953f03a 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 @@ -148,6 +148,10 @@ "Action": [ "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.expected.json b/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.expected.json index c0d89b2bf135a..87c85c72f72e4 100644 --- a/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.expected.json @@ -667,6 +667,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1276,6 +1280,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/pipelines/test/integ.newpipeline.expected.json b/packages/@aws-cdk/pipelines/test/integ.newpipeline.expected.json index 6e12dae20df4d..3ae3fe487e81d 100644 --- a/packages/@aws-cdk/pipelines/test/integ.newpipeline.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.newpipeline.expected.json @@ -153,6 +153,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1973,6 +1977,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json index 996f6abad6abc..f9f2ec14d2199 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json @@ -215,6 +215,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -1310,6 +1314,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.expected.json index 64471fdf6b4c8..26cecb377ee68 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.expected.json @@ -215,6 +215,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -746,6 +750,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 01eafcfb30eef..c757e3097d633 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 @@ -215,6 +215,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -773,6 +777,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 90d937525afc8..ab3e7cbede27a 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline.expected.json @@ -215,6 +215,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*" ], "Effect": "Allow", @@ -704,6 +708,10 @@ "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "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 93c4dfdf336c4..44d2527e49d47 100644 --- a/packages/decdk/test/__snapshots__/synth.test.js.snap +++ b/packages/decdk/test/__snapshots__/synth.test.js.snap @@ -1796,6 +1796,10 @@ Object { "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*", ], "Effect": "Allow", @@ -2515,6 +2519,10 @@ Object { "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*", ], "Effect": "Allow", @@ -2642,6 +2650,10 @@ Object { "s3:List*", "s3:DeleteObject*", "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging", "s3:Abort*", ], "Effect": "Allow", From f0da7e9ca3459673aa3a784166e6717fcb631781 Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Wed, 19 Jan 2022 09:54:40 +0100 Subject: [PATCH 4/7] fix expected s3 policy output in unit tests --- .../test/lambda/lambda-invoke-action.test.ts | 8 ++++++++ .../test/s3/s3-deploy-action.test.ts | 4 ++++ .../test/alb/load-balancer.test.ts | 18 ++++++++++++++++-- .../test/nlb/load-balancer.test.ts | 18 ++++++++++++++++-- packages/@aws-cdk/aws-glue/test/table.test.ts | 8 ++++++++ packages/@aws-cdk/aws-rds/test/cluster.test.ts | 4 ++++ .../@aws-cdk/aws-rds/test/instance.test.ts | 4 ++++ .../test/bucket-deployment.test.ts | 4 ++++ 8 files changed, 64 insertions(+), 4 deletions(-) diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts index 1acf0b4764cd6..e4785593d6cfa 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts @@ -191,6 +191,10 @@ describe('', () => { 'Action': [ 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', @@ -247,6 +251,10 @@ describe('', () => { 'Action': [ 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], 'Effect': 'Allow', diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts index 580a4dc688e19..69917d4a91394 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts @@ -64,6 +64,10 @@ describe('', () => { 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], }, diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts index d935a915d55e7..59b9c79ad4802 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts @@ -183,7 +183,14 @@ describe('tests', () => { Version: '2012-10-17', Statement: [ { - Action: ['s3:PutObject', 's3:Abort*'], + Action: [ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ], Effect: 'Allow', Principal: { AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::127311923021:root']] } }, Resource: { @@ -236,7 +243,14 @@ describe('tests', () => { Version: '2012-10-17', Statement: [ { - Action: ['s3:PutObject', 's3:Abort*'], + Action: [ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ], Effect: 'Allow', Principal: { AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::127311923021:root']] } }, Resource: { diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts index ccfb2924e211e..e1f09e78c9f5a 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts @@ -109,7 +109,14 @@ describe('tests', () => { Version: '2012-10-17', Statement: [ { - Action: ['s3:PutObject', 's3:Abort*'], + Action: [ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ], Effect: 'Allow', Principal: { AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::127311923021:root']] } }, Resource: { @@ -180,7 +187,14 @@ describe('tests', () => { Version: '2012-10-17', Statement: [ { - Action: ['s3:PutObject', 's3:Abort*'], + Action: [ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ], Effect: 'Allow', Principal: { AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::127311923021:root']] } }, Resource: { diff --git a/packages/@aws-cdk/aws-glue/test/table.test.ts b/packages/@aws-cdk/aws-glue/test/table.test.ts index a7aa71474724f..e3f5df9bb6a3f 100644 --- a/packages/@aws-cdk/aws-glue/test/table.test.ts +++ b/packages/@aws-cdk/aws-glue/test/table.test.ts @@ -1281,6 +1281,10 @@ describe('grants', () => { Action: [ 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], Effect: 'Allow', @@ -1393,6 +1397,10 @@ describe('grants', () => { 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], Effect: 'Allow', diff --git a/packages/@aws-cdk/aws-rds/test/cluster.test.ts b/packages/@aws-cdk/aws-rds/test/cluster.test.ts index b3dbdfc81d007..48e5706f454c3 100644 --- a/packages/@aws-cdk/aws-rds/test/cluster.test.ts +++ b/packages/@aws-cdk/aws-rds/test/cluster.test.ts @@ -1323,6 +1323,10 @@ describe('cluster', () => { 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], Effect: 'Allow', diff --git a/packages/@aws-cdk/aws-rds/test/instance.test.ts b/packages/@aws-cdk/aws-rds/test/instance.test.ts index 484ad765cb790..1889b587dcad1 100644 --- a/packages/@aws-cdk/aws-rds/test/instance.test.ts +++ b/packages/@aws-cdk/aws-rds/test/instance.test.ts @@ -1301,6 +1301,10 @@ describe('instance', () => { 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], Effect: 'Allow', diff --git a/packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment.test.ts b/packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment.test.ts index 38023cc0154e6..33db51a08d473 100644 --- a/packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment.test.ts +++ b/packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment.test.ts @@ -666,6 +666,10 @@ testFutureBehavior('lambda execution role gets permissions to read from the sour 's3:List*', 's3:DeleteObject*', 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', 's3:Abort*', ], Effect: 'Allow', From 1871e329cbf3ab28c90be9bc3b69450e085110c1 Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Wed, 19 Jan 2022 11:14:17 +0100 Subject: [PATCH 5/7] add s3:PutObjectVersionAcl to policy actions in tests when grantPutAcl is called --- .../test/bitbucket/bitbucket-source-action.test.ts | 5 ++++- .../test/codecommit/codecommit-source-action.test.ts | 5 ++++- .../codestar-connections-source-action.test.ts | 5 ++++- .../test/integ.pipeline-s3-deploy.expected.json | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts index 4e3fd6045a251..5bdfc790f4462 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/bitbucket/bitbucket-source-action.test.ts @@ -92,7 +92,10 @@ describeDeprecated('BitBucket source Action', () => { 'PolicyDocument': { 'Statement': arrayWith( objectLike({ - 'Action': 's3:PutObjectAcl', + 'Action': [ + 's3:PutObjectAcl', + 's3:PutObjectVersionAcl', + ], 'Effect': 'Allow', 'Resource': { 'Fn::Join': [ diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/codecommit-source-action.test.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/codecommit-source-action.test.ts index 648c113ce2155..c7d414627e0d4 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/codecommit-source-action.test.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/codecommit-source-action.test.ts @@ -555,7 +555,10 @@ describe('CodeCommit Source Action', () => { expect(repoStack).toHaveResourceLike('AWS::IAM::Policy', { PolicyDocument: { Statement: arrayWith({ - 'Action': 's3:PutObjectAcl', + 'Action': [ + 's3:PutObjectAcl', + 's3:PutObjectVersionAcl', + ], 'Effect': 'Allow', 'Resource': { 'Fn::Join': ['', [ diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/codestar-connections/codestar-connections-source-action.test.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/codestar-connections/codestar-connections-source-action.test.ts index 312251bd8457a..72cecb5055c61 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/codestar-connections/codestar-connections-source-action.test.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/codestar-connections/codestar-connections-source-action.test.ts @@ -94,7 +94,10 @@ describe('CodeStar Connections source Action', () => { 'PolicyDocument': { 'Statement': arrayWith( objectLike({ - 'Action': 's3:PutObjectAcl', + 'Action': [ + 's3:PutObjectAcl', + 's3:PutObjectVersionAcl', + ], 'Effect': 'Allow', 'Resource': { 'Fn::Join': ['', [ 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 3f08d6c1ec9ad..9cc08aec93f44 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 @@ -378,7 +378,10 @@ ] }, { - "Action": "s3:PutObjectAcl", + "Action": [ + "s3:PutObjectAcl", + "s3:PutObjectVersionAcl" + ], "Effect": "Allow", "Resource": { "Fn::Join": [ From 17b926d2308ce0315d7c8133c1baecb22cf618a2 Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Tue, 25 Jan 2022 17:38:11 +0100 Subject: [PATCH 6/7] fix alb test --- .../test/alb/load-balancer.test.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts index 4502b0c1d32e0..5bb54df75ac24 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts @@ -256,7 +256,14 @@ describe('tests', () => { Version: '2012-10-17', Statement: [ { - Action: ['s3:PutObject', 's3:Abort*'], + Action: [ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ], Effect: 'Allow', Principal: { AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::127311923021:root']] } }, Resource: { @@ -319,7 +326,14 @@ describe('tests', () => { Version: '2012-10-17', Statement: [ { - Action: ['s3:PutObject', 's3:Abort*'], + Action: [ + 's3:PutObject', + 's3:PutObjectLegalHold', + 's3:PutObjectRetention', + 's3:PutObjectTagging', + 's3:PutObjectVersionTagging', + 's3:Abort*', + ], Effect: 'Allow', Principal: { AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::127311923021:root']] } }, Resource: { From d4e72bf83651a89b631c953e57d47e85a24ad85f Mon Sep 17 00:00:00 2001 From: Flavio Leggio Date: Tue, 25 Jan 2022 21:07:28 +0100 Subject: [PATCH 7/7] remove decdk files --- packages/decdk/bin/decdk-schema.d.ts | 1 - packages/decdk/bin/decdk-schema.js | 15 - packages/decdk/bin/decdk.d.ts | 1 - packages/decdk/bin/decdk.js | 25 -- packages/decdk/cdk.schema.json | 0 packages/decdk/lib/cdk-schema.d.ts | 18 - packages/decdk/lib/cdk-schema.js | 95 ----- packages/decdk/lib/declarative-stack.d.ts | 10 - packages/decdk/lib/declarative-stack.js | 371 ----------------- packages/decdk/lib/index.d.ts | 3 - packages/decdk/lib/index.js | 16 - packages/decdk/lib/jsii2schema.d.ts | 39 -- packages/decdk/lib/jsii2schema.js | 479 ---------------------- packages/decdk/lib/util.d.ts | 7 - packages/decdk/lib/util.js | 27 -- packages/decdk/test/fixture/index.d.ts | 29 -- packages/decdk/test/fixture/index.js | 10 - packages/decdk/test/sanity.test.d.ts | 1 - packages/decdk/test/sanity.test.js | 20 - packages/decdk/test/schema.test.d.ts | 1 - packages/decdk/test/schema.test.js | 84 ---- packages/decdk/test/synth.test.d.ts | 1 - packages/decdk/test/synth.test.js | 45 -- 23 files changed, 1298 deletions(-) delete mode 100644 packages/decdk/bin/decdk-schema.d.ts delete mode 100644 packages/decdk/bin/decdk-schema.js delete mode 100644 packages/decdk/bin/decdk.d.ts delete mode 100644 packages/decdk/bin/decdk.js delete mode 100644 packages/decdk/cdk.schema.json delete mode 100644 packages/decdk/lib/cdk-schema.d.ts delete mode 100644 packages/decdk/lib/cdk-schema.js delete mode 100644 packages/decdk/lib/declarative-stack.d.ts delete mode 100644 packages/decdk/lib/declarative-stack.js delete mode 100644 packages/decdk/lib/index.d.ts delete mode 100644 packages/decdk/lib/index.js delete mode 100644 packages/decdk/lib/jsii2schema.d.ts delete mode 100644 packages/decdk/lib/jsii2schema.js delete mode 100644 packages/decdk/lib/util.d.ts delete mode 100644 packages/decdk/lib/util.js delete mode 100644 packages/decdk/test/fixture/index.d.ts delete mode 100644 packages/decdk/test/fixture/index.js delete mode 100644 packages/decdk/test/sanity.test.d.ts delete mode 100644 packages/decdk/test/sanity.test.js delete mode 100644 packages/decdk/test/schema.test.d.ts delete mode 100644 packages/decdk/test/schema.test.js delete mode 100644 packages/decdk/test/synth.test.d.ts delete mode 100644 packages/decdk/test/synth.test.js diff --git a/packages/decdk/bin/decdk-schema.d.ts b/packages/decdk/bin/decdk-schema.d.ts deleted file mode 100644 index cb0ff5c3b541f..0000000000000 --- a/packages/decdk/bin/decdk-schema.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/packages/decdk/bin/decdk-schema.js b/packages/decdk/bin/decdk-schema.js deleted file mode 100644 index 457bf4d8e25ff..0000000000000 --- a/packages/decdk/bin/decdk-schema.js +++ /dev/null @@ -1,15 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const lib_1 = require("../lib"); -const cdk_schema_1 = require("../lib/cdk-schema"); -/* eslint-disable no-console */ -async function main() { - const typeSystem = await lib_1.loadTypeSystem(); - const schema = await cdk_schema_1.renderFullSchema(typeSystem, { colors: true, warnings: true }); - console.log(JSON.stringify(schema, undefined, 2)); -} -main().catch(e => { - console.error(e); - process.exit(1); -}); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjZGstc2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVjZGstc2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsZ0NBQXdDO0FBQ3hDLGtEQUFxRDtBQUVyRCwrQkFBK0I7QUFFL0IsS0FBSyxVQUFVLElBQUk7SUFDakIsTUFBTSxVQUFVLEdBQUcsTUFBTSxvQkFBYyxFQUFFLENBQUM7SUFDMUMsTUFBTSxNQUFNLEdBQUcsTUFBTSw2QkFBZ0IsQ0FBQyxVQUFVLEVBQUUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3BGLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDcEQsQ0FBQztBQUVELElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRTtJQUNmLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsQixDQUFDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGxvYWRUeXBlU3lzdGVtIH0gZnJvbSAnLi4vbGliJztcbmltcG9ydCB7IHJlbmRlckZ1bGxTY2hlbWEgfSBmcm9tICcuLi9saWIvY2RrLXNjaGVtYSc7XG5cbi8qIGVzbGludC1kaXNhYmxlIG5vLWNvbnNvbGUgKi9cblxuYXN5bmMgZnVuY3Rpb24gbWFpbigpIHtcbiAgY29uc3QgdHlwZVN5c3RlbSA9IGF3YWl0IGxvYWRUeXBlU3lzdGVtKCk7XG4gIGNvbnN0IHNjaGVtYSA9IGF3YWl0IHJlbmRlckZ1bGxTY2hlbWEodHlwZVN5c3RlbSwgeyBjb2xvcnM6IHRydWUsIHdhcm5pbmdzOiB0cnVlIH0pO1xuICBjb25zb2xlLmxvZyhKU09OLnN0cmluZ2lmeShzY2hlbWEsIHVuZGVmaW5lZCwgMikpO1xufVxuXG5tYWluKCkuY2F0Y2goZSA9PiB7XG4gIGNvbnNvbGUuZXJyb3IoZSk7XG4gIHByb2Nlc3MuZXhpdCgxKTtcbn0pOyJdfQ== \ No newline at end of file diff --git a/packages/decdk/bin/decdk.d.ts b/packages/decdk/bin/decdk.d.ts deleted file mode 100644 index cb0ff5c3b541f..0000000000000 --- a/packages/decdk/bin/decdk.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/packages/decdk/bin/decdk.js b/packages/decdk/bin/decdk.js deleted file mode 100644 index 1e8ce40bc71ed..0000000000000 --- a/packages/decdk/bin/decdk.js +++ /dev/null @@ -1,25 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const cdk = require("@aws-cdk/core"); -const chalk = require("chalk"); -const lib_1 = require("../lib"); -async function main() { - const args = require('yargs') - .usage('$0 ', 'Hydrate a deconstruct file', (yargs) => { - yargs.positional('filename', { type: 'string', required: true }); - }) - .parse(); - const templateFile = args.filename; - const template = await lib_1.readTemplate(templateFile); - const stackName = lib_1.stackNameFromFileName(templateFile); - const typeSystem = await lib_1.loadTypeSystem(); - const app = new cdk.App(); - new lib_1.DeclarativeStack(app, stackName, { template, typeSystem }); - app.synth(); -} -main().catch(e => { - // eslint-disable-next-line no-console - console.error(chalk.red(e)); - process.exit(1); -}); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjZGsuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZWNkay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHFDQUFxQztBQUNyQywrQkFBK0I7QUFDL0IsZ0NBQStGO0FBRS9GLEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUM7U0FDMUIsS0FBSyxDQUFDLGVBQWUsRUFBRSw0QkFBNEIsRUFBRSxDQUFDLEtBQVUsRUFBRSxFQUFFO1FBQ25FLEtBQUssQ0FBQyxVQUFVLENBQUMsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNuRSxDQUFDLENBQUM7U0FDRCxLQUFLLEVBQUUsQ0FBQztJQUVYLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDbkMsTUFBTSxRQUFRLEdBQUcsTUFBTSxrQkFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2xELE1BQU0sU0FBUyxHQUFHLDJCQUFxQixDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ3RELE1BQU0sVUFBVSxHQUFHLE1BQU0sb0JBQWMsRUFBRSxDQUFDO0lBRTFDLE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQzFCLElBQUksc0JBQWdCLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFDO0lBQy9ELEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUU7SUFDZixzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsQixDQUFDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGNkayBmcm9tICdAYXdzLWNkay9jb3JlJztcbmltcG9ydCAqIGFzIGNoYWxrIGZyb20gJ2NoYWxrJztcbmltcG9ydCB7IERlY2xhcmF0aXZlU3RhY2ssIGxvYWRUeXBlU3lzdGVtLCByZWFkVGVtcGxhdGUsIHN0YWNrTmFtZUZyb21GaWxlTmFtZSB9IGZyb20gJy4uL2xpYic7XG5cbmFzeW5jIGZ1bmN0aW9uIG1haW4oKSB7XG4gIGNvbnN0IGFyZ3MgPSByZXF1aXJlKCd5YXJncycpXG4gICAgLnVzYWdlKCckMCA8ZmlsZW5hbWU+JywgJ0h5ZHJhdGUgYSBkZWNvbnN0cnVjdCBmaWxlJywgKHlhcmdzOiBhbnkpID0+IHtcbiAgICAgIHlhcmdzLnBvc2l0aW9uYWwoJ2ZpbGVuYW1lJywgeyB0eXBlOiAnc3RyaW5nJywgcmVxdWlyZWQ6IHRydWUgfSk7XG4gICAgfSlcbiAgICAucGFyc2UoKTtcblxuICBjb25zdCB0ZW1wbGF0ZUZpbGUgPSBhcmdzLmZpbGVuYW1lO1xuICBjb25zdCB0ZW1wbGF0ZSA9IGF3YWl0IHJlYWRUZW1wbGF0ZSh0ZW1wbGF0ZUZpbGUpO1xuICBjb25zdCBzdGFja05hbWUgPSBzdGFja05hbWVGcm9tRmlsZU5hbWUodGVtcGxhdGVGaWxlKTtcbiAgY29uc3QgdHlwZVN5c3RlbSA9IGF3YWl0IGxvYWRUeXBlU3lzdGVtKCk7XG5cbiAgY29uc3QgYXBwID0gbmV3IGNkay5BcHAoKTtcbiAgbmV3IERlY2xhcmF0aXZlU3RhY2soYXBwLCBzdGFja05hbWUsIHsgdGVtcGxhdGUsIHR5cGVTeXN0ZW0gfSk7XG4gIGFwcC5zeW50aCgpO1xufVxuXG5tYWluKCkuY2F0Y2goZSA9PiB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUuZXJyb3IoY2hhbGsucmVkKGUpKTtcbiAgcHJvY2Vzcy5leGl0KDEpO1xufSk7XG4iXX0= \ No newline at end of file diff --git a/packages/decdk/cdk.schema.json b/packages/decdk/cdk.schema.json deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/decdk/lib/cdk-schema.d.ts b/packages/decdk/lib/cdk-schema.d.ts deleted file mode 100644 index 24d8bc8157c76..0000000000000 --- a/packages/decdk/lib/cdk-schema.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import * as jsiiReflect from 'jsii-reflect'; -import { SchemaContext } from '../lib/jsii2schema'; -export interface RenderSchemaOptions { - warnings?: boolean; - /** - * Use colors when printing ouput. - * @default true if tty is enabled - */ - colors?: boolean; -} -export declare function renderFullSchema(typeSystem: jsiiReflect.TypeSystem, options?: RenderSchemaOptions): any; -export declare function schemaForResource(construct: ConstructAndProps, ctx: SchemaContext): { - $ref: string; -} | undefined; -export interface ConstructAndProps { - constructClass: jsiiReflect.ClassType; - propsTypeRef: jsiiReflect.TypeReference; -} diff --git a/packages/decdk/lib/cdk-schema.js b/packages/decdk/lib/cdk-schema.js deleted file mode 100644 index 48d35bc96251e..0000000000000 --- a/packages/decdk/lib/cdk-schema.js +++ /dev/null @@ -1,95 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.schemaForResource = exports.renderFullSchema = void 0; -const chalk = require("chalk"); -const jsii2schema_1 = require("../lib/jsii2schema"); -function renderFullSchema(typeSystem, options = {}) { - if (!process.stdin.isTTY || options.colors === false) { - // Disable chalk color highlighting - process.env.FORCE_COLOR = '0'; - } - // Find all constructs for which the props interface - // (transitively) only consists of JSON primitives or interfaces - // that consist of JSON primitives - const constructType = typeSystem.findClass('constructs.Construct'); - const constructs = typeSystem.classes.filter(c => c.extends(constructType)); - const deconstructs = constructs - .map(unpackConstruct) - .filter(c => c && !isCfnResource(c.constructClass)); - const output = require('../cloudformation.schema.json'); - output.definitions = output.definitions || {}; - const ctx = jsii2schema_1.SchemaContext.root(output.definitions); - for (const deco of deconstructs) { - const resource = schemaForResource(deco, ctx); - if (resource) { - output.properties.Resources.patternProperties["^[a-zA-Z0-9]+$"].anyOf.push(resource); - } - } - output.properties.$schema = { - type: 'string' - }; - if (options.warnings) { - printWarnings(ctx); - } - return output; -} -exports.renderFullSchema = renderFullSchema; -function printWarnings(node, indent = '') { - if (!node.hasWarningsOrErrors) { - return; - } - console.error(indent + node.name); - for (const warning of node.warnings) { - console.error(chalk.yellow(indent + ' ' + warning)); - } - for (const error of node.errors) { - console.error(chalk.red(indent + ' ' + error)); - } - if (!node.root) { - indent += ' '; - } - for (const child of node.children) { - printWarnings(child, indent); - } -} -function schemaForResource(construct, ctx) { - ctx = ctx.child('resource', construct.constructClass.fqn); - const propsSchema = jsii2schema_1.schemaForTypeReference(construct.propsTypeRef, ctx); - if (!propsSchema) { - return undefined; - } - return ctx.define(construct.constructClass.fqn, () => { - return { - additionalProperties: false, - properties: { - Properties: propsSchema, - Type: { - enum: [construct.constructClass.fqn], - type: "string" - } - } - }; - }); -} -exports.schemaForResource = schemaForResource; -function isCfnResource(klass) { - const resource = klass.system.findClass('@aws-cdk/core.CfnResource'); - return klass.extends(resource); -} -function unpackConstruct(klass) { - if (!klass.initializer || klass.abstract) { - return undefined; - } - if (klass.initializer.parameters.length < 3) { - return undefined; - } - const propsParam = klass.initializer.parameters[2]; - if (propsParam.type.fqn === undefined) { - return undefined; - } - return { - constructClass: klass, - propsTypeRef: klass.initializer.parameters[2].type - }; -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cdk-schema.js","sourceRoot":"","sources":["cdk-schema.ts"],"names":[],"mappings":"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","sourcesContent":["import * as chalk from 'chalk';\nimport * as jsiiReflect from 'jsii-reflect';\nimport { SchemaContext, schemaForTypeReference } from '../lib/jsii2schema';\n\n/* eslint-disable no-console */\n\nexport interface RenderSchemaOptions {\n  warnings?: boolean;\n\n  /**\n   * Use colors when printing ouput.\n   * @default true if tty is enabled\n   */\n  colors?: boolean;\n}\n\nexport function renderFullSchema(typeSystem: jsiiReflect.TypeSystem, options: RenderSchemaOptions = { }) {\n  if (!process.stdin.isTTY || options.colors === false) {\n     // Disable chalk color highlighting\n     process.env.FORCE_COLOR = '0';\n  }\n\n  // Find all constructs for which the props interface\n  // (transitively) only consists of JSON primitives or interfaces\n  // that consist of JSON primitives\n  const constructType = typeSystem.findClass('constructs.Construct');\n  const constructs = typeSystem.classes.filter(c => c.extends(constructType));\n\n  const deconstructs = constructs\n    .map(unpackConstruct)\n    .filter(c => c && !isCfnResource(c.constructClass)) as ConstructAndProps[];\n\n  const output = require('../cloudformation.schema.json');\n\n  output.definitions = output.definitions || { };\n\n  const ctx = SchemaContext.root(output.definitions);\n\n  for (const deco of deconstructs) {\n    const resource = schemaForResource(deco, ctx);\n    if (resource) {\n      output.properties.Resources.patternProperties[\"^[a-zA-Z0-9]+$\"].anyOf.push(resource);\n    }\n  }\n\n  output.properties.$schema = {\n    type: 'string'\n  };\n\n  if (options.warnings) {\n    printWarnings(ctx);\n  }\n\n  return output;\n}\n\nfunction printWarnings(node: SchemaContext, indent = '') {\n  if (!node.hasWarningsOrErrors) {\n    return;\n  }\n\n  console.error(indent + node.name);\n\n  for (const warning of node.warnings) {\n    console.error(chalk.yellow(indent + '  ' + warning));\n  }\n\n  for (const error of node.errors) {\n    console.error(chalk.red(indent + '  ' + error));\n  }\n\n  if (!node.root) {\n    indent += '  ';\n  }\n\n  for (const child of node.children) {\n    printWarnings(child, indent);\n  }\n}\n\nexport function schemaForResource(construct: ConstructAndProps, ctx: SchemaContext) {\n  ctx = ctx.child('resource', construct.constructClass.fqn);\n\n  const propsSchema = schemaForTypeReference(construct.propsTypeRef, ctx);\n  if (!propsSchema) {\n    return undefined;\n  }\n\n  return ctx.define(construct.constructClass.fqn, () => {\n    return {\n      additionalProperties: false,\n      properties: {\n        Properties: propsSchema,\n        Type: {\n          enum: [ construct.constructClass.fqn ],\n          type: \"string\"\n        }\n      }\n    };\n  });\n}\n\nfunction isCfnResource(klass: jsiiReflect.ClassType) {\n  const resource = klass.system.findClass('@aws-cdk/core.CfnResource');\n  return klass.extends(resource);\n}\n\nfunction unpackConstruct(klass: jsiiReflect.ClassType): ConstructAndProps | undefined {\n\n  if (!klass.initializer || klass.abstract) { return undefined; }\n  if (klass.initializer.parameters.length < 3) { return undefined; }\n\n  const propsParam = klass.initializer.parameters[2];\n  if (propsParam.type.fqn === undefined) { return undefined; }\n\n  return {\n    constructClass: klass,\n    propsTypeRef: klass.initializer.parameters[2].type\n  };\n}\n\nexport interface ConstructAndProps {\n  constructClass: jsiiReflect.ClassType;\n  propsTypeRef: jsiiReflect.TypeReference;\n}\n"]} \ No newline at end of file diff --git a/packages/decdk/lib/declarative-stack.d.ts b/packages/decdk/lib/declarative-stack.d.ts deleted file mode 100644 index 0335bdf9360b2..0000000000000 --- a/packages/decdk/lib/declarative-stack.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as cdk from '@aws-cdk/core'; -import * as reflect from 'jsii-reflect'; -export interface DeclarativeStackProps extends cdk.StackProps { - typeSystem: reflect.TypeSystem; - template: any; - workingDirectory?: string; -} -export declare class DeclarativeStack extends cdk.Stack { - constructor(scope: cdk.App, id: string, props: DeclarativeStackProps); -} diff --git a/packages/decdk/lib/declarative-stack.js b/packages/decdk/lib/declarative-stack.js deleted file mode 100644 index c1af43ff119f5..0000000000000 --- a/packages/decdk/lib/declarative-stack.js +++ /dev/null @@ -1,371 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.DeclarativeStack = void 0; -const cdk = require("@aws-cdk/core"); -const reflect = require("jsii-reflect"); -const jsonschema = require("jsonschema"); -const cdk_schema_1 = require("./cdk-schema"); -const jsii2schema_1 = require("./jsii2schema"); -class DeclarativeStack extends cdk.Stack { - constructor(scope, id, props) { - super(scope, id); - const typeSystem = props.typeSystem; - const template = props.template; - const schema = cdk_schema_1.renderFullSchema(typeSystem); - const result = jsonschema.validate(template, schema); - if (!result.valid) { - throw new ValidationError('Schema validation errors:\n ' + result.errors.map(e => `"${e.property}" ${e.message}`).join('\n ')); - } - // Replace every resource that starts with CDK:: - for (const [logicalId, resourceProps] of Object.entries(template.Resources || {})) { - const rprops = resourceProps; - if (!rprops.Type) { - throw new Error('Resource is missing type: ' + JSON.stringify(resourceProps)); - } - if (isCfnResourceType(rprops.Type)) { - continue; - } - const typeInfo = typeSystem.findFqn(rprops.Type + 'Props'); - const typeRef = new reflect.TypeReference(typeSystem, typeInfo); - const Ctor = resolveType(rprops.Type); - // Changing working directory if needed, such that relative paths in the template are resolved relative to the - // template's location, and not to the current process' CWD. - _cwd(props.workingDirectory, () => new Ctor(this, logicalId, deserializeValue(this, typeRef, true, 'Properties', rprops.Properties))); - delete template.Resources[logicalId]; - } - delete template.$schema; - // Add an Include construct with what's left of the template - new cdk.CfnInclude(this, 'Include', { template }); - // replace all "Fn::GetAtt" with tokens that resolve correctly both for - // constructs and raw resources. - processReferences(this); - } -} -exports.DeclarativeStack = DeclarativeStack; -function resolveType(fqn) { - const [mod, ...className] = fqn.split('.'); - const module = require(mod); - return module[className.join('.')]; -} -function tryResolveIntrinsic(value) { - if (Object.keys(value).length !== 1) { - return undefined; - } - const name = Object.keys(value)[0]; - const val = value[name]; - return { name, val }; -} -function tryResolveRef(value) { - const fn = tryResolveIntrinsic(value); - if (!fn) { - return undefined; - } - if (fn.name !== 'Ref') { - return undefined; - } - return fn.val; -} -function tryResolveGetAtt(value) { - const fn = tryResolveIntrinsic(value); - if (!fn || fn.name !== 'Fn::GetAtt') { - return undefined; - } - return fn.val; -} -function deserializeValue(stack, typeRef, optional, key, value) { - // console.error('====== deserializer ==================='); - // console.error(`type: ${typeRef}`); - // console.error(`value: ${JSON.stringify(value, undefined, 2)}`); - // console.error('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`'); - if (value === undefined) { - if (optional) { - return undefined; - } - throw new Error(`Missing required value for ${key} in ${typeRef}`); - } - // deserialize arrays - if (typeRef.arrayOfType) { - if (!Array.isArray(value)) { - throw new Error(`Expecting array for ${key} in ${typeRef}`); - } - return value.map((x, i) => deserializeValue(stack, typeRef.arrayOfType, false, `${key}[${i}]`, x)); - } - const asRef = tryResolveRef(value); - if (asRef) { - if (jsii2schema_1.isConstruct(typeRef)) { - return findConstruct(stack, value.Ref); - } - throw new Error(`{ Ref } can only be used when a construct type is expected and this is ${typeRef}. ` + - `Use { Fn::GetAtt } to represent specific resource attributes`); - } - const getAtt = tryResolveGetAtt(value); - if (getAtt) { - const [logical, attr] = getAtt; - if (jsii2schema_1.isConstruct(typeRef)) { - const obj = findConstruct(stack, logical); - return obj[attr]; - } - if (typeRef.primitive === 'string') { - // return a lazy value, so we only try to find after all constructs - // have been added to the stack. - return deconstructGetAtt(stack, logical, attr); - } - throw new Error(`Fn::GetAtt can only be used for string primitives and ${key} is ${typeRef}`); - } - // deserialize maps - if (typeRef.mapOfType) { - if (typeof (value) !== 'object') { - throw new ValidationError(`Expecting object for ${key} in ${typeRef}`); - } - const out = {}; - for (const [k, v] of Object.entries(value)) { - out[k] = deserializeValue(stack, typeRef.mapOfType, false, `${key}.${k}`, v); - } - return out; - } - if (typeRef.unionOfTypes) { - const errors = new Array(); - for (const x of typeRef.unionOfTypes) { - try { - return deserializeValue(stack, x, optional, key, value); - } - catch (e) { - if (!(e instanceof ValidationError)) { - throw e; - } - errors.push(e); - continue; - } - } - throw new ValidationError(`Failed to deserialize union. Errors: \n ${errors.map(e => e.message).join('\n ')}`); - } - const enm = deconstructEnum(stack, typeRef, key, value); - if (enm) { - return enm; - } - // if this is an interface, deserialize each property - const ifc = deconstructInterface(stack, typeRef, key, value); - if (ifc) { - return ifc; - } - // if this is an enum type, use the name to dereference - if (typeRef.type instanceof reflect.EnumType) { - const enumType = resolveType(typeRef.type.fqn); - return enumType[value]; - } - if (typeRef.primitive) { - return value; - } - const enumLike = deconstructEnumLike(stack, typeRef, value); - if (enumLike) { - return enumLike; - } - const asType = deconstructType(stack, typeRef, value); - if (asType) { - return asType; - } - throw new Error(`Unable to deconstruct "${JSON.stringify(value)}" for type ref ${typeRef}`); -} -function deconstructEnum(_stack, typeRef, _key, value) { - if (!(typeRef.type instanceof reflect.EnumType)) { - return undefined; - } - const enumType = resolveType(typeRef.type.fqn); - return enumType[value]; -} -function deconstructInterface(stack, typeRef, key, value) { - if (!jsii2schema_1.isSerializableInterface(typeRef.type)) { - return undefined; - } - const out = {}; - for (const prop of typeRef.type.allProperties) { - const propValue = value[prop.name]; - if (!propValue) { - if (!prop.optional) { - throw new ValidationError(`Missing required property ${key}.${prop.name} in ${typeRef}`); - } - continue; - } - out[prop.name] = deserializeValue(stack, prop.type, prop.optional, `${key}.${prop.name}`, propValue); - } - return out; -} -function deconstructEnumLike(stack, typeRef, value) { - if (!jsii2schema_1.isEnumLikeClass(typeRef.type)) { - return undefined; - } - // if the value is a string, we deconstruct it as a static property - if (typeof (value) === 'string') { - return deconstructStaticProperty(typeRef.type, value); - } - // if the value is an object, we deconstruct it as a static method - if (typeof (value) === 'object' && !Array.isArray(value)) { - return deconstructStaticMethod(stack, typeRef.type, value); - } - throw new Error(`Invalid value for enum-like class ${typeRef.fqn}: ${JSON.stringify(value)}`); -} -function deconstructType(stack, typeRef, value) { - const schemaDefs = {}; - const ctx = jsii2schema_1.SchemaContext.root(schemaDefs); - const schemaRef = jsii2schema_1.schemaForPolymorphic(typeRef.type, ctx); - if (!schemaRef) { - return undefined; - } - const def = findDefinition(schemaDefs, schemaRef.$ref); - const keys = Object.keys(value); - if (keys.length !== 1) { - throw new ValidationError(`Cannot parse class type ${typeRef} with value ${value}`); - } - const className = keys[0]; - // now we need to check if it's an enum or a normal class - const schema = def.anyOf.find((x) => x.properties && x.properties[className]); - if (!schema) { - throw new ValidationError(`Cannot find schema for ${className}`); - } - const def2 = findDefinition(schemaDefs, schema.properties[className].$ref); - const methodFqn = def2.comment; - const parts = methodFqn.split('.'); - const last = parts[parts.length - 1]; - if (last !== '') { - throw new Error(`Expectring an initializer`); - } - const classFqn = parts.slice(0, parts.length - 1).join('.'); - const method = typeRef.system.findClass(classFqn).initializer; - if (!method) { - throw new Error(`Cannot find the initializer for ${classFqn}`); - } - return invokeMethod(stack, method, value[className]); -} -function findDefinition(defs, $ref) { - const k = $ref.split('/').slice(2).join('/'); - return defs[k]; -} -function deconstructStaticProperty(typeRef, value) { - const typeClass = resolveType(typeRef.fqn); - return typeClass[value]; -} -function deconstructStaticMethod(stack, typeRef, value) { - const methods = typeRef.allMethods.filter(m => m.static); - const members = methods.map(x => x.name); - if (typeof (value) === 'object') { - const entries = Object.entries(value); - if (entries.length !== 1) { - throw new Error(`Value for enum-like class ${typeRef.fqn} must be an object with a single key (one of: ${members.join(',')})`); - } - const [methodName, args] = entries[0]; - const method = methods.find(m => m.name === methodName); - if (!method) { - throw new Error(`Invalid member "${methodName}" for enum-like class ${typeRef.fqn}. Options: ${members.join(',')}`); - } - if (typeof (args) !== 'object') { - throw new Error(`Expecting enum-like member ${methodName} to be an object for enum-like class ${typeRef.fqn}`); - } - return invokeMethod(stack, method, args); - } -} -function invokeMethod(stack, method, parameters) { - const typeClass = resolveType(method.parentType.fqn); - const args = new Array(); - for (let i = 0; i < method.parameters.length; ++i) { - const p = method.parameters[i]; - // kwargs: if this is the last argument and a data type, flatten (treat as keyword args) - if (i === method.parameters.length - 1 && jsii2schema_1.isDataType(p.type.type)) { - // we pass in all parameters are the value, and the positional arguments will be ignored since - // we are promised there are no conflicts - const kwargs = deserializeValue(stack, p.type, p.optional, p.name, parameters); - args.push(kwargs); - } - else { - const val = parameters[p.name]; - if (val === undefined && !p.optional) { - throw new Error(`Missing required parameter '${p.name}' for ${method.parentType.fqn}.${method.name}`); - } - if (val !== undefined) { - args.push(deserializeValue(stack, p.type, p.optional, p.name, val)); - } - } - } - if (reflect.Initializer.isInitializer(method)) { - return new typeClass(...args); - } - const methodFn = typeClass[method.name]; - if (!methodFn) { - throw new Error(`Cannot find method named ${method.name} in ${typeClass.fqn}`); - } - return methodFn.apply(typeClass, args); -} -/** - * Returns a lazy string that includes a deconstructed Fn::GetAt to a certain - * resource or construct. - * - * If `id` points to a CDK construct, the resolved value will be the value returned by - * the property `attribute`. If `id` points to a "raw" resource, the resolved value will be - * an `Fn::GetAtt`. - */ -function deconstructGetAtt(stack, id, attribute) { - return cdk.Lazy.string({ produce: () => { - const res = stack.node.tryFindChild(id); - if (!res) { - const include = stack.node.tryFindChild('Include'); - if (!include) { - throw new Error(`Unexpected - "Include" should be in the stack at this point`); - } - const raw = include.template.Resources[id]; - if (!raw) { - throw new Error(`Unable to find a resource ${id}`); - } - // just leak - return { "Fn::GetAtt": [id, attribute] }; - } - return res[attribute]; - } }); -} -function findConstruct(stack, id) { - const child = stack.node.tryFindChild(id); - if (!child) { - throw new Error(`Construct with ID ${id} not found (it must be defined before it is referenced)`); - } - return child; -} -function processReferences(stack) { - const include = stack.node.findChild('Include'); - if (!include) { - throw new Error('Unexpected'); - } - process(include.template); - function process(value) { - if (typeof (value) === 'object' && Object.keys(value).length === 1 && Object.keys(value)[0] === 'Fn::GetAtt') { - const [id, attribute] = value['Fn::GetAtt']; - return deconstructGetAtt(stack, id, attribute); - } - if (Array.isArray(value)) { - return value.map(x => process(x)); - } - if (typeof (value) === 'object') { - for (const [k, v] of Object.entries(value)) { - value[k] = process(v); - } - return value; - } - return value; - } -} -function isCfnResourceType(resourceType) { - return resourceType.includes('::'); -} -class ValidationError extends Error { -} -function _cwd(workDir, cb) { - if (!workDir) { - return cb(); - } - const prevWd = process.cwd(); - try { - process.chdir(workDir); - return cb(); - } - finally { - process.chdir(prevWd); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"declarative-stack.js","sourceRoot":"","sources":["declarative-stack.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cdk from '@aws-cdk/core';\nimport * as reflect from 'jsii-reflect';\nimport * as jsonschema from 'jsonschema';\nimport { renderFullSchema } from './cdk-schema';\nimport { isConstruct, isDataType, isEnumLikeClass, isSerializableInterface, SchemaContext, schemaForPolymorphic } from './jsii2schema';\n\nexport interface DeclarativeStackProps extends cdk.StackProps {\n  typeSystem: reflect.TypeSystem;\n  template: any;\n  workingDirectory?: string;\n}\n\nexport class DeclarativeStack extends cdk.Stack {\n  constructor(scope: cdk.App, id: string, props: DeclarativeStackProps) {\n    super(scope, id);\n\n    const typeSystem = props.typeSystem;\n    const template = props.template;\n\n    const schema = renderFullSchema(typeSystem);\n\n    const result = jsonschema.validate(template, schema);\n    if (!result.valid) {\n      throw new ValidationError('Schema validation errors:\\n  ' + result.errors.map(e => `\"${e.property}\" ${e.message}`).join('\\n  '));\n    }\n\n    // Replace every resource that starts with CDK::\n    for (const [logicalId, resourceProps] of Object.entries(template.Resources || {})) {\n      const rprops: any = resourceProps;\n      if (!rprops.Type) {\n        throw new Error('Resource is missing type: ' + JSON.stringify(resourceProps));\n      }\n\n      if (isCfnResourceType(rprops.Type)) {\n        continue;\n      }\n\n      const typeInfo = typeSystem.findFqn(rprops.Type + 'Props');\n      const typeRef = new reflect.TypeReference(typeSystem, typeInfo);\n      const Ctor = resolveType(rprops.Type);\n\n      // Changing working directory if needed, such that relative paths in the template are resolved relative to the\n      // template's location, and not to the current process' CWD.\n      _cwd(props.workingDirectory, () =>\n        new Ctor(this, logicalId, deserializeValue(this, typeRef, true, 'Properties', rprops.Properties)));\n\n      delete template.Resources[logicalId];\n    }\n\n    delete template.$schema;\n\n    // Add an Include construct with what's left of the template\n    new cdk.CfnInclude(this, 'Include', { template });\n\n    // replace all \"Fn::GetAtt\" with tokens that resolve correctly both for\n    // constructs and raw resources.\n    processReferences(this);\n  }\n}\n\nfunction resolveType(fqn: string) {\n  const [ mod, ...className ] = fqn.split('.');\n  const module = require(mod);\n  return module[className.join('.')];\n}\n\nfunction tryResolveIntrinsic(value: any) {\n  if (Object.keys(value).length !== 1) {\n    return undefined;\n  }\n\n  const name = Object.keys(value)[0];\n  const val = value[name];\n  return { name, val };\n}\n\nfunction tryResolveRef(value: any) {\n  const fn = tryResolveIntrinsic(value);\n  if (!fn) {\n    return undefined;\n  }\n\n  if (fn.name !== 'Ref') {\n    return undefined;\n  }\n\n  return fn.val;\n}\n\nfunction tryResolveGetAtt(value: any) {\n  const fn = tryResolveIntrinsic(value);\n  if (!fn || fn.name !== 'Fn::GetAtt') {\n    return undefined;\n  }\n\n  return fn.val;\n}\n\nfunction deserializeValue(stack: cdk.Stack, typeRef: reflect.TypeReference, optional: boolean, key: string, value: any): any {\n  // console.error('====== deserializer ===================');\n  // console.error(`type: ${typeRef}`);\n  // console.error(`value: ${JSON.stringify(value, undefined, 2)}`);\n  // console.error('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`');\n\n  if (value === undefined) {\n    if (optional) {\n      return undefined;\n    }\n\n    throw new Error(`Missing required value for ${key} in ${typeRef}`);\n  }\n\n  // deserialize arrays\n  if (typeRef.arrayOfType) {\n    if (!Array.isArray(value)) {\n      throw new Error(`Expecting array for ${key} in ${typeRef}`);\n    }\n\n    return value.map((x, i) => deserializeValue(stack, typeRef.arrayOfType!, false, `${key}[${i}]`, x));\n  }\n\n  const asRef = tryResolveRef(value);\n  if (asRef) {\n    if (isConstruct(typeRef)) {\n      return findConstruct(stack, value.Ref);\n    }\n\n    throw new Error(\n      `{ Ref } can only be used when a construct type is expected and this is ${typeRef}. ` +\n      `Use { Fn::GetAtt } to represent specific resource attributes`);\n  }\n\n  const getAtt = tryResolveGetAtt(value);\n  if (getAtt) {\n    const [ logical, attr ] = getAtt;\n\n    if (isConstruct(typeRef)) {\n      const obj: any = findConstruct(stack, logical);\n      return obj[attr];\n    }\n\n    if (typeRef.primitive === 'string') {\n      // return a lazy value, so we only try to find after all constructs\n      // have been added to the stack.\n      return deconstructGetAtt(stack, logical, attr);\n    }\n\n    throw new Error(`Fn::GetAtt can only be used for string primitives and ${key} is ${typeRef}`);\n  }\n\n  // deserialize maps\n  if (typeRef.mapOfType) {\n    if (typeof(value) !== 'object') {\n      throw new ValidationError(`Expecting object for ${key} in ${typeRef}`);\n    }\n\n    const out: any = { };\n    for (const [ k, v ] of Object.entries(value)) {\n      out[k] = deserializeValue(stack, typeRef.mapOfType, false, `${key}.${k}`, v);\n    }\n\n    return out;\n  }\n\n  if (typeRef.unionOfTypes) {\n    const errors = new Array<any>();\n    for (const x of typeRef.unionOfTypes) {\n      try {\n        return deserializeValue(stack, x, optional, key, value);\n      } catch (e) {\n        if (!(e instanceof ValidationError)) {\n          throw e;\n        }\n        errors.push(e);\n        continue;\n      }\n    }\n\n    throw new ValidationError(`Failed to deserialize union. Errors: \\n  ${errors.map(e => e.message).join('\\n  ')}`);\n  }\n\n  const enm = deconstructEnum(stack, typeRef, key, value);\n  if (enm) {\n    return enm;\n  }\n\n  // if this is an interface, deserialize each property\n  const ifc = deconstructInterface(stack, typeRef, key, value);\n  if (ifc) {\n    return ifc;\n  }\n\n  // if this is an enum type, use the name to dereference\n  if (typeRef.type instanceof reflect.EnumType) {\n    const enumType = resolveType(typeRef.type.fqn);\n    return enumType[value];\n  }\n\n  if (typeRef.primitive) {\n    return value;\n  }\n\n  const enumLike = deconstructEnumLike(stack, typeRef, value);\n  if (enumLike) {\n    return enumLike;\n  }\n\n  const asType = deconstructType(stack, typeRef, value);\n  if (asType) {\n    return asType;\n  }\n\n  throw new Error(`Unable to deconstruct \"${JSON.stringify(value)}\" for type ref ${typeRef}`);\n}\n\nfunction deconstructEnum(_stack: cdk.Stack, typeRef: reflect.TypeReference, _key: string, value: any) {\n  if (!(typeRef.type instanceof reflect.EnumType)) {\n    return undefined;\n  }\n\n  const enumType = resolveType(typeRef.type.fqn);\n  return enumType[value];\n}\n\nfunction deconstructInterface(stack: cdk.Stack, typeRef: reflect.TypeReference, key: string, value: any) {\n  if (!isSerializableInterface(typeRef.type)) {\n    return undefined;\n  }\n\n  const out: any = { };\n  for (const prop of typeRef.type.allProperties) {\n    const propValue = value[prop.name];\n    if (!propValue) {\n      if (!prop.optional) {\n        throw new ValidationError(`Missing required property ${key}.${prop.name} in ${typeRef}`);\n      }\n      continue;\n    }\n\n    out[prop.name] = deserializeValue(stack, prop.type, prop.optional, `${key}.${prop.name}`, propValue);\n  }\n\n  return out;\n}\n\nfunction deconstructEnumLike(stack: cdk.Stack, typeRef: reflect.TypeReference, value: any) {\n  if (!isEnumLikeClass(typeRef.type)) {\n    return undefined;\n  }\n\n  // if the value is a string, we deconstruct it as a static property\n  if (typeof(value) === 'string') {\n    return deconstructStaticProperty(typeRef.type, value);\n  }\n\n  // if the value is an object, we deconstruct it as a static method\n  if (typeof(value) === 'object' && !Array.isArray(value)) {\n    return deconstructStaticMethod(stack, typeRef.type, value);\n  }\n\n  throw new Error(`Invalid value for enum-like class ${typeRef.fqn}: ${JSON.stringify(value)}`);\n}\n\nfunction deconstructType(stack: cdk.Stack, typeRef: reflect.TypeReference, value: any) {\n  const schemaDefs: any = {};\n  const ctx = SchemaContext.root(schemaDefs);\n  const schemaRef = schemaForPolymorphic(typeRef.type, ctx);\n  if (!schemaRef) {\n    return undefined;\n  }\n\n  const def = findDefinition(schemaDefs, schemaRef.$ref);\n\n  const keys = Object.keys(value);\n  if (keys.length !== 1) {\n    throw new ValidationError(`Cannot parse class type ${typeRef} with value ${value}`);\n  }\n\n  const className = keys[0];\n\n  // now we need to check if it's an enum or a normal class\n  const schema = def.anyOf.find((x: any) => x.properties && x.properties[className]);\n  if (!schema) {\n    throw new ValidationError(`Cannot find schema for ${className}`);\n  }\n\n  const def2 = findDefinition(schemaDefs, schema.properties[className].$ref);\n  const methodFqn = def2.comment;\n\n  const parts = methodFqn.split('.');\n  const last = parts[parts.length - 1];\n  if (last !== '<initializer>') {\n    throw new Error(`Expectring an initializer`);\n  }\n\n  const classFqn = parts.slice(0, parts.length - 1).join('.');\n  const method = typeRef.system.findClass(classFqn).initializer;\n  if (!method) {\n    throw new Error(`Cannot find the initializer for ${classFqn}`);\n  }\n\n  return invokeMethod(stack, method, value[className]);\n}\n\nfunction findDefinition(defs: any, $ref: string) {\n  const k = $ref.split('/').slice(2).join('/');\n  return defs[k];\n}\n\nfunction deconstructStaticProperty(typeRef: reflect.ClassType, value: string) {\n  const typeClass = resolveType(typeRef.fqn);\n  return typeClass[value];\n}\n\nfunction deconstructStaticMethod(stack: cdk.Stack, typeRef: reflect.ClassType, value: any) {\n  const methods = typeRef.allMethods.filter(m => m.static);\n  const members = methods.map(x => x.name);\n\n  if (typeof(value) === 'object') {\n    const entries: Array<[ string, any ]> = Object.entries(value);\n    if (entries.length !== 1) {\n      throw new Error(`Value for enum-like class ${typeRef.fqn} must be an object with a single key (one of: ${members.join(',')})`);\n    }\n\n    const [ methodName, args ] = entries[0];\n    const method = methods.find(m => m.name === methodName);\n    if (!method) {\n      throw new Error(`Invalid member \"${methodName}\" for enum-like class ${typeRef.fqn}. Options: ${members.join(',')}`);\n    }\n\n    if (typeof(args) !== 'object') {\n      throw new Error(`Expecting enum-like member ${methodName} to be an object for enum-like class ${typeRef.fqn}`);\n    }\n\n    return invokeMethod(stack, method, args);\n  }\n}\n\nfunction invokeMethod(stack: cdk.Stack, method: reflect.Callable, parameters: any) {\n  const typeClass = resolveType(method.parentType.fqn);\n  const args = new Array<any>();\n\n  for (let i = 0; i < method.parameters.length; ++i) {\n    const p = method.parameters[i];\n\n    // kwargs: if this is the last argument and a data type, flatten (treat as keyword args)\n    if (i === method.parameters.length - 1 && isDataType(p.type.type)) {\n      // we pass in all parameters are the value, and the positional arguments will be ignored since\n      // we are promised there are no conflicts\n      const kwargs = deserializeValue(stack, p.type, p.optional, p.name, parameters);\n      args.push(kwargs);\n    } else {\n      const val = parameters[p.name];\n      if (val === undefined && !p.optional) {\n        throw new Error(`Missing required parameter '${p.name}' for ${method.parentType.fqn}.${method.name}`);\n      }\n\n      if (val !== undefined) {\n        args.push(deserializeValue(stack, p.type, p.optional, p.name, val));\n      }\n    }\n  }\n\n  if (reflect.Initializer.isInitializer(method)) {\n    return new typeClass(...args);\n  }\n\n  const methodFn: (...args: any[]) => any = typeClass[method.name];\n  if (!methodFn) {\n    throw new Error(`Cannot find method named ${method.name} in ${typeClass.fqn}`);\n  }\n\n  return methodFn.apply(typeClass, args);\n}\n\n/**\n * Returns a lazy string that includes a deconstructed Fn::GetAt to a certain\n * resource or construct.\n *\n * If `id` points to a CDK construct, the resolved value will be the value returned by\n * the property `attribute`. If `id` points to a \"raw\" resource, the resolved value will be\n * an `Fn::GetAtt`.\n */\nfunction deconstructGetAtt(stack: cdk.Stack, id: string, attribute: string) {\n  return cdk.Lazy.string({ produce: () => {\n    const res = stack.node.tryFindChild(id);\n    if (!res) {\n      const include = stack.node.tryFindChild('Include') as cdk.CfnInclude;\n      if (!include) {\n        throw new Error(`Unexpected - \"Include\" should be in the stack at this point`);\n      }\n\n      const raw = (include.template as any).Resources[id];\n      if (!raw) {\n        throw new Error(`Unable to find a resource ${id}`);\n      }\n\n      // just leak\n      return { \"Fn::GetAtt\": [ id, attribute ] };\n    }\n    return (res as any)[attribute];\n  }});\n}\n\nfunction findConstruct(stack: cdk.Stack, id: string) {\n  const child = stack.node.tryFindChild(id);\n  if (!child) {\n    throw new Error(`Construct with ID ${id} not found (it must be defined before it is referenced)`);\n  }\n  return child;\n}\n\nfunction processReferences(stack: cdk.Stack) {\n  const include = stack.node.findChild('Include') as cdk.CfnInclude;\n  if (!include) {\n    throw new Error('Unexpected');\n  }\n\n  process(include.template as any);\n\n  function process(value: any): any {\n    if (typeof(value) === 'object' && Object.keys(value).length === 1 && Object.keys(value)[0] === 'Fn::GetAtt') {\n      const [ id, attribute ] = value['Fn::GetAtt'];\n      return deconstructGetAtt(stack, id, attribute);\n    }\n\n    if (Array.isArray(value)) {\n      return value.map(x => process(x));\n    }\n\n    if (typeof(value) === 'object') {\n      for (const [ k, v ] of Object.entries(value)) {\n        value[k] = process(v);\n      }\n      return value;\n    }\n\n    return value;\n  }\n}\n\nfunction isCfnResourceType(resourceType: string) {\n  return resourceType.includes('::');\n}\n\nclass ValidationError extends Error { }\n\nfunction _cwd<T>(workDir: string | undefined, cb: () => T): T {\n  if (!workDir) { return cb(); }\n  const prevWd = process.cwd();\n  try {\n    process.chdir(workDir);\n    return cb();\n  } finally {\n    process.chdir(prevWd);\n  }\n}\n"]} \ No newline at end of file diff --git a/packages/decdk/lib/index.d.ts b/packages/decdk/lib/index.d.ts deleted file mode 100644 index 433953438b16e..0000000000000 --- a/packages/decdk/lib/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './declarative-stack'; -export * from './jsii2schema'; -export * from './util'; diff --git a/packages/decdk/lib/index.js b/packages/decdk/lib/index.js deleted file mode 100644 index 8aa6d7ae76bcc..0000000000000 --- a/packages/decdk/lib/index.js +++ /dev/null @@ -1,16 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("./declarative-stack"), exports); -__exportStar(require("./jsii2schema"), exports); -__exportStar(require("./util"), exports); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzREFBb0M7QUFDcEMsZ0RBQThCO0FBQzlCLHlDQUF1QiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gJy4vZGVjbGFyYXRpdmUtc3RhY2snO1xuZXhwb3J0ICogZnJvbSAnLi9qc2lpMnNjaGVtYSc7XG5leHBvcnQgKiBmcm9tICcuL3V0aWwnOyJdfQ== \ No newline at end of file diff --git a/packages/decdk/lib/jsii2schema.d.ts b/packages/decdk/lib/jsii2schema.d.ts deleted file mode 100644 index 0041ee37caa35..0000000000000 --- a/packages/decdk/lib/jsii2schema.d.ts +++ /dev/null @@ -1,39 +0,0 @@ -import * as jsiiReflect from 'jsii-reflect'; -export declare class SchemaContext { - static root(definitions?: { - [fqn: string]: any; - }): SchemaContext; - readonly definitions: { - [fqn: string]: any; - }; - readonly path: string; - readonly children: SchemaContext[]; - readonly name: string; - readonly root: boolean; - readonly warnings: string[]; - readonly errors: string[]; - private readonly definitionStack; - private constructor(); - child(type: string, name: string): SchemaContext; - get hasWarningsOrErrors(): boolean; - warning(format: any, ...args: any[]): void; - error(format: any, ...args: any[]): void; - findDefinition(ref: string): any; - define(fqn: string, schema: () => any): { - $ref: string; - } | undefined; -} -export declare function schemaForTypeReference(type: jsiiReflect.TypeReference, ctx: SchemaContext): any; -export declare function schemaForPolymorphic(type: jsiiReflect.Type | undefined, ctx: SchemaContext): { - $ref: string; -} | undefined; -export declare function schemaForInterface(type: jsiiReflect.Type | undefined, ctx: SchemaContext): { - $ref: string; -} | undefined; -export declare function isDataType(t: jsiiReflect.Type | undefined): t is jsiiReflect.InterfaceType; -export declare function isSerializableTypeReference(type: jsiiReflect.TypeReference, errorPrefix?: string): boolean; -export declare function isSerializableInterface(type: jsiiReflect.Type | undefined, errorPrefix?: string): type is jsiiReflect.InterfaceType; -export declare function isEnumLikeClass(cls: jsiiReflect.Type | undefined): cls is jsiiReflect.ClassType; -export declare function enumLikeClassMethods(cls: jsiiReflect.ClassType): jsiiReflect.Method[]; -export declare function enumLikeClassProperties(cls: jsiiReflect.ClassType): jsiiReflect.Property[]; -export declare function isConstruct(typeOrTypeRef: jsiiReflect.TypeReference | jsiiReflect.Type): boolean; diff --git a/packages/decdk/lib/jsii2schema.js b/packages/decdk/lib/jsii2schema.js deleted file mode 100644 index e067d5ab700f9..0000000000000 --- a/packages/decdk/lib/jsii2schema.js +++ /dev/null @@ -1,479 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.isConstruct = exports.enumLikeClassProperties = exports.enumLikeClassMethods = exports.isEnumLikeClass = exports.isSerializableInterface = exports.isSerializableTypeReference = exports.isDataType = exports.schemaForInterface = exports.schemaForPolymorphic = exports.schemaForTypeReference = exports.SchemaContext = void 0; -const jsiiReflect = require("jsii-reflect"); -const util = require("util"); -/* eslint-disable no-console */ -class SchemaContext { - constructor(name, parent, definitions) { - this.children = new Array(); - this.warnings = new Array(); - this.errors = new Array(); - this.name = name || ''; - if (parent) { - this.root = false; - parent.children.push(this); - this.definitions = parent.definitions; - this.path = parent.path + '/' + this.name; - this.definitionStack = parent.definitionStack; - } - else { - this.root = true; - this.definitions = definitions || {}; - this.path = this.name || ''; - this.definitionStack = new Array(); - } - } - static root(definitions) { - return new SchemaContext(undefined, undefined, definitions); - } - child(type, name) { - return new SchemaContext(`[${type} "${name}"]`, this); - } - get hasWarningsOrErrors() { - return this.warnings.length > 0 || this.errors.length > 0 || this.children.some(child => child.hasWarningsOrErrors); - } - warning(format, ...args) { - this.warnings.push(util.format(format, ...args)); - } - error(format, ...args) { - this.errors.push(util.format(format, ...args)); - } - findDefinition(ref) { - const [, , id] = ref.split('/'); - return this.definitions[id]; - } - define(fqn, schema) { - const originalFqn = fqn; - fqn = fqn.replace('/', '.'); - if (!(fqn in this.definitions)) { - if (this.definitionStack.includes(fqn)) { - this.error(`cyclic definition of ${fqn}`); - return undefined; - } - this.definitionStack.push(fqn); - try { - const s = schema(); - if (!s) { - this.error('cannot schematize'); - return undefined; - } - s.comment = originalFqn; - this.definitions[fqn] = s; - } - finally { - this.definitionStack.pop(); - } - } - return { $ref: `#/definitions/${fqn}` }; - } -} -exports.SchemaContext = SchemaContext; -function schemaForTypeReference(type, ctx) { - const prim = schemaForPrimitive(type); - if (prim) { - return prim; - } - const arr = schemaForArray(type, ctx); - if (arr) { - return arr; - } - const map = schemaForMap(type, ctx); - if (map) { - return map; - } - const union = schemaForUnion(type, ctx); - if (union) { - return union; - } - const constructRef = schemaForConstructRef(type); - if (constructRef) { - return constructRef; - } - const iface = schemaForInterface(type.type, ctx); - if (iface) { - return iface; - } - const enm = schemaForEnum(type.type); - if (enm) { - return enm; - } - const enumLike = schemaForEnumLikeClass(type.type, ctx); - if (enumLike) { - return enumLike; - } - const cls = schemaForPolymorphic(type.type, ctx); - if (cls) { - return cls; - } - if (!ctx.hasWarningsOrErrors) { - ctx.error(`didn't match any schematizable shape`); - } - return undefined; -} -exports.schemaForTypeReference = schemaForTypeReference; -function schemaForPolymorphic(type, ctx) { - if (!type) { - return undefined; - } - ctx = ctx.child('polymorphic', type.fqn); - const anyOf = new Array(); - const parentctx = ctx; - for (const x of allImplementationsOfType(type)) { - ctx = parentctx.child('impl', x.fqn); - const enumLike = schemaForEnumLikeClass(x, ctx); - if (enumLike) { - anyOf.push(enumLike); - } - if (x.initializer) { - const methd = methodSchema(x.initializer, ctx); - if (methd) { - anyOf.push({ - type: 'object', - additionalProperties: false, - properties: { - [x.fqn]: methd - } - }); - } - } - } - if (anyOf.length === 0) { - return undefined; - } - return ctx.define(type.fqn, () => { - return { anyOf }; - }); -} -exports.schemaForPolymorphic = schemaForPolymorphic; -function schemaForEnum(type) { - if (!type || !(type instanceof jsiiReflect.EnumType)) { - return undefined; - } - return { - enum: type.members.map(m => m.name) - }; -} -function schemaForMap(type, ctx) { - ctx = ctx.child('map', type.toString()); - if (!type.mapOfType) { - return undefined; - } - const s = schemaForTypeReference(type.mapOfType, ctx); - if (!s) { - return undefined; - } - return { - type: 'object', - additionalProperties: s - }; -} -function schemaForArray(type, ctx) { - ctx = ctx.child('array', type.toString()); - if (!type.arrayOfType) { - return undefined; - } - const s = schemaForTypeReference(type.arrayOfType, ctx); - if (!s) { - return undefined; - } - return { - type: 'array', - items: schemaForTypeReference(type.arrayOfType, ctx) - }; -} -function schemaForPrimitive(type) { - if (!type.primitive) { - return undefined; - } - switch (type.primitive) { - case 'date': return { type: 'string', format: 'date-time' }; - case 'json': return { type: 'object' }; - case 'any': return {}; // this means "any" - default: return { type: type.primitive }; - } -} -function schemaForUnion(type, ctx) { - ctx = ctx.child('union', type.toString()); - if (!type.unionOfTypes) { - return undefined; - } - const anyOf = type.unionOfTypes - .map(x => schemaForTypeReference(x, ctx)) - .filter(x => x); // filter failed schemas - if (anyOf.length === 0) { - return undefined; - } - return { anyOf }; -} -function schemaForConstructRef(type) { - if (!isConstruct(type)) { - return undefined; - } - return { - type: 'object', - properties: { - Ref: { type: 'string' } - } - }; -} -function schemaForInterface(type, ctx) { - if (!type || !(type instanceof jsiiReflect.InterfaceType)) { - return undefined; // skip - } - if (type.allMethods.length > 0) { - return undefined; - } - ctx = ctx.child('interface', type.fqn); - const ifctx = ctx; - return ctx.define(type.fqn, () => { - const properties = {}; - const required = new Array(); - for (const prop of type.allProperties) { - ctx = ifctx.child(prop.optional ? 'optional' : 'required' + ' property', prop.name); - const schema = schemaForTypeReference(prop.type, ctx); - if (!schema) { - // if prop is not serializable but optional, we can still serialize - // but without this property. - if (prop.optional) { - ctx.warning(`optional proprety omitted because it cannot be schematized`); - continue; - } - // error - ctx.error('property cannot be schematized'); - return undefined; - } - properties[prop.name] = schema; - const docstring = prop.docs.toString(); - if (docstring) { - properties[prop.name].description = docstring; - } - if (!prop.optional) { - required.push(prop.name); - } - } - return { - type: 'object', - title: type.name, - additionalProperties: false, - properties, - required: required.length > 0 ? required : undefined, - }; - }); -} -exports.schemaForInterface = schemaForInterface; -function schemaForEnumLikeClass(type, ctx) { - if (type) { - ctx = ctx.child('enum-like', type.toString()); - } - if (!type || !(type instanceof jsiiReflect.ClassType)) { - return undefined; - } - const enumLikeProps = enumLikeClassProperties(type); - const enumLikeMethods = enumLikeClassMethods(type); - if (enumLikeProps.length === 0 && enumLikeMethods.length === 0) { - return undefined; - } - const anyOf = new Array(); - if (enumLikeProps.length > 0) { - anyOf.push({ enum: enumLikeProps.map(m => m.name) }); - } - for (const method of enumLikeMethods) { - const s = methodSchema(method, ctx); - if (!s) { - continue; - } - anyOf.push({ - type: 'object', - additionalProperties: false, - properties: { - [method.name]: methodSchema(method, ctx) - } - }); - } - if (anyOf.length === 0) { - return undefined; - } - return ctx.define(type.fqn, () => { - return { anyOf }; - }); -} -function methodSchema(method, ctx) { - ctx = ctx.child('method', method.name); - const fqn = `${method.parentType.fqn}.${method.name}`; - const methodctx = ctx; - return ctx.define(fqn, () => { - const properties = {}; - const required = new Array(); - const addProperty = (prop) => { - const param = schemaForTypeReference(prop.type, ctx); - // bail out - can't serialize a required parameter, so we can't serialize the method - if (!param && !prop.optional) { - ctx.error(`cannot schematize method because parameter cannot be schematized`); - return undefined; - } - properties[prop.name] = param; - if (!prop.optional) { - required.push(prop.name); - } - }; - for (let i = 0; i < method.parameters.length; ++i) { - const p = method.parameters[i]; - methodctx.child('param', p.name); - // if this is the last parameter and it's a data type, treat as keyword arguments - if (i === method.parameters.length - 1 && isDataType(p.type.type)) { - const kwargs = schemaForInterface(p.type.type, ctx); - if (kwargs) { - for (const prop of p.type.type.allProperties) { - addProperty(prop); - } - } - } - else { - addProperty(p); - } - } - return { - type: 'object', - properties, - additionalProperties: false, - required: required.length > 0 ? required : undefined - }; - }); -} -function isDataType(t) { - if (!t) { - return false; - } - return t instanceof jsiiReflect.InterfaceType && t.spec.datatype; -} -exports.isDataType = isDataType; -// Must only have properties, all of which are scalars, -// lists or isSerializableInterface types. -function isSerializableTypeReference(type, errorPrefix) { - if (type.primitive) { - return true; - } - if (type.arrayOfType) { - return isSerializableTypeReference(type.arrayOfType, errorPrefix); - } - if (type.mapOfType) { - return isSerializableTypeReference(type.mapOfType, errorPrefix); - } - if (type.type) { - return isSerializableType(type.type, errorPrefix); - } - if (type.unionOfTypes) { - return type.unionOfTypes.some(x => isSerializableTypeReference(x, errorPrefix)); - } - return false; -} -exports.isSerializableTypeReference = isSerializableTypeReference; -function isSerializableType(type, errorPrefix) { - // if this is a cosntruct class, we can represent it as a "Ref" - if (isConstruct(type)) { - return true; - } - if (isEnum(type)) { - return true; - } - if (isSerializableInterface(type)) { - return true; - } - // if this is a class that looks like an enum, we can represent it - if (isEnumLikeClass(type)) { - return true; - } - if (allImplementationsOfType(type).length > 0) { - return true; - } - if (errorPrefix) { - console.error(errorPrefix, `${type} is not serializable`); - } - return false; -} -function isSerializableInterface(type, errorPrefix) { - if (!type || !(type instanceof jsiiReflect.InterfaceType)) { - return false; - } - if (type.allMethods.length > 0) { - return false; - } - return type.allProperties.every(p => isSerializableTypeReference(p.type, errorPrefix) - || isConstruct(p.type) - || p.optional); -} -exports.isSerializableInterface = isSerializableInterface; -function isEnum(type) { - return type instanceof jsiiReflect.EnumType; -} -function isEnumLikeClass(cls) { - if (!cls) { - return false; - } - if (!(cls instanceof jsiiReflect.ClassType)) { - return false; - } - return enumLikeClassMethods(cls).length > 0 - || enumLikeClassProperties(cls).length > 0; -} -exports.isEnumLikeClass = isEnumLikeClass; -function enumLikeClassMethods(cls) { - return cls.allMethods.filter(m => m.static && m.returns && m.returns.type.type && m.returns.type.type.extends(cls)); -} -exports.enumLikeClassMethods = enumLikeClassMethods; -function enumLikeClassProperties(cls) { - return cls.allProperties.filter(p => p.static && p.type.type && p.type.type.extends(cls)); -} -exports.enumLikeClassProperties = enumLikeClassProperties; -function isConstruct(typeOrTypeRef) { - let type; - if (typeOrTypeRef instanceof jsiiReflect.Type) { - type = typeOrTypeRef; - } - else { - if (typeOrTypeRef.arrayOfType) { - return isConstruct(typeOrTypeRef.arrayOfType); - } - if (typeOrTypeRef.mapOfType) { - return isConstruct(typeOrTypeRef.mapOfType); - } - if (typeOrTypeRef.unionOfTypes) { - return typeOrTypeRef.unionOfTypes.some(x => isConstruct(x)); - } - if (typeOrTypeRef.type) { - type = typeOrTypeRef.type; - } - else { - return false; - } - } - // if it is an interface, it should extend constructs.IConstruct - if (type instanceof jsiiReflect.InterfaceType) { - const constructIface = type.system.findFqn('constructs.IConstruct'); - return type.extends(constructIface); - } - // if it is a class, it should extend constructs.Construct - if (type instanceof jsiiReflect.ClassType) { - const constructClass = type.system.findFqn('constructs.Construct'); - return type.extends(constructClass); - } - return false; -} -exports.isConstruct = isConstruct; -function allImplementationsOfType(type) { - if (type instanceof jsiiReflect.ClassType) { - return allSubclasses(type).filter(x => !x.abstract); - } - if (type instanceof jsiiReflect.InterfaceType) { - return allImplementations(type).filter(x => !x.abstract); - } - throw new Error(`Must either be a class or an interface`); -} -function allSubclasses(base) { - return base.system.classes.filter(x => x.extends(base)); -} -function allImplementations(base) { - return base.system.classes.filter(x => x.getInterfaces(true).some(i => i.extends(base))); -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"jsii2schema.js","sourceRoot":"","sources":["jsii2schema.ts"],"names":[],"mappings":"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","sourcesContent":["import * as jsiiReflect from 'jsii-reflect';\nimport * as util from 'util';\n\n/* eslint-disable no-console */\n\nexport class SchemaContext {\n  public static root(definitions?: { [fqn: string]: any }): SchemaContext {\n    return new SchemaContext(undefined, undefined, definitions);\n  }\n\n  public readonly definitions: { [fqn: string]: any };\n  public readonly path: string;\n  public readonly children = new Array<SchemaContext>();\n  public readonly name: string;\n  public readonly root: boolean;\n  public readonly warnings = new Array<string>();\n  public readonly errors = new Array<string>();\n\n  private readonly definitionStack: string[];\n\n  private constructor(name?: string, parent?: SchemaContext, definitions?: { [fqn: string]: any }) {\n    this.name = name || '';\n    if (parent) {\n      this.root = false;\n      parent.children.push(this);\n      this.definitions = parent.definitions;\n      this.path = parent.path + '/' + this.name;\n      this.definitionStack = parent.definitionStack;\n    } else {\n      this.root = true;\n      this.definitions = definitions || { };\n      this.path = this.name || '';\n      this.definitionStack = new Array<string>();\n    }\n  }\n\n  public child(type: string, name: string): SchemaContext {\n    return new SchemaContext(`[${type} \"${name}\"]`, this);\n  }\n\n  public get hasWarningsOrErrors(): boolean {\n    return this.warnings.length > 0 || this.errors.length > 0 || this.children.some(child => child.hasWarningsOrErrors);\n  }\n\n  public warning(format: any, ...args: any[]) {\n    this.warnings.push(util.format(format, ...args));\n  }\n\n  public error(format: any, ...args: any[]) {\n    this.errors.push(util.format(format, ...args));\n  }\n\n  public findDefinition(ref: string) {\n    const [ , , id ] = ref.split('/');\n    return this.definitions[id];\n  }\n\n  public define(fqn: string, schema: () => any) {\n    const originalFqn = fqn;\n    fqn = fqn.replace('/', '.');\n\n    if (!(fqn in this.definitions)) {\n      if (this.definitionStack.includes(fqn)) {\n        this.error(`cyclic definition of ${fqn}`);\n        return undefined;\n      }\n\n      this.definitionStack.push(fqn);\n\n      try {\n        const s = schema();\n        if (!s) {\n          this.error('cannot schematize');\n          return undefined;\n        }\n\n        s.comment = originalFqn;\n\n        this.definitions[fqn] = s;\n      } finally {\n        this.definitionStack.pop();\n      }\n    }\n\n    return { $ref: `#/definitions/${fqn}` };\n  }\n}\n\nexport function schemaForTypeReference(type: jsiiReflect.TypeReference, ctx: SchemaContext): any {\n\n  const prim = schemaForPrimitive(type);\n  if (prim) {\n    return prim;\n  }\n\n  const arr = schemaForArray(type, ctx);\n  if (arr) {\n    return arr;\n  }\n\n  const map = schemaForMap(type, ctx);\n  if (map) {\n    return map;\n  }\n\n  const union = schemaForUnion(type, ctx);\n  if (union) {\n    return union;\n  }\n\n  const constructRef = schemaForConstructRef(type);\n  if (constructRef) {\n    return constructRef;\n  }\n\n  const iface = schemaForInterface(type.type, ctx);\n  if (iface) {\n    return iface;\n  }\n\n  const enm = schemaForEnum(type.type);\n  if (enm) {\n    return enm;\n  }\n\n  const enumLike = schemaForEnumLikeClass(type.type, ctx);\n  if (enumLike) {\n    return enumLike;\n  }\n\n  const cls = schemaForPolymorphic(type.type, ctx);\n  if (cls) {\n    return cls;\n  }\n\n  if (!ctx.hasWarningsOrErrors) {\n    ctx.error(`didn't match any schematizable shape`);\n  }\n\n  return undefined;\n}\n\nexport function schemaForPolymorphic(type: jsiiReflect.Type | undefined, ctx: SchemaContext) {\n  if (!type) {\n    return undefined;\n  }\n\n  ctx = ctx.child('polymorphic', type.fqn);\n\n  const anyOf = new Array<any>();\n\n  const parentctx = ctx;\n\n  for (const x of allImplementationsOfType(type)) {\n\n    ctx = parentctx.child('impl', x.fqn);\n\n    const enumLike = schemaForEnumLikeClass(x, ctx);\n    if (enumLike) {\n      anyOf.push(enumLike);\n    }\n\n    if (x.initializer) {\n      const methd = methodSchema(x.initializer, ctx);\n      if (methd) {\n        anyOf.push({\n          type: 'object',\n          additionalProperties: false,\n          properties: {\n            [x.fqn]: methd\n          }\n        });\n      }\n    }\n  }\n\n  if (anyOf.length === 0) {\n    return undefined;\n  }\n\n  return ctx.define(type.fqn, () => {\n    return { anyOf };\n  });\n}\n\nfunction schemaForEnum(type: jsiiReflect.Type | undefined) {\n  if (!type || !(type instanceof jsiiReflect.EnumType)) {\n    return undefined;\n  }\n\n  return {\n    enum: type.members.map(m => m.name)\n  };\n}\n\nfunction schemaForMap(type: jsiiReflect.TypeReference, ctx: SchemaContext) {\n  ctx = ctx.child('map', type.toString());\n\n  if (!type.mapOfType) {\n    return undefined;\n  }\n\n  const s = schemaForTypeReference(type.mapOfType, ctx);\n  if (!s) {\n    return undefined;\n  }\n\n  return {\n    type: 'object',\n    additionalProperties: s\n  };\n}\n\nfunction schemaForArray(type: jsiiReflect.TypeReference, ctx: SchemaContext) {\n  ctx = ctx.child('array', type.toString());\n\n  if (!type.arrayOfType) {\n    return undefined;\n  }\n\n  const s = schemaForTypeReference(type.arrayOfType, ctx);\n  if (!s) {\n    return undefined;\n  }\n\n  return {\n    type: 'array',\n    items: schemaForTypeReference(type.arrayOfType, ctx)\n  };\n}\n\nfunction schemaForPrimitive(type: jsiiReflect.TypeReference): any {\n  if (!type.primitive) {\n    return undefined;\n  }\n\n  switch (type.primitive) {\n    case 'date': return { type: 'string', format: 'date-time' };\n    case 'json': return { type: 'object' };\n    case 'any': return { }; // this means \"any\"\n    default: return { type: type.primitive };\n  }\n}\n\nfunction schemaForUnion(type: jsiiReflect.TypeReference, ctx: SchemaContext): any {\n  ctx = ctx.child('union', type.toString());\n\n  if (!type.unionOfTypes) {\n    return undefined;\n  }\n\n  const anyOf = type.unionOfTypes\n    .map(x => schemaForTypeReference(x, ctx))\n    .filter(x => x); // filter failed schemas\n\n  if (anyOf.length === 0) {\n    return undefined;\n  }\n\n  return { anyOf };\n}\n\nfunction schemaForConstructRef(type: jsiiReflect.TypeReference) {\n  if (!isConstruct(type)) {\n    return undefined;\n  }\n\n  return {\n    type: 'object',\n    properties: {\n      Ref: { type: 'string' }\n    }\n  };\n}\n\nexport function schemaForInterface(type: jsiiReflect.Type | undefined, ctx: SchemaContext) {\n  if (!type || !(type instanceof jsiiReflect.InterfaceType)) {\n    return undefined; // skip\n  }\n\n  if (type.allMethods.length > 0) {\n    return undefined;\n  }\n\n  ctx = ctx.child('interface', type.fqn);\n\n  const ifctx = ctx;\n\n  return ctx.define(type.fqn, () => {\n    const properties: any = {};\n    const required = new Array<string>();\n\n    for (const prop of type.allProperties) {\n\n      ctx = ifctx.child(prop.optional ? 'optional' : 'required' + ' property', prop.name);\n\n      const schema = schemaForTypeReference(prop.type, ctx);\n      if (!schema) {\n        // if prop is not serializable but optional, we can still serialize\n        // but without this property.\n        if (prop.optional) {\n          ctx.warning(`optional proprety omitted because it cannot be schematized`);\n          continue;\n        }\n\n        // error\n        ctx.error('property cannot be schematized');\n        return undefined;\n      }\n\n      properties[prop.name] = schema;\n\n      const docstring = prop.docs.toString();\n      if (docstring) {\n        properties[prop.name].description = docstring;\n      }\n\n      if (!prop.optional) {\n        required.push(prop.name);\n      }\n    }\n\n    return {\n      type: 'object',\n      title: type.name,\n      additionalProperties: false,\n      properties,\n      required: required.length > 0 ? required : undefined,\n    };\n  });\n}\n\nfunction schemaForEnumLikeClass(type: jsiiReflect.Type | undefined, ctx: SchemaContext) {\n  if (type) {\n    ctx = ctx.child('enum-like', type.toString());\n  }\n\n  if (!type || !(type instanceof jsiiReflect.ClassType)) {\n    return undefined;\n  }\n\n  const enumLikeProps = enumLikeClassProperties(type);\n  const enumLikeMethods = enumLikeClassMethods(type);\n\n  if (enumLikeProps.length === 0 && enumLikeMethods.length === 0) {\n    return undefined;\n  }\n\n  const anyOf = new Array<any>();\n\n  if (enumLikeProps.length > 0) {\n    anyOf.push({ enum: enumLikeProps.map(m => m.name) });\n  }\n\n  for (const method of enumLikeMethods) {\n    const s = methodSchema(method, ctx);\n    if (!s) {\n      continue;\n    }\n\n    anyOf.push({\n      type: 'object',\n      additionalProperties: false,\n      properties: {\n        [method.name]: methodSchema(method, ctx)\n      }\n    });\n  }\n\n  if (anyOf.length === 0) {\n    return undefined;\n  }\n\n  return ctx.define(type.fqn, () => {\n    return { anyOf };\n  });\n}\n\nfunction methodSchema(method: jsiiReflect.Callable, ctx: SchemaContext) {\n  ctx = ctx.child('method', method.name);\n\n  const fqn = `${method.parentType.fqn}.${method.name}`;\n\n  const methodctx = ctx;\n\n  return ctx.define(fqn, () => {\n    const properties: any = { };\n    const required = new Array<string>();\n\n    const addProperty = (prop: jsiiReflect.Property | jsiiReflect.Parameter): void => {\n      const param = schemaForTypeReference(prop.type, ctx);\n\n      // bail out - can't serialize a required parameter, so we can't serialize the method\n      if (!param && !prop.optional) {\n        ctx.error(`cannot schematize method because parameter cannot be schematized`);\n        return undefined;\n      }\n\n      properties[prop.name] = param;\n\n      if (!prop.optional) {\n        required.push(prop.name);\n      }\n    };\n\n    for (let i = 0; i < method.parameters.length; ++i) {\n      const p = method.parameters[i];\n      methodctx.child('param', p.name);\n\n      // if this is the last parameter and it's a data type, treat as keyword arguments\n      if (i === method.parameters.length - 1 && isDataType(p.type.type)) {\n        const kwargs = schemaForInterface(p.type.type, ctx);\n        if (kwargs) {\n          for (const prop of p.type.type.allProperties) {\n            addProperty(prop);\n          }\n        }\n      } else {\n        addProperty(p);\n      }\n    }\n\n    return {\n      type: 'object',\n      properties,\n      additionalProperties: false,\n      required: required.length > 0 ? required : undefined\n    };\n  });\n}\n\nexport function isDataType(t: jsiiReflect.Type | undefined): t is jsiiReflect.InterfaceType {\n  if (!t) {\n    return false;\n  }\n  return t instanceof jsiiReflect.InterfaceType && (t as any).spec.datatype;\n}\n\n// Must only have properties, all of which are scalars,\n// lists or isSerializableInterface types.\nexport function isSerializableTypeReference(type: jsiiReflect.TypeReference, errorPrefix?: string): boolean {\n\n  if (type.primitive) {\n    return true;\n  }\n\n  if (type.arrayOfType) {\n    return isSerializableTypeReference(type.arrayOfType, errorPrefix);\n  }\n\n  if (type.mapOfType) {\n    return isSerializableTypeReference(type.mapOfType, errorPrefix);\n  }\n\n  if (type.type) {\n    return isSerializableType(type.type, errorPrefix);\n  }\n\n  if (type.unionOfTypes) {\n    return type.unionOfTypes.some(x => isSerializableTypeReference(x, errorPrefix));\n  }\n\n  return false;\n}\n\nfunction isSerializableType(type: jsiiReflect.Type, errorPrefix?: string): boolean {\n  // if this is a cosntruct class, we can represent it as a \"Ref\"\n  if (isConstruct(type)) {\n    return true;\n  }\n\n  if (isEnum(type)) {\n    return true;\n  }\n\n  if (isSerializableInterface(type)) {\n    return true;\n  }\n\n  // if this is a class that looks like an enum, we can represent it\n  if (isEnumLikeClass(type)) {\n    return true;\n  }\n\n  if (allImplementationsOfType(type).length > 0) {\n    return true;\n  }\n\n  if (errorPrefix) {\n    console.error(errorPrefix, `${type} is not serializable`);\n  }\n\n  return false;\n}\n\nexport function isSerializableInterface(type: jsiiReflect.Type | undefined, errorPrefix?: string): type is jsiiReflect.InterfaceType {\n  if (!type || !(type instanceof jsiiReflect.InterfaceType)) {\n    return false;\n  }\n\n  if (type.allMethods.length > 0) {\n    return false;\n  }\n\n  return type.allProperties.every(p =>\n      isSerializableTypeReference(p.type, errorPrefix)\n      || isConstruct(p.type)\n      || p.optional);\n}\n\nfunction isEnum(type: jsiiReflect.Type): type is jsiiReflect.EnumType {\n  return type instanceof jsiiReflect.EnumType;\n}\n\nexport function isEnumLikeClass(cls: jsiiReflect.Type | undefined): cls is jsiiReflect.ClassType {\n  if (!cls) {\n    return false;\n  }\n\n  if (!(cls instanceof jsiiReflect.ClassType)) {\n    return false;\n  }\n  return enumLikeClassMethods(cls).length > 0\n    || enumLikeClassProperties(cls).length > 0;\n}\n\nexport function enumLikeClassMethods(cls: jsiiReflect.ClassType) {\n  return cls.allMethods.filter(m => m.static && m.returns && m.returns.type.type && m.returns.type.type.extends(cls));\n}\n\nexport function enumLikeClassProperties(cls: jsiiReflect.ClassType) {\n  return cls.allProperties.filter(p => p.static && p.type.type && p.type.type.extends(cls));\n}\n\nexport function isConstruct(typeOrTypeRef: jsiiReflect.TypeReference | jsiiReflect.Type): boolean {\n  let type: jsiiReflect.Type;\n\n  if (typeOrTypeRef instanceof jsiiReflect.Type) {\n    type = typeOrTypeRef;\n  } else {\n    if (typeOrTypeRef.arrayOfType) {\n      return isConstruct(typeOrTypeRef.arrayOfType);\n    }\n\n    if (typeOrTypeRef.mapOfType) {\n      return isConstruct(typeOrTypeRef.mapOfType);\n    }\n\n    if (typeOrTypeRef.unionOfTypes) {\n      return typeOrTypeRef.unionOfTypes.some(x => isConstruct(x));\n    }\n\n    if (typeOrTypeRef.type) {\n      type = typeOrTypeRef.type;\n    } else {\n      return false;\n    }\n  }\n\n  // if it is an interface, it should extend constructs.IConstruct\n  if (type instanceof jsiiReflect.InterfaceType) {\n    const constructIface = type.system.findFqn('constructs.IConstruct');\n    return type.extends(constructIface);\n  }\n\n  // if it is a class, it should extend constructs.Construct\n  if (type instanceof jsiiReflect.ClassType) {\n    const constructClass = type.system.findFqn('constructs.Construct');\n    return type.extends(constructClass);\n  }\n\n  return false;\n}\n\nfunction allImplementationsOfType(type: jsiiReflect.Type) {\n  if (type instanceof jsiiReflect.ClassType) {\n    return allSubclasses(type).filter(x => !x.abstract);\n  }\n\n  if (type instanceof jsiiReflect.InterfaceType) {\n    return allImplementations(type).filter(x => !x.abstract);\n  }\n\n  throw new Error(`Must either be a class or an interface`);\n}\n\nfunction allSubclasses(base: jsiiReflect.ClassType) {\n  return base.system.classes.filter(x => x.extends(base));\n}\n\nfunction allImplementations(base: jsiiReflect.InterfaceType) {\n  return base.system.classes.filter(x => x.getInterfaces(true).some(i => i.extends(base)));\n}\n"]} \ No newline at end of file diff --git a/packages/decdk/lib/util.d.ts b/packages/decdk/lib/util.d.ts deleted file mode 100644 index 8484e2c542931..0000000000000 --- a/packages/decdk/lib/util.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import * as jsiiReflect from 'jsii-reflect'; -/** - * Reads a YAML/JSON template file. - */ -export declare function readTemplate(templateFile: string): Promise; -export declare function loadTypeSystem(validate?: boolean): Promise; -export declare function stackNameFromFileName(fileName: string): string; diff --git a/packages/decdk/lib/util.js b/packages/decdk/lib/util.js deleted file mode 100644 index c1fd33d5f6352..0000000000000 --- a/packages/decdk/lib/util.js +++ /dev/null @@ -1,27 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.stackNameFromFileName = exports.loadTypeSystem = exports.readTemplate = void 0; -const fs = require("fs-extra"); -const jsiiReflect = require("jsii-reflect"); -const path = require("path"); -const YAML = require("yaml"); -/** - * Reads a YAML/JSON template file. - */ -async function readTemplate(templateFile) { - const str = await fs.readFile(templateFile, { encoding: 'utf-8' }); - const template = YAML.parse(str, { schema: 'yaml-1.1' }); - return template; -} -exports.readTemplate = readTemplate; -async function loadTypeSystem(validate = true) { - const typeSystem = new jsiiReflect.TypeSystem(); - await typeSystem.loadNpmDependencies(path.resolve(__dirname, '..'), { validate }); - return typeSystem; -} -exports.loadTypeSystem = loadTypeSystem; -function stackNameFromFileName(fileName) { - return path.parse(fileName).name.replace('.', '-'); -} -exports.stackNameFromFileName = stackNameFromFileName; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQStCO0FBQy9CLDRDQUE0QztBQUM1Qyw2QkFBNkI7QUFDN0IsNkJBQTZCO0FBRTdCOztHQUVHO0FBQ0ksS0FBSyxVQUFVLFlBQVksQ0FBQyxZQUFvQjtJQUNyRCxNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDbkUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUN6RCxPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDO0FBSkQsb0NBSUM7QUFFTSxLQUFLLFVBQVUsY0FBYyxDQUFDLFFBQVEsR0FBRyxJQUFJO0lBQ2xELE1BQU0sVUFBVSxHQUFHLElBQUksV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDO0lBQ2hELE1BQU0sVUFBVSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNsRixPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDO0FBSkQsd0NBSUM7QUFFRCxTQUFnQixxQkFBcUIsQ0FBQyxRQUFnQjtJQUNwRCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUZELHNEQUVDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMtZXh0cmEnO1xuaW1wb3J0ICogYXMganNpaVJlZmxlY3QgZnJvbSAnanNpaS1yZWZsZWN0JztcbmltcG9ydCAqIGFzIHBhdGggZnJvbSAncGF0aCc7XG5pbXBvcnQgKiBhcyBZQU1MIGZyb20gJ3lhbWwnO1xuXG4vKipcbiAqIFJlYWRzIGEgWUFNTC9KU09OIHRlbXBsYXRlIGZpbGUuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiByZWFkVGVtcGxhdGUodGVtcGxhdGVGaWxlOiBzdHJpbmcpIHtcbiAgY29uc3Qgc3RyID0gYXdhaXQgZnMucmVhZEZpbGUodGVtcGxhdGVGaWxlLCB7IGVuY29kaW5nOiAndXRmLTgnIH0pO1xuICBjb25zdCB0ZW1wbGF0ZSA9IFlBTUwucGFyc2Uoc3RyLCB7IHNjaGVtYTogJ3lhbWwtMS4xJyB9KTtcbiAgcmV0dXJuIHRlbXBsYXRlO1xufVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbG9hZFR5cGVTeXN0ZW0odmFsaWRhdGUgPSB0cnVlKSB7XG4gIGNvbnN0IHR5cGVTeXN0ZW0gPSBuZXcganNpaVJlZmxlY3QuVHlwZVN5c3RlbSgpO1xuICBhd2FpdCB0eXBlU3lzdGVtLmxvYWROcG1EZXBlbmRlbmNpZXMocGF0aC5yZXNvbHZlKF9fZGlybmFtZSwgJy4uJyksIHsgdmFsaWRhdGUgfSk7XG4gIHJldHVybiB0eXBlU3lzdGVtO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gc3RhY2tOYW1lRnJvbUZpbGVOYW1lKGZpbGVOYW1lOiBzdHJpbmcpIHtcbiAgcmV0dXJuIHBhdGgucGFyc2UoZmlsZU5hbWUpLm5hbWUucmVwbGFjZSgnLicsICctJyk7XG59XG4iXX0= \ No newline at end of file diff --git a/packages/decdk/test/fixture/index.d.ts b/packages/decdk/test/fixture/index.d.ts deleted file mode 100644 index 570a4a324f0fd..0000000000000 --- a/packages/decdk/test/fixture/index.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Tests how an array with a bunch of primitives is represented in JSON schema. - */ -export interface InterfaceWithPrimitives { - /** - * A property of type number. - */ - readonly numberProperty: number; - /** - * A property of type string. - */ - readonly stringProperty: string; - /** - * Array of strings. - */ - readonly arrayOfStrings: string[]; - /** - * Optional boolean - */ - readonly optionalBoolean?: boolean; - readonly mapOfNumbers: { - [key: string]: number; - }; -} -export declare enum MyNormalEnum { - ENUM_MEMBER_1 = 0, - ENUM_MEMBER_2 = 1, - ENUM_MEMBER_3 = 2 -} diff --git a/packages/decdk/test/fixture/index.js b/packages/decdk/test/fixture/index.js deleted file mode 100644 index 135dab999f808..0000000000000 --- a/packages/decdk/test/fixture/index.js +++ /dev/null @@ -1,10 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.MyNormalEnum = void 0; -var MyNormalEnum; -(function (MyNormalEnum) { - MyNormalEnum[MyNormalEnum["ENUM_MEMBER_1"] = 0] = "ENUM_MEMBER_1"; - MyNormalEnum[MyNormalEnum["ENUM_MEMBER_2"] = 1] = "ENUM_MEMBER_2"; - MyNormalEnum[MyNormalEnum["ENUM_MEMBER_3"] = 2] = "ENUM_MEMBER_3"; -})(MyNormalEnum = exports.MyNormalEnum || (exports.MyNormalEnum = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUE4QkEsSUFBWSxZQUlYO0FBSkQsV0FBWSxZQUFZO0lBQ3RCLGlFQUFhLENBQUE7SUFDYixpRUFBYSxDQUFBO0lBQ2IsaUVBQWEsQ0FBQTtBQUNmLENBQUMsRUFKVyxZQUFZLEdBQVosb0JBQVksS0FBWixvQkFBWSxRQUl2QiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogVGVzdHMgaG93IGFuIGFycmF5IHdpdGggYSBidW5jaCBvZiBwcmltaXRpdmVzIGlzIHJlcHJlc2VudGVkIGluIEpTT04gc2NoZW1hLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEludGVyZmFjZVdpdGhQcmltaXRpdmVzIHtcbiAgLyoqXG4gICAqIEEgcHJvcGVydHkgb2YgdHlwZSBudW1iZXIuXG4gICAqL1xuICByZWFkb25seSBudW1iZXJQcm9wZXJ0eTogbnVtYmVyO1xuXG4gIC8qKlxuICAgKiBBIHByb3BlcnR5IG9mIHR5cGUgc3RyaW5nLlxuICAgKi9cbiAgcmVhZG9ubHkgc3RyaW5nUHJvcGVydHk6IHN0cmluZztcblxuICAvKipcbiAgICogQXJyYXkgb2Ygc3RyaW5ncy5cbiAgICovXG4gIHJlYWRvbmx5IGFycmF5T2ZTdHJpbmdzOiBzdHJpbmdbXTtcblxuICAvKipcbiAgICogT3B0aW9uYWwgYm9vbGVhblxuICAgKi9cbiAgcmVhZG9ubHkgb3B0aW9uYWxCb29sZWFuPzogYm9vbGVhbjtcblxuICAvL1xuICAvLyBpbnRlbnRpb25hbGx5IGxlZnQgYmxhbmsgKHRvIGNoZWNrIHRoYXQgZGVzY3JpcHRpb24gaXMgb21pdHRlZClcbiAgLy9cbiAgcmVhZG9ubHkgbWFwT2ZOdW1iZXJzOiB7IFtrZXk6IHN0cmluZ106IG51bWJlciB9XG59XG5cbmV4cG9ydCBlbnVtIE15Tm9ybWFsRW51bSB7XG4gIEVOVU1fTUVNQkVSXzEsXG4gIEVOVU1fTUVNQkVSXzIsXG4gIEVOVU1fTUVNQkVSXzNcbn1cbiJdfQ== \ No newline at end of file diff --git a/packages/decdk/test/sanity.test.d.ts b/packages/decdk/test/sanity.test.d.ts deleted file mode 100644 index cb0ff5c3b541f..0000000000000 --- a/packages/decdk/test/sanity.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/packages/decdk/test/sanity.test.js b/packages/decdk/test/sanity.test.js deleted file mode 100644 index 1665a9ab56e28..0000000000000 --- a/packages/decdk/test/sanity.test.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const path = require("path"); -test('path.resolve is sane', async () => { - // Reasons why this might not be true: - // graceful-fs, which is used by Jest, hooks into process.cwd() and - // process.chdir() and caches the values. Because... profit? - const targetDir = path.join(__dirname, 'fixture'); - const cwd = process.cwd(); - try { - process.chdir(targetDir); - expect(process.cwd()).toEqual(targetDir); - const resolved = path.resolve('.'); - expect(resolved).toEqual(targetDir); - } - finally { - process.chdir(cwd); - } -}); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2FuaXR5LnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzYW5pdHkudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZCQUE2QjtBQUU3QixJQUFJLENBQUMsc0JBQXNCLEVBQUUsS0FBSyxJQUFJLEVBQUU7SUFDdEMsc0NBQXNDO0lBQ3RDLG1FQUFtRTtJQUNuRSw0REFBNEQ7SUFFNUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFFbEQsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBRTFCLElBQUk7UUFDRixPQUFPLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3pCLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7UUFFekMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0tBRXJDO1lBQVM7UUFDUixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0tBQ3BCO0FBQ0gsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuXG50ZXN0KCdwYXRoLnJlc29sdmUgaXMgc2FuZScsIGFzeW5jICgpID0+IHtcbiAgLy8gUmVhc29ucyB3aHkgdGhpcyBtaWdodCBub3QgYmUgdHJ1ZTpcbiAgLy8gZ3JhY2VmdWwtZnMsIHdoaWNoIGlzIHVzZWQgYnkgSmVzdCwgaG9va3MgaW50byBwcm9jZXNzLmN3ZCgpIGFuZFxuICAvLyBwcm9jZXNzLmNoZGlyKCkgYW5kIGNhY2hlcyB0aGUgdmFsdWVzLiBCZWNhdXNlLi4uIHByb2ZpdD9cblxuICBjb25zdCB0YXJnZXREaXIgPSBwYXRoLmpvaW4oX19kaXJuYW1lLCAnZml4dHVyZScpO1xuXG4gIGNvbnN0IGN3ZCA9IHByb2Nlc3MuY3dkKCk7XG5cbiAgdHJ5IHtcbiAgICBwcm9jZXNzLmNoZGlyKHRhcmdldERpcik7XG4gICAgZXhwZWN0KHByb2Nlc3MuY3dkKCkpLnRvRXF1YWwodGFyZ2V0RGlyKTtcblxuICAgIGNvbnN0IHJlc29sdmVkID0gcGF0aC5yZXNvbHZlKCcuJyk7XG4gICAgZXhwZWN0KHJlc29sdmVkKS50b0VxdWFsKHRhcmdldERpcik7XG5cbiAgfSBmaW5hbGx5IHtcbiAgICBwcm9jZXNzLmNoZGlyKGN3ZCk7XG4gIH1cbn0pOyJdfQ== \ No newline at end of file diff --git a/packages/decdk/test/schema.test.d.ts b/packages/decdk/test/schema.test.d.ts deleted file mode 100644 index cb0ff5c3b541f..0000000000000 --- a/packages/decdk/test/schema.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/packages/decdk/test/schema.test.js b/packages/decdk/test/schema.test.js deleted file mode 100644 index e1b8884655b06..0000000000000 --- a/packages/decdk/test/schema.test.js +++ /dev/null @@ -1,84 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const child_process_1 = require("child_process"); -const reflect = require("jsii-reflect"); -const path = require("path"); -const jsii2schema_1 = require("../lib/jsii2schema"); -const fixturedir = path.join(__dirname, 'fixture'); -/* eslint-disable no-console */ -// building the decdk schema often does not complete in the default 5 second Jest timeout -jest.setTimeout(60000); -let typesys; -beforeAll(async () => { - typesys = new reflect.TypeSystem(); - // jsii-compile the fixtures module - await spawn(require.resolve('jsii/bin/jsii'), { cwd: fixturedir, }); - // load the resulting file system - await typesys.loadFile(path.join(fixturedir, '.jsii')); - await typesys.load(path.dirname(require.resolve('@aws-cdk/core/.jsii'))); -}); -test('schemaForInterface: interface with primitives', async () => { - // GIVEN - const defs = {}; - const ctx = jsii2schema_1.SchemaContext.root(defs); - // WHEN - const ref = jsii2schema_1.schemaForInterface(typesys.findFqn('fixture.InterfaceWithPrimitives'), ctx); - // THEN - expect(ref).toStrictEqual({ $ref: '#/definitions/fixture.InterfaceWithPrimitives' }); - expect(ctx.definitions).toStrictEqual({ - 'fixture.InterfaceWithPrimitives': { - type: 'object', - title: 'InterfaceWithPrimitives', - additionalProperties: false, - properties: { - arrayOfStrings: { - type: 'array', - items: { type: 'string' }, - description: 'Array of strings.' - }, - mapOfNumbers: { - type: 'object', - additionalProperties: { type: 'number' } - }, - numberProperty: { - type: 'number', - description: 'A property of type number.' - }, - stringProperty: { - type: 'string', - description: 'A property of type string.' - }, - optionalBoolean: { - type: 'boolean', - description: 'Optional boolean.' - } - }, - required: [ - 'arrayOfStrings', - 'mapOfNumbers', - 'numberProperty', - 'stringProperty' - ], - comment: 'fixture.InterfaceWithPrimitives' - } - }); -}); -/** - * Version of spawn() that returns a promise - * - * Need spawn() so that we can set stdio to inherit so that any jsii errors - * are propagated outwards. - */ -function spawn(command, options) { - return new Promise((resolve, reject) => { - const cp = child_process_1.spawn(command, [], { stdio: 'inherit', ...options }); - cp.on('error', reject); - cp.on('exit', (code, signal) => { - if (code === 0) { - resolve(); - } - reject(new Error(`Subprocess exited with ${code || signal}`)); - }); - }); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzY2hlbWEudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlEQUFrRTtBQUNsRSx3Q0FBd0M7QUFDeEMsNkJBQTZCO0FBQzdCLG9EQUF1RTtBQUV2RSxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQztBQUVuRCwrQkFBK0I7QUFFL0IseUZBQXlGO0FBQ3pGLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBTSxDQUFDLENBQUM7QUFFeEIsSUFBSSxPQUEyQixDQUFDO0FBRWhDLFNBQVMsQ0FBQyxLQUFLLElBQUksRUFBRTtJQUNuQixPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7SUFFbkMsbUNBQW1DO0lBQ25DLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxHQUFJLENBQUMsQ0FBQztJQUVyRSxpQ0FBaUM7SUFDakMsTUFBTSxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDdkQsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMzRSxDQUFDLENBQUMsQ0FBQztBQUVILElBQUksQ0FBQywrQ0FBK0MsRUFBRSxLQUFLLElBQUksRUFBRTtJQUMvRCxRQUFRO0lBQ1IsTUFBTSxJQUFJLEdBQUcsRUFBRyxDQUFDO0lBQ2pCLE1BQU0sR0FBRyxHQUFHLDJCQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXJDLE9BQU87SUFDUCxNQUFNLEdBQUcsR0FBRyxnQ0FBa0IsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLGlDQUFpQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFeEYsT0FBTztJQUNQLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxhQUFhLENBQUMsRUFBRSxJQUFJLEVBQUUsK0NBQStDLEVBQUUsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsYUFBYSxDQUFDO1FBQ3BDLGlDQUFpQyxFQUFFO1lBQ2pDLElBQUksRUFBRSxRQUFRO1lBQ2QsS0FBSyxFQUFFLHlCQUF5QjtZQUNoQyxvQkFBb0IsRUFBRSxLQUFLO1lBQzNCLFVBQVUsRUFBRTtnQkFDVixjQUFjLEVBQUU7b0JBQ2QsSUFBSSxFQUFFLE9BQU87b0JBQ2IsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtvQkFDekIsV0FBVyxFQUFFLG1CQUFtQjtpQkFDakM7Z0JBQ0QsWUFBWSxFQUFFO29CQUNaLElBQUksRUFBRSxRQUFRO29CQUNkLG9CQUFvQixFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtpQkFDekM7Z0JBQ0QsY0FBYyxFQUFFO29CQUNkLElBQUksRUFBRSxRQUFRO29CQUNkLFdBQVcsRUFBRSw0QkFBNEI7aUJBQzFDO2dCQUNELGNBQWMsRUFBRTtvQkFDZCxJQUFJLEVBQUUsUUFBUTtvQkFDZCxXQUFXLEVBQUUsNEJBQTRCO2lCQUMxQztnQkFDRCxlQUFlLEVBQUU7b0JBQ2YsSUFBSSxFQUFFLFNBQVM7b0JBQ2YsV0FBVyxFQUFFLG1CQUFtQjtpQkFDakM7YUFDRjtZQUNELFFBQVEsRUFBRTtnQkFDUixnQkFBZ0I7Z0JBQ2hCLGNBQWM7Z0JBQ2QsZ0JBQWdCO2dCQUNoQixnQkFBZ0I7YUFDakI7WUFDRCxPQUFPLEVBQUUsaUNBQWlDO1NBQzNDO0tBQ0YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUM7QUFFSDs7Ozs7R0FLRztBQUNILFNBQVMsS0FBSyxDQUFDLE9BQWUsRUFBRSxPQUFpQztJQUMvRCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ3JDLE1BQU0sRUFBRSxHQUFHLHFCQUFVLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsR0FBRyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBRXJFLEVBQUUsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZCLEVBQUUsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQzdCLElBQUksSUFBSSxLQUFLLENBQUMsRUFBRTtnQkFBRSxPQUFPLEVBQUUsQ0FBQzthQUFFO1lBQzlCLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQywwQkFBMEIsSUFBSSxJQUFJLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNoRSxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHNwYXduIGFzIHNwYXduQXN5bmMsIFNwYXduT3B0aW9ucyB9IGZyb20gJ2NoaWxkX3Byb2Nlc3MnO1xuaW1wb3J0ICogYXMgcmVmbGVjdCBmcm9tICdqc2lpLXJlZmxlY3QnO1xuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCB7IFNjaGVtYUNvbnRleHQsIHNjaGVtYUZvckludGVyZmFjZSB9IGZyb20gJy4uL2xpYi9qc2lpMnNjaGVtYSc7XG5cbmNvbnN0IGZpeHR1cmVkaXIgPSBwYXRoLmpvaW4oX19kaXJuYW1lLCAnZml4dHVyZScpO1xuXG4vKiBlc2xpbnQtZGlzYWJsZSBuby1jb25zb2xlICovXG5cbi8vIGJ1aWxkaW5nIHRoZSBkZWNkayBzY2hlbWEgb2Z0ZW4gZG9lcyBub3QgY29tcGxldGUgaW4gdGhlIGRlZmF1bHQgNSBzZWNvbmQgSmVzdCB0aW1lb3V0XG5qZXN0LnNldFRpbWVvdXQoNjBfMDAwKTtcblxubGV0IHR5cGVzeXM6IHJlZmxlY3QuVHlwZVN5c3RlbTtcblxuYmVmb3JlQWxsKGFzeW5jICgpID0+IHtcbiAgdHlwZXN5cyA9IG5ldyByZWZsZWN0LlR5cGVTeXN0ZW0oKTtcblxuICAvLyBqc2lpLWNvbXBpbGUgdGhlIGZpeHR1cmVzIG1vZHVsZVxuICBhd2FpdCBzcGF3bihyZXF1aXJlLnJlc29sdmUoJ2pzaWkvYmluL2pzaWknKSwgeyBjd2Q6IGZpeHR1cmVkaXIsICB9KTtcblxuICAvLyBsb2FkIHRoZSByZXN1bHRpbmcgZmlsZSBzeXN0ZW1cbiAgYXdhaXQgdHlwZXN5cy5sb2FkRmlsZShwYXRoLmpvaW4oZml4dHVyZWRpciwgJy5qc2lpJykpO1xuICBhd2FpdCB0eXBlc3lzLmxvYWQocGF0aC5kaXJuYW1lKHJlcXVpcmUucmVzb2x2ZSgnQGF3cy1jZGsvY29yZS8uanNpaScpKSk7XG59KTtcblxudGVzdCgnc2NoZW1hRm9ySW50ZXJmYWNlOiBpbnRlcmZhY2Ugd2l0aCBwcmltaXRpdmVzJywgYXN5bmMgKCkgPT4ge1xuICAvLyBHSVZFTlxuICBjb25zdCBkZWZzID0geyB9O1xuICBjb25zdCBjdHggPSBTY2hlbWFDb250ZXh0LnJvb3QoZGVmcyk7XG5cbiAgLy8gV0hFTlxuICBjb25zdCByZWYgPSBzY2hlbWFGb3JJbnRlcmZhY2UodHlwZXN5cy5maW5kRnFuKCdmaXh0dXJlLkludGVyZmFjZVdpdGhQcmltaXRpdmVzJyksIGN0eCk7XG5cbiAgLy8gVEhFTlxuICBleHBlY3QocmVmKS50b1N0cmljdEVxdWFsKHsgJHJlZjogJyMvZGVmaW5pdGlvbnMvZml4dHVyZS5JbnRlcmZhY2VXaXRoUHJpbWl0aXZlcycgfSk7XG4gIGV4cGVjdChjdHguZGVmaW5pdGlvbnMpLnRvU3RyaWN0RXF1YWwoe1xuICAgICdmaXh0dXJlLkludGVyZmFjZVdpdGhQcmltaXRpdmVzJzoge1xuICAgICAgdHlwZTogJ29iamVjdCcsXG4gICAgICB0aXRsZTogJ0ludGVyZmFjZVdpdGhQcmltaXRpdmVzJyxcbiAgICAgIGFkZGl0aW9uYWxQcm9wZXJ0aWVzOiBmYWxzZSxcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgYXJyYXlPZlN0cmluZ3M6IHtcbiAgICAgICAgICB0eXBlOiAnYXJyYXknLFxuICAgICAgICAgIGl0ZW1zOiB7IHR5cGU6ICdzdHJpbmcnIH0sXG4gICAgICAgICAgZGVzY3JpcHRpb246ICdBcnJheSBvZiBzdHJpbmdzLidcbiAgICAgICAgfSxcbiAgICAgICAgbWFwT2ZOdW1iZXJzOiB7XG4gICAgICAgICAgdHlwZTogJ29iamVjdCcsXG4gICAgICAgICAgYWRkaXRpb25hbFByb3BlcnRpZXM6IHsgdHlwZTogJ251bWJlcicgfVxuICAgICAgICB9LFxuICAgICAgICBudW1iZXJQcm9wZXJ0eToge1xuICAgICAgICAgIHR5cGU6ICdudW1iZXInLFxuICAgICAgICAgIGRlc2NyaXB0aW9uOiAnQSBwcm9wZXJ0eSBvZiB0eXBlIG51bWJlci4nXG4gICAgICAgIH0sXG4gICAgICAgIHN0cmluZ1Byb3BlcnR5OiB7XG4gICAgICAgICAgdHlwZTogJ3N0cmluZycsXG4gICAgICAgICAgZGVzY3JpcHRpb246ICdBIHByb3BlcnR5IG9mIHR5cGUgc3RyaW5nLidcbiAgICAgICAgfSxcbiAgICAgICAgb3B0aW9uYWxCb29sZWFuOiB7XG4gICAgICAgICAgdHlwZTogJ2Jvb2xlYW4nLFxuICAgICAgICAgIGRlc2NyaXB0aW9uOiAnT3B0aW9uYWwgYm9vbGVhbi4nXG4gICAgICAgIH1cbiAgICAgIH0sXG4gICAgICByZXF1aXJlZDogW1xuICAgICAgICAnYXJyYXlPZlN0cmluZ3MnLFxuICAgICAgICAnbWFwT2ZOdW1iZXJzJyxcbiAgICAgICAgJ251bWJlclByb3BlcnR5JyxcbiAgICAgICAgJ3N0cmluZ1Byb3BlcnR5J1xuICAgICAgXSxcbiAgICAgIGNvbW1lbnQ6ICdmaXh0dXJlLkludGVyZmFjZVdpdGhQcmltaXRpdmVzJ1xuICAgIH1cbiAgfSk7XG59KTtcblxuLyoqXG4gKiBWZXJzaW9uIG9mIHNwYXduKCkgdGhhdCByZXR1cm5zIGEgcHJvbWlzZVxuICpcbiAqIE5lZWQgc3Bhd24oKSBzbyB0aGF0IHdlIGNhbiBzZXQgc3RkaW8gdG8gaW5oZXJpdCBzbyB0aGF0IGFueSBqc2lpIGVycm9yc1xuICogYXJlIHByb3BhZ2F0ZWQgb3V0d2FyZHMuXG4gKi9cbmZ1bmN0aW9uIHNwYXduKGNvbW1hbmQ6IHN0cmluZywgb3B0aW9uczogU3Bhd25PcHRpb25zIHwgdW5kZWZpbmVkKSB7XG4gIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7XG4gICAgY29uc3QgY3AgPSBzcGF3bkFzeW5jKGNvbW1hbmQsIFtdLCB7IHN0ZGlvOiAnaW5oZXJpdCcsIC4uLm9wdGlvbnMgfSk7XG5cbiAgICBjcC5vbignZXJyb3InLCByZWplY3QpO1xuICAgIGNwLm9uKCdleGl0JywgKGNvZGUsIHNpZ25hbCkgPT4ge1xuICAgICAgaWYgKGNvZGUgPT09IDApIHsgcmVzb2x2ZSgpOyB9XG4gICAgICByZWplY3QobmV3IEVycm9yKGBTdWJwcm9jZXNzIGV4aXRlZCB3aXRoICR7Y29kZSB8fCBzaWduYWx9YCkpO1xuICAgIH0pO1xuICB9KTtcbn1cbiJdfQ== \ No newline at end of file diff --git a/packages/decdk/test/synth.test.d.ts b/packages/decdk/test/synth.test.d.ts deleted file mode 100644 index cb0ff5c3b541f..0000000000000 --- a/packages/decdk/test/synth.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/packages/decdk/test/synth.test.js b/packages/decdk/test/synth.test.js deleted file mode 100644 index ff0be889b76eb..0000000000000 --- a/packages/decdk/test/synth.test.js +++ /dev/null @@ -1,45 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const cdk = require("@aws-cdk/core"); -const fs = require("fs"); -const path = require("path"); -const cx_api_1 = require("@aws-cdk/cx-api"); -const lib_1 = require("../lib"); -const VALIDATE_ASSEMBLIES = true; -const dir = path.join(__dirname, '..', 'examples'); -if (VALIDATE_ASSEMBLIES) { - // With validation loading all assemblies takes 10s on my machine. - // Without validation it's 600ms. - // - // Add a big margin for slower machines in case validation is enabled. - jest.setTimeout(60 * 1000); -} -let _cachedTS; -async function obtainTypeSystem() { - // Load the typesystem only once, it's quite expensive - if (!_cachedTS) { - _cachedTS = await lib_1.loadTypeSystem(VALIDATE_ASSEMBLIES); - } - return _cachedTS; -} -for (const templateFile of fs.readdirSync(dir)) { - test(templateFile, async () => { - const workingDirectory = dir; - const template = await lib_1.readTemplate(path.resolve(dir, templateFile)); - const typeSystem = await obtainTypeSystem(); - const app = new cdk.App({ - context: { - ...cx_api_1.FUTURE_FLAGS, - } - }); - const stackName = lib_1.stackNameFromFileName(templateFile); - new lib_1.DeclarativeStack(app, stackName, { - workingDirectory, - template, - typeSystem - }); - const output = app.synth().getStackByName(stackName); - expect(output.template).toMatchSnapshot(stackName); - }); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ludGgudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInN5bnRoLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxxQ0FBcUM7QUFDckMseUJBQXlCO0FBRXpCLDZCQUE2QjtBQUM3Qiw0Q0FBK0M7QUFDL0MsZ0NBQStGO0FBRS9GLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxDQUFDO0FBRWpDLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztBQUVuRCxJQUFJLG1CQUFtQixFQUFFO0lBQ3ZCLGtFQUFrRTtJQUNsRSxpQ0FBaUM7SUFDakMsRUFBRTtJQUNGLHNFQUFzRTtJQUN0RSxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztDQUM1QjtBQUVELElBQUksU0FBNkIsQ0FBQztBQUNsQyxLQUFLLFVBQVUsZ0JBQWdCO0lBQzdCLHNEQUFzRDtJQUN0RCxJQUFJLENBQUMsU0FBUyxFQUFFO1FBQ2QsU0FBUyxHQUFHLE1BQU0sb0JBQWMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0tBQ3ZEO0lBQ0QsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQztBQUVELEtBQUssTUFBTSxZQUFZLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsRUFBRTtJQUM5QyxJQUFJLENBQUMsWUFBWSxFQUFFLEtBQUssSUFBSSxFQUFFO1FBQzVCLE1BQU0sZ0JBQWdCLEdBQUcsR0FBRyxDQUFDO1FBQzdCLE1BQU0sUUFBUSxHQUFHLE1BQU0sa0JBQVksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ3JFLE1BQU0sVUFBVSxHQUFHLE1BQU0sZ0JBQWdCLEVBQUUsQ0FBQztRQUU1QyxNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUM7WUFDdEIsT0FBTyxFQUFFO2dCQUNQLEdBQUcscUJBQVk7YUFDaEI7U0FDRixDQUFDLENBQUM7UUFDSCxNQUFNLFNBQVMsR0FBRywyQkFBcUIsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUV0RCxJQUFJLHNCQUFnQixDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUU7WUFDbkMsZ0JBQWdCO1lBQ2hCLFFBQVE7WUFDUixVQUFVO1NBQ1gsQ0FBQyxDQUFDO1FBRUgsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNyRCxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNyRCxDQUFDLENBQUMsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgY2RrIGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMnO1xuaW1wb3J0ICogYXMgcmVmbGVjdCBmcm9tICdqc2lpLXJlZmxlY3QnO1xuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCB7IEZVVFVSRV9GTEFHUyB9IGZyb20gJ0Bhd3MtY2RrL2N4LWFwaSc7XG5pbXBvcnQgeyBEZWNsYXJhdGl2ZVN0YWNrLCBsb2FkVHlwZVN5c3RlbSwgcmVhZFRlbXBsYXRlLCBzdGFja05hbWVGcm9tRmlsZU5hbWUgfSBmcm9tICcuLi9saWInO1xuXG5jb25zdCBWQUxJREFURV9BU1NFTUJMSUVTID0gdHJ1ZTtcblxuY29uc3QgZGlyID0gcGF0aC5qb2luKF9fZGlybmFtZSwgJy4uJywgJ2V4YW1wbGVzJyk7XG5cbmlmIChWQUxJREFURV9BU1NFTUJMSUVTKSB7XG4gIC8vIFdpdGggdmFsaWRhdGlvbiBsb2FkaW5nIGFsbCBhc3NlbWJsaWVzIHRha2VzIDEwcyBvbiBteSBtYWNoaW5lLlxuICAvLyBXaXRob3V0IHZhbGlkYXRpb24gaXQncyA2MDBtcy5cbiAgLy9cbiAgLy8gQWRkIGEgYmlnIG1hcmdpbiBmb3Igc2xvd2VyIG1hY2hpbmVzIGluIGNhc2UgdmFsaWRhdGlvbiBpcyBlbmFibGVkLlxuICBqZXN0LnNldFRpbWVvdXQoNjAgKiAxMDAwKTtcbn1cblxubGV0IF9jYWNoZWRUUzogcmVmbGVjdC5UeXBlU3lzdGVtO1xuYXN5bmMgZnVuY3Rpb24gb2J0YWluVHlwZVN5c3RlbSgpIHtcbiAgLy8gTG9hZCB0aGUgdHlwZXN5c3RlbSBvbmx5IG9uY2UsIGl0J3MgcXVpdGUgZXhwZW5zaXZlXG4gIGlmICghX2NhY2hlZFRTKSB7XG4gICAgX2NhY2hlZFRTID0gYXdhaXQgbG9hZFR5cGVTeXN0ZW0oVkFMSURBVEVfQVNTRU1CTElFUyk7XG4gIH1cbiAgcmV0dXJuIF9jYWNoZWRUUztcbn1cblxuZm9yIChjb25zdCB0ZW1wbGF0ZUZpbGUgb2YgZnMucmVhZGRpclN5bmMoZGlyKSkge1xuICB0ZXN0KHRlbXBsYXRlRmlsZSwgYXN5bmMgKCkgPT4ge1xuICAgIGNvbnN0IHdvcmtpbmdEaXJlY3RvcnkgPSBkaXI7XG4gICAgY29uc3QgdGVtcGxhdGUgPSBhd2FpdCByZWFkVGVtcGxhdGUocGF0aC5yZXNvbHZlKGRpciwgdGVtcGxhdGVGaWxlKSk7XG4gICAgY29uc3QgdHlwZVN5c3RlbSA9IGF3YWl0IG9idGFpblR5cGVTeXN0ZW0oKTtcblxuICAgIGNvbnN0IGFwcCA9IG5ldyBjZGsuQXBwKHtcbiAgICAgIGNvbnRleHQ6IHtcbiAgICAgICAgLi4uRlVUVVJFX0ZMQUdTLFxuICAgICAgfVxuICAgIH0pO1xuICAgIGNvbnN0IHN0YWNrTmFtZSA9IHN0YWNrTmFtZUZyb21GaWxlTmFtZSh0ZW1wbGF0ZUZpbGUpO1xuXG4gICAgbmV3IERlY2xhcmF0aXZlU3RhY2soYXBwLCBzdGFja05hbWUsIHtcbiAgICAgIHdvcmtpbmdEaXJlY3RvcnksXG4gICAgICB0ZW1wbGF0ZSxcbiAgICAgIHR5cGVTeXN0ZW1cbiAgICB9KTtcblxuICAgIGNvbnN0IG91dHB1dCA9IGFwcC5zeW50aCgpLmdldFN0YWNrQnlOYW1lKHN0YWNrTmFtZSk7XG4gICAgZXhwZWN0KG91dHB1dC50ZW1wbGF0ZSkudG9NYXRjaFNuYXBzaG90KHN0YWNrTmFtZSk7XG4gIH0pO1xufVxuIl19 \ No newline at end of file