@aws-solutions-constructs/aws-cloudfront-s3 2.86.0 → 2.87.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +83 -5
- package/lib/index.js +1 -1
- package/package.json +8 -8
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.assets.json +7 -7
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.template.json +6 -145
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3bucketencryptedwithcmkprovidedasexistingbucketIntegDefaultTestDeployAssertF6031114.assets.json +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/manifest.json +474 -9
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.assets.json +5 -5
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.template.json +1 -136
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3bucketencryptedwithmanagedkeyprovidedasexistingbucketIntegDefaultTestDeployAssert03A82C16.assets.json +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js +2 -1
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3-cmk-provided-as-bucket-prop.assets.json +7 -7
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3-cmk-provided-as-bucket-prop.template.json +6 -145
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3cmkprovidedasbucketpropIntegDefaultTestDeployAssert38E63D55.assets.json +2 -2
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/manifest.json +474 -9
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-custom-headers.js +2 -1
- package/test/integ.cfts3-custom-headers.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-custom-headers.js.snapshot/cfts3-custom-headers.assets.json +5 -5
- package/test/integ.cfts3-custom-headers.js.snapshot/cfts3-custom-headers.template.json +1 -136
- package/test/integ.cfts3-custom-headers.js.snapshot/cfts3customheadersIntegDefaultTestDeployAssert6EEC9973.assets.json +2 -2
- package/test/integ.cfts3-custom-headers.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-custom-headers.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-custom-headers.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-custom-originPath.js +2 -1
- package/test/integ.cfts3-custom-originPath.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3-custom-originPath.assets.json +5 -5
- package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3-custom-originPath.template.json +1 -136
- package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3customoriginPathIntegDefaultTestDeployAssert61F499B2.assets.json +2 -2
- package/test/integ.cfts3-custom-originPath.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-custom-originPath.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-custom-originPath.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-customLoggingBuckets.js +2 -1
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3-customLoggingBuckets.assets.json +5 -5
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3-customLoggingBuckets.template.json +1 -136
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3customLoggingBucketsIntegDefaultTestDeployAssert4D171F9F.assets.json +2 -2
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-existing-bucket.js +2 -2
- package/test/integ.cfts3-existing-bucket.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3-existing-bucket.assets.json +5 -5
- package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3-existing-bucket.template.json +1 -136
- package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3existingbucketIntegDefaultTestDeployAssertA6D4EB49.assets.json +2 -2
- package/test/integ.cfts3-existing-bucket.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-existing-bucket.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-existing-bucket.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-no-arguments.js +2 -1
- package/test/integ.cfts3-no-arguments.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-no-arguments.js.snapshot/cfts3-no-arguments.assets.json +5 -5
- package/test/integ.cfts3-no-arguments.js.snapshot/cfts3-no-arguments.template.json +1 -136
- package/test/integ.cfts3-no-arguments.js.snapshot/cfts3noargumentsIntegDefaultTestDeployAssertBA5AFA25.assets.json +2 -2
- package/test/integ.cfts3-no-arguments.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-no-arguments.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-no-arguments.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js +2 -1
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cfts3-no-cloudfront-s3-access-logs.assets.json +5 -5
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cfts3-no-cloudfront-s3-access-logs.template.json +1 -136
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cfts3nocloudfronts3accesslogsIntegDefaultTestDeployAssertAD28C87A.assets.json +2 -2
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-no-logging.js +2 -1
- package/test/integ.cfts3-no-logging.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-no-logging.js.snapshot/cfts3-no-logging.assets.json +5 -5
- package/test/integ.cfts3-no-logging.js.snapshot/cfts3-no-logging.template.json +1 -136
- package/test/integ.cfts3-no-logging.js.snapshot/cfts3nologgingIntegDefaultTestDeployAssert18393DDB.assets.json +2 -2
- package/test/integ.cfts3-no-logging.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-no-logging.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-no-logging.js.snapshot/tree.json +1 -1
- package/test/integ.cfts3-no-security-headers.js +2 -1
- package/test/integ.cfts3-no-security-headers.js.snapshot/cdk.out +1 -1
- package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3-no-security-headers.assets.json +5 -5
- package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3-no-security-headers.template.json +1 -136
- package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3nosecurityheadersIntegDefaultTestDeployAssert38FE05BE.assets.json +2 -2
- package/test/integ.cfts3-no-security-headers.js.snapshot/integ.json +2 -2
- package/test/integ.cfts3-no-security-headers.js.snapshot/manifest.json +472 -9
- package/test/integ.cfts3-no-security-headers.js.snapshot/tree.json +1 -1
package/.jsii
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
"url": "https://aws.amazon.com"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@aws-solutions-constructs/core": "2.
|
|
12
|
-
"@aws-solutions-constructs/resources": "2.
|
|
13
|
-
"aws-cdk-lib": "^2.
|
|
11
|
+
"@aws-solutions-constructs/core": "2.87.0",
|
|
12
|
+
"@aws-solutions-constructs/resources": "2.87.0",
|
|
13
|
+
"aws-cdk-lib": "^2.206.0",
|
|
14
14
|
"constructs": "^10.0.0"
|
|
15
15
|
},
|
|
16
16
|
"dependencyClosure": {
|
|
@@ -211,6 +211,19 @@
|
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
213
|
},
|
|
214
|
+
"aws-cdk-lib.aws_aiops": {
|
|
215
|
+
"targets": {
|
|
216
|
+
"dotnet": {
|
|
217
|
+
"package": "Amazon.CDK.AWS.AIOps"
|
|
218
|
+
},
|
|
219
|
+
"java": {
|
|
220
|
+
"package": "software.amazon.awscdk.services.aiops"
|
|
221
|
+
},
|
|
222
|
+
"python": {
|
|
223
|
+
"module": "aws_cdk.aws_aiops"
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
},
|
|
214
227
|
"aws-cdk-lib.aws_amazonmq": {
|
|
215
228
|
"targets": {
|
|
216
229
|
"dotnet": {
|
|
@@ -1603,6 +1616,19 @@
|
|
|
1603
1616
|
}
|
|
1604
1617
|
}
|
|
1605
1618
|
},
|
|
1619
|
+
"aws-cdk-lib.aws_evs": {
|
|
1620
|
+
"targets": {
|
|
1621
|
+
"dotnet": {
|
|
1622
|
+
"package": "Amazon.CDK.AWS.EVS"
|
|
1623
|
+
},
|
|
1624
|
+
"java": {
|
|
1625
|
+
"package": "software.amazon.awscdk.services.evs"
|
|
1626
|
+
},
|
|
1627
|
+
"python": {
|
|
1628
|
+
"module": "aws_cdk.aws_evs"
|
|
1629
|
+
}
|
|
1630
|
+
}
|
|
1631
|
+
},
|
|
1606
1632
|
"aws-cdk-lib.aws_finspace": {
|
|
1607
1633
|
"targets": {
|
|
1608
1634
|
"dotnet": {
|
|
@@ -2539,6 +2565,19 @@
|
|
|
2539
2565
|
}
|
|
2540
2566
|
}
|
|
2541
2567
|
},
|
|
2568
|
+
"aws-cdk-lib.aws_mpa": {
|
|
2569
|
+
"targets": {
|
|
2570
|
+
"dotnet": {
|
|
2571
|
+
"package": "Amazon.CDK.AWS.MPA"
|
|
2572
|
+
},
|
|
2573
|
+
"java": {
|
|
2574
|
+
"package": "software.amazon.awscdk.services.mpa"
|
|
2575
|
+
},
|
|
2576
|
+
"python": {
|
|
2577
|
+
"module": "aws_cdk.aws_mpa"
|
|
2578
|
+
}
|
|
2579
|
+
}
|
|
2580
|
+
},
|
|
2542
2581
|
"aws-cdk-lib.aws_msk": {
|
|
2543
2582
|
"targets": {
|
|
2544
2583
|
"dotnet": {
|
|
@@ -2669,6 +2708,19 @@
|
|
|
2669
2708
|
}
|
|
2670
2709
|
}
|
|
2671
2710
|
},
|
|
2711
|
+
"aws-cdk-lib.aws_odb": {
|
|
2712
|
+
"targets": {
|
|
2713
|
+
"dotnet": {
|
|
2714
|
+
"package": "Amazon.CDK.AWS.ODB"
|
|
2715
|
+
},
|
|
2716
|
+
"java": {
|
|
2717
|
+
"package": "software.amazon.awscdk.services.odb"
|
|
2718
|
+
},
|
|
2719
|
+
"python": {
|
|
2720
|
+
"module": "aws_cdk.aws_odb"
|
|
2721
|
+
}
|
|
2722
|
+
}
|
|
2723
|
+
},
|
|
2672
2724
|
"aws-cdk-lib.aws_omics": {
|
|
2673
2725
|
"targets": {
|
|
2674
2726
|
"dotnet": {
|
|
@@ -3566,6 +3618,19 @@
|
|
|
3566
3618
|
}
|
|
3567
3619
|
}
|
|
3568
3620
|
},
|
|
3621
|
+
"aws-cdk-lib.aws_ssmguiconnect": {
|
|
3622
|
+
"targets": {
|
|
3623
|
+
"dotnet": {
|
|
3624
|
+
"package": "Amazon.CDK.AWS.SSMGuiConnect"
|
|
3625
|
+
},
|
|
3626
|
+
"java": {
|
|
3627
|
+
"package": "software.amazon.awscdk.services.ssmguiconnect"
|
|
3628
|
+
},
|
|
3629
|
+
"python": {
|
|
3630
|
+
"module": "aws_cdk.aws_ssmguiconnect"
|
|
3631
|
+
}
|
|
3632
|
+
}
|
|
3633
|
+
},
|
|
3569
3634
|
"aws-cdk-lib.aws_ssmincidents": {
|
|
3570
3635
|
"targets": {
|
|
3571
3636
|
"dotnet": {
|
|
@@ -3800,6 +3865,19 @@
|
|
|
3800
3865
|
}
|
|
3801
3866
|
}
|
|
3802
3867
|
},
|
|
3868
|
+
"aws-cdk-lib.aws_workspacesinstances": {
|
|
3869
|
+
"targets": {
|
|
3870
|
+
"dotnet": {
|
|
3871
|
+
"package": "Amazon.CDK.AWS.WorkspacesInstances"
|
|
3872
|
+
},
|
|
3873
|
+
"java": {
|
|
3874
|
+
"package": "software.amazon.awscdk.services.workspacesinstances"
|
|
3875
|
+
},
|
|
3876
|
+
"python": {
|
|
3877
|
+
"module": "aws_cdk.aws_workspacesinstances"
|
|
3878
|
+
}
|
|
3879
|
+
}
|
|
3880
|
+
},
|
|
3803
3881
|
"aws-cdk-lib.aws_workspacesthinclient": {
|
|
3804
3882
|
"targets": {
|
|
3805
3883
|
"dotnet": {
|
|
@@ -4411,6 +4489,6 @@
|
|
|
4411
4489
|
"symbolId": "lib/index:CloudFrontToS3Props"
|
|
4412
4490
|
}
|
|
4413
4491
|
},
|
|
4414
|
-
"version": "2.
|
|
4415
|
-
"fingerprint": "
|
|
4492
|
+
"version": "2.87.0",
|
|
4493
|
+
"fingerprint": "OlQFoDJj1Cnel28KlSLD6OfLmowm1lteNRJbe7N5p3U="
|
|
4416
4494
|
}
|
package/lib/index.js
CHANGED
|
@@ -122,5 +122,5 @@ class CloudFrontToS3 extends constructs_1.Construct {
|
|
|
122
122
|
}
|
|
123
123
|
exports.CloudFrontToS3 = CloudFrontToS3;
|
|
124
124
|
_a = JSII_RTTI_SYMBOL_1;
|
|
125
|
-
CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.
|
|
125
|
+
CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.87.0" };
|
|
126
126
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport { Aws } from 'aws-cdk-lib';\nimport * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as kms from 'aws-cdk-lib/aws-kms';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport * as defaults from '@aws-solutions-constructs/core';\nimport * as resources from '@aws-solutions-constructs/resources';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\n\n/**\n * @summary The properties for the CloudFrontToS3 Construct\n */\nexport interface CloudFrontToS3Props {\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  /**\n   * Optional user provided props to turn on/off the automatic injection of best practice HTTP\n   * security headers in all responses from cloudfront.\n   * Turning this on will inject default headers and is mutually exclusive with passing custom security headers\n   * via the responseHeadersPolicyProps parameter.\n   *\n   * @default - true\n   */\n  readonly insertHttpSecurityHeaders?: boolean;\n  /**\n   * Optional user provided configuration that cloudfront applies to all http responses.\n   * Can be used to pass a custom ResponseSecurityHeadersBehavior, ResponseCustomHeadersBehavior or\n   * ResponseHeadersCorsBehavior to the cloudfront distribution.\n   *\n   * Passing a custom ResponseSecurityHeadersBehavior is mutually exclusive with turning on the default security headers\n   * via `insertHttpSecurityHeaders` prop. Will throw an error if both `insertHttpSecurityHeaders` is set to `true`\n   * and ResponseSecurityHeadersBehavior is passed.\n   *\n   * @default - undefined\n   */\n  readonly responseHeadersPolicyProps?: cloudfront.ResponseHeadersPolicyProps\n  /**\n   * Optional user provided props to provide an originPath that CloudFront appends to the\n   * origin domain name when CloudFront requests content from the origin.\n   * The string should start with a `/`, for example `/production`.\n   * @default = '/'\n   */\n  readonly originPath?: string,\n\n  // =====================\n  // S3 Content Bucket\n  // =====================\n  /**\n   * Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingBucketObj?: s3.IBucket,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\n\n  // =====================\n  // S3 Content Bucket Access Logs Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the S3 Content bucket\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Log Bucket\n  // =====================\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Logs Bucket Access Log Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this\n   * while providing info about the log bucket will cause an error.\n   *\n   * @default - true\n   */\n  readonly logCloudFrontAccessLog?: boolean,\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket.\n   * Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketAccessLogBucketProps?: s3.BucketProps,\n}\n\nexport class CloudFrontToS3 extends Construct {\n  public readonly cloudFrontWebDistribution: cloudfront.Distribution;\n  public readonly cloudFrontFunction?: cloudfront.Function;\n  public readonly cloudFrontLoggingBucket?: s3.Bucket;\n  public readonly cloudFrontLoggingBucketAccessLogBucket?: s3.Bucket;\n  public readonly s3BucketInterface: s3.IBucket;\n  public readonly s3Bucket?: s3.Bucket;\n  public readonly s3LoggingBucket?: s3.Bucket;\n  public readonly originAccessControl?: cloudfront.CfnOriginAccessControl;\n\n  /**\n   * @summary Constructs a new instance of the CloudFrontToS3 class.\n   * @param {Construct} scope - represents the scope for all the resources.\n   * @param {string} id - this is a a scope-unique id.\n   * @param {CloudFrontToS3Props} props - user provided props for the construct\n   * @since 0.8.0\n   * @access public\n   */\n  constructor(scope: Construct, id: string, props: CloudFrontToS3Props) {\n    super(scope, id);\n\n    // All our tests are based upon this behavior being on, so we're setting\n    // context here rather than assuming the client will set it\n    this.node.setContext(\"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy\", true);\n\n    defaults.CheckS3Props(props);\n    defaults.CheckCloudFrontProps(props);\n    defaults.CheckCloudfrontS3Props(props);\n\n    let originBucket: s3.IBucket;\n\n    if (!props.existingBucketObj) {\n      const buildS3BucketResponse = defaults.buildS3Bucket(this, {\n        bucketProps: props.bucketProps,\n        loggingBucketProps: props.loggingBucketProps,\n        logS3AccessLogs: props.logS3AccessLogs\n      });\n      this.s3Bucket = buildS3BucketResponse.bucket;\n      this.s3LoggingBucket = buildS3BucketResponse.loggingBucket;\n      originBucket = this.s3Bucket;\n    } else {\n      originBucket = props.existingBucketObj;\n    }\n\n    this.s3BucketInterface = originBucket;\n\n    // Define the CloudFront Distribution\n    const cloudFrontDistributionForS3Props: defaults.CreateCloudFrontDistributionForS3Props = {\n      sourceBucket: this.s3BucketInterface,\n      cloudFrontDistributionProps: props.cloudFrontDistributionProps,\n      httpSecurityHeaders: props.insertHttpSecurityHeaders,\n      cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,\n      responseHeadersPolicyProps: props.responseHeadersPolicyProps,\n      cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps,\n      logCloudFrontAccessLog: props.logCloudFrontAccessLog\n    };\n    const cloudFrontDistributionForS3Response = defaults.createCloudFrontDistributionForS3(this, id, cloudFrontDistributionForS3Props);\n    this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;\n    this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;\n    this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;\n    this.originAccessControl = cloudFrontDistributionForS3Response.originAccessControl;\n    this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;\n\n    // Attach the OriginAccessControl to the CloudFront Distribution, and remove the OriginAccessIdentity\n    const l1CloudFrontDistribution = this.cloudFrontWebDistribution.node.defaultChild as cloudfront.CfnDistribution;\n    l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginAccessControlId', this.originAccessControl?.attrId);\n    if (props.originPath) {\n      l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginPath', props.originPath);\n    }\n\n    // Grant CloudFront permission to get the objects from the s3 bucket origin\n    originBucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: ['s3:GetObject'],\n        principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],\n        resources: [originBucket.arnForObjects('*')],\n        conditions: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:${Aws.PARTITION}:cloudfront::${Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`\n          }\n        }\n      })\n    );\n\n    originBucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: ['s3:ListBucket'],\n        principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],\n        resources: [originBucket.bucketArn],\n        conditions: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:${Aws.PARTITION}:cloudfront::${Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`\n          }\n        }\n      })\n    );\n\n    // We need to create a custom resource to introduce the indirection necessary to avoid\n    // a circular dependency when granting the CloudFront distribution access to use the\n    // KMS key to decrypt objects. Without this indirection, it is not possible to reference\n    // the CloudFront distribution ID in the KMS key policy because -\n    //   * The S3 bucket references the KMS key\n    //   * The CloudFront distribution references the bucket\n    //   * The KMS key references the CloudFront distribution\n    let encryptionKey: kms.IKey | undefined;\n    if (props.bucketProps && props.bucketProps.encryptionKey) {\n      encryptionKey = props.bucketProps.encryptionKey;\n    } else if (props.existingBucketObj && props.existingBucketObj.encryptionKey) {\n      encryptionKey = props.existingBucketObj.encryptionKey;\n    }\n\n    if (encryptionKey) {\n      resources.createKeyPolicyUpdaterCustomResource(this, id,  {\n        distribution: this.cloudFrontWebDistribution,\n        encryptionKey\n      });\n    }\n  }\n}"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-solutions-constructs/aws-cloudfront-s3",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.87.0",
|
|
4
4
|
"description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -55,15 +55,15 @@
|
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@aws-solutions-constructs/core": "2.
|
|
59
|
-
"@aws-solutions-constructs/resources": "2.
|
|
58
|
+
"@aws-solutions-constructs/core": "2.87.0",
|
|
59
|
+
"@aws-solutions-constructs/resources": "2.87.0",
|
|
60
60
|
"constructs": "^10.0.0"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@aws-cdk/integ-tests-alpha": "2.
|
|
63
|
+
"@aws-cdk/integ-tests-alpha": "2.206.0-alpha.0",
|
|
64
64
|
"@types/node": "^10.3.0",
|
|
65
65
|
"constructs": "^10.0.0",
|
|
66
|
-
"aws-cdk-lib": "2.
|
|
66
|
+
"aws-cdk-lib": "2.206.0"
|
|
67
67
|
},
|
|
68
68
|
"jest": {
|
|
69
69
|
"moduleFileExtensions": [
|
|
@@ -80,10 +80,10 @@
|
|
|
80
80
|
]
|
|
81
81
|
},
|
|
82
82
|
"peerDependencies": {
|
|
83
|
-
"@aws-solutions-constructs/core": "2.
|
|
84
|
-
"@aws-solutions-constructs/resources": "2.
|
|
83
|
+
"@aws-solutions-constructs/core": "2.87.0",
|
|
84
|
+
"@aws-solutions-constructs/resources": "2.87.0",
|
|
85
85
|
"constructs": "^10.0.0",
|
|
86
|
-
"aws-cdk-lib": "^2.
|
|
86
|
+
"aws-cdk-lib": "^2.206.0"
|
|
87
87
|
},
|
|
88
88
|
"keywords": [
|
|
89
89
|
"aws",
|
|
@@ -21,8 +21,8 @@ const integ_tests_alpha_1 = require("@aws-cdk/integ-tests-alpha");
|
|
|
21
21
|
// Setup
|
|
22
22
|
const app = new aws_cdk_lib_1.App();
|
|
23
23
|
const stack = new aws_cdk_lib_1.Stack(app, (0, core_1.generateIntegStackName)(__filename));
|
|
24
|
-
stack.node.setContext("@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy", true);
|
|
25
24
|
stack.templateOptions.description = 'Integration Test for aws-cloudfront-s3';
|
|
25
|
+
(0, core_1.SetConsistentFeatureFlags)(stack);
|
|
26
26
|
// Definitions
|
|
27
27
|
const encryptionKey = new aws_cdk_lib_1.aws_kms.Key(stack, 'cmkKey', {
|
|
28
28
|
enableKeyRotation: true,
|
|
@@ -58,4 +58,4 @@ new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3-cmk-encryption-key', props);
|
|
|
58
58
|
new integ_tests_alpha_1.IntegTest(stack, 'Integ', { testCases: [
|
|
59
59
|
stack
|
|
60
60
|
] });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuY2Z0czMtYnVja2V0LWVuY3J5cHRlZC13aXRoLWNtay1wcm92aWRlZC1hcy1leGlzdGluZ2J1Y2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImludGVnLmNmdHMzLWJ1Y2tldC1lbmNyeXB0ZWQtd2l0aC1jbWstcHJvdmlkZWQtYXMtZXhpc3RpbmdidWNrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOztBQUVILFVBQVU7QUFDViw2Q0FBaUU7QUFDakUsZ0NBQTZEO0FBQzdELHlEQUF3SjtBQUN4SiwrQ0FBc0Q7QUFDdEQsa0VBQXVEO0FBRXZELFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLGlCQUFHLEVBQUUsQ0FBQztBQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLG1CQUFLLENBQUMsR0FBRyxFQUFFLElBQUEsNkJBQXNCLEVBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUNqRSxLQUFLLENBQUMsZUFBZSxDQUFDLFdBQVcsR0FBRyx3Q0FBd0MsQ0FBQztBQUM3RSxJQUFBLGdDQUF5QixFQUFDLEtBQUssQ0FBQyxDQUFDO0FBRWpDLGNBQWM7QUFDZCxNQUFNLGFBQWEsR0FBRyxJQUFJLHFCQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUU7SUFDckQsaUJBQWlCLEVBQUUsSUFBSTtJQUN2QixhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO0NBQ3JDLENBQUMsQ0FBQztBQUVILE1BQU0saUJBQWlCLEdBQUcsSUFBQSxvQkFBYSxFQUFDLEtBQUssRUFBRTtJQUM3QyxXQUFXLEVBQUU7UUFDWCxVQUFVLEVBQUUseUJBQWdCLENBQUMsR0FBRztRQUNoQyxhQUFhO1FBQ2IsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztRQUNwQyxpQkFBaUIsRUFBRSxJQUFJO0tBQ3hCO0lBQ0Qsa0JBQWtCLEVBQUU7UUFDbEIsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztRQUNwQyxpQkFBaUIsRUFBRSxJQUFJO0tBQ3hCO0NBQ0YsRUFBRSx1Q0FBdUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUVuRCxNQUFNLEtBQUssR0FBd0I7SUFDakMsaUJBQWlCO0lBQ2pCLDRCQUE0QixFQUFFO1FBQzVCLGFBQWEsRUFBRSwyQkFBYSxDQUFDLE9BQU87UUFDcEMsaUJBQWlCLEVBQUUsSUFBSTtLQUN4QjtJQUNELDJDQUEyQyxFQUFFO1FBQzNDLGFBQWEsRUFBRSwyQkFBYSxDQUFDLE9BQU87UUFDcEMsaUJBQWlCLEVBQUUsSUFBSTtLQUN4QjtJQUNELHlCQUF5QixFQUFFLEtBQUs7Q0FDakMsQ0FBQztBQUVGLElBQUksb0JBQWMsQ0FBQyxLQUFLLEVBQUUsdUNBQXVDLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFFMUUsSUFBQSwwQ0FBbUMsRUFBQyxLQUFLLEVBQUUsbURBQW1ELENBQUMsQ0FBQztBQUVoRyxRQUFRO0FBQ1IsSUFBSSw2QkFBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUU7UUFDekMsS0FBSztLQUNOLEVBQUUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjaywgUmVtb3ZhbFBvbGljeSwgYXdzX2ttcyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvUzMsIENsb3VkRnJvbnRUb1MzUHJvcHMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgeyBidWlsZFMzQnVja2V0LCBnZW5lcmF0ZUludGVnU3RhY2tOYW1lLCBzdXBwcmVzc0N1c3RvbUhhbmRsZXJDZm5OYWdXYXJuaW5ncywgU2V0Q29uc2lzdGVudEZlYXR1cmVGbGFncyAgfSBmcm9tICdAYXdzLXNvbHV0aW9ucy1jb25zdHJ1Y3RzL2NvcmUnO1xuaW1wb3J0IHsgQnVja2V0RW5jcnlwdGlvbiB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtczNcIjtcbmltcG9ydCB7IEludGVnVGVzdCB9IGZyb20gJ0Bhd3MtY2RrL2ludGVnLXRlc3RzLWFscGhhJztcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5zdGFjay50ZW1wbGF0ZU9wdGlvbnMuZGVzY3JpcHRpb24gPSAnSW50ZWdyYXRpb24gVGVzdCBmb3IgYXdzLWNsb3VkZnJvbnQtczMnO1xuU2V0Q29uc2lzdGVudEZlYXR1cmVGbGFncyhzdGFjayk7XG5cbi8vIERlZmluaXRpb25zXG5jb25zdCBlbmNyeXB0aW9uS2V5ID0gbmV3IGF3c19rbXMuS2V5KHN0YWNrLCAnY21rS2V5Jywge1xuICBlbmFibGVLZXlSb3RhdGlvbjogdHJ1ZSxcbiAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZXG59KTtcblxuY29uc3QgZXhpc3RpbmdCdWNrZXRPYmogPSBidWlsZFMzQnVja2V0KHN0YWNrLCB7XG4gIGJ1Y2tldFByb3BzOiB7XG4gICAgZW5jcnlwdGlvbjogQnVja2V0RW5jcnlwdGlvbi5LTVMsXG4gICAgZW5jcnlwdGlvbktleSxcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gICAgYXV0b0RlbGV0ZU9iamVjdHM6IHRydWVcbiAgfSxcbiAgbG9nZ2luZ0J1Y2tldFByb3BzOiB7XG4gICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZLFxuICAgIGF1dG9EZWxldGVPYmplY3RzOiB0cnVlXG4gIH1cbn0sICdleGlzdGluZy1zMy1idWNrZXQtZW5jcnlwdGVkLXdpdGgtY21rJykuYnVja2V0O1xuXG5jb25zdCBwcm9wczogQ2xvdWRGcm9udFRvUzNQcm9wcyA9IHtcbiAgZXhpc3RpbmdCdWNrZXRPYmosXG4gIGNsb3VkRnJvbnRMb2dnaW5nQnVja2V0UHJvcHM6IHtcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gICAgYXV0b0RlbGV0ZU9iamVjdHM6IHRydWVcbiAgfSxcbiAgY2xvdWRGcm9udExvZ2dpbmdCdWNrZXRBY2Nlc3NMb2dCdWNrZXRQcm9wczoge1xuICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgICBhdXRvRGVsZXRlT2JqZWN0czogdHJ1ZVxuICB9LFxuICBpbnNlcnRIdHRwU2VjdXJpdHlIZWFkZXJzOiBmYWxzZVxufTtcblxubmV3IENsb3VkRnJvbnRUb1MzKHN0YWNrLCAndGVzdC1jbG91ZGZyb250LXMzLWNtay1lbmNyeXB0aW9uLWtleScsIHByb3BzKTtcblxuc3VwcHJlc3NDdXN0b21IYW5kbGVyQ2ZuTmFnV2FybmluZ3Moc3RhY2ssICdDdXN0b206OlMzQXV0b0RlbGV0ZU9iamVjdHNDdXN0b21SZXNvdXJjZVByb3ZpZGVyJyk7XG5cbi8vIFN5bnRoXG5uZXcgSW50ZWdUZXN0KHN0YWNrLCAnSW50ZWcnLCB7IHRlc3RDYXNlczogW1xuICBzdGFja1xuXSB9KTtcbiJdfQ==
|
package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cdk.out
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"
|
|
1
|
+
{"version":"45.0.0"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "
|
|
2
|
+
"version": "45.0.0",
|
|
3
3
|
"files": {
|
|
4
4
|
"faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6": {
|
|
5
5
|
"displayName": "cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket/Custom::S3AutoDeleteObjectsCustomResourceProvider Code",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"packaging": "zip"
|
|
9
9
|
},
|
|
10
10
|
"destinations": {
|
|
11
|
-
"current_account-current_region": {
|
|
11
|
+
"current_account-current_region-e31788a2": {
|
|
12
12
|
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
|
|
13
13
|
"objectKey": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip",
|
|
14
14
|
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"packaging": "zip"
|
|
23
23
|
},
|
|
24
24
|
"destinations": {
|
|
25
|
-
"current_account-current_region": {
|
|
25
|
+
"current_account-current_region-608834ce": {
|
|
26
26
|
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
|
|
27
27
|
"objectKey": "e97825c838d70ceb13ba2f6223a7d94ed35687b70bfb224a0b9128e698e3f28e.zip",
|
|
28
28
|
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
|
|
@@ -36,23 +36,23 @@
|
|
|
36
36
|
"packaging": "zip"
|
|
37
37
|
},
|
|
38
38
|
"destinations": {
|
|
39
|
-
"current_account-current_region": {
|
|
39
|
+
"current_account-current_region-aca8d54f": {
|
|
40
40
|
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
|
|
41
41
|
"objectKey": "bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca.zip",
|
|
42
42
|
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
},
|
|
46
|
-
"
|
|
46
|
+
"7fca516db65ed38cc4fc93c327f6756fcb6ef9f86bcdd7854163f48b94e412f3": {
|
|
47
47
|
"displayName": "cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket Template",
|
|
48
48
|
"source": {
|
|
49
49
|
"path": "cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.template.json",
|
|
50
50
|
"packaging": "file"
|
|
51
51
|
},
|
|
52
52
|
"destinations": {
|
|
53
|
-
"current_account-current_region": {
|
|
53
|
+
"current_account-current_region-9be40000": {
|
|
54
54
|
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
|
|
55
|
-
"objectKey": "
|
|
55
|
+
"objectKey": "7fca516db65ed38cc4fc93c327f6756fcb6ef9f86bcdd7854163f48b94e412f3.json",
|
|
56
56
|
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -259,15 +259,7 @@
|
|
|
259
259
|
"Arn"
|
|
260
260
|
]
|
|
261
261
|
},
|
|
262
|
-
"Runtime":
|
|
263
|
-
"Fn::FindInMap": [
|
|
264
|
-
"LatestNodeRuntimeMap",
|
|
265
|
-
{
|
|
266
|
-
"Ref": "AWS::Region"
|
|
267
|
-
},
|
|
268
|
-
"value"
|
|
269
|
-
]
|
|
270
|
-
},
|
|
262
|
+
"Runtime": "nodejs22.x",
|
|
271
263
|
"Description": {
|
|
272
264
|
"Fn::Join": [
|
|
273
265
|
"",
|
|
@@ -1230,21 +1222,17 @@
|
|
|
1230
1222
|
}
|
|
1231
1223
|
},
|
|
1232
1224
|
"Handler": "framework.onEvent",
|
|
1225
|
+
"LoggingConfig": {
|
|
1226
|
+
"ApplicationLogLevel": "FATAL",
|
|
1227
|
+
"LogFormat": "JSON"
|
|
1228
|
+
},
|
|
1233
1229
|
"Role": {
|
|
1234
1230
|
"Fn::GetAtt": [
|
|
1235
1231
|
"testcloudfronts3cmkencryptionkeyKmsKeyPolicyUpdateProviderframeworkonEventServiceRole3D4040AD",
|
|
1236
1232
|
"Arn"
|
|
1237
1233
|
]
|
|
1238
1234
|
},
|
|
1239
|
-
"Runtime":
|
|
1240
|
-
"Fn::FindInMap": [
|
|
1241
|
-
"LatestNodeRuntimeMap",
|
|
1242
|
-
{
|
|
1243
|
-
"Ref": "AWS::Region"
|
|
1244
|
-
},
|
|
1245
|
-
"value"
|
|
1246
|
-
]
|
|
1247
|
-
},
|
|
1235
|
+
"Runtime": "nodejs22.x",
|
|
1248
1236
|
"Timeout": 900
|
|
1249
1237
|
},
|
|
1250
1238
|
"DependsOn": [
|
|
@@ -1319,133 +1307,6 @@
|
|
|
1319
1307
|
"DeletionPolicy": "Delete"
|
|
1320
1308
|
}
|
|
1321
1309
|
},
|
|
1322
|
-
"Mappings": {
|
|
1323
|
-
"LatestNodeRuntimeMap": {
|
|
1324
|
-
"af-south-1": {
|
|
1325
|
-
"value": "nodejs20.x"
|
|
1326
|
-
},
|
|
1327
|
-
"ap-east-1": {
|
|
1328
|
-
"value": "nodejs20.x"
|
|
1329
|
-
},
|
|
1330
|
-
"ap-northeast-1": {
|
|
1331
|
-
"value": "nodejs20.x"
|
|
1332
|
-
},
|
|
1333
|
-
"ap-northeast-2": {
|
|
1334
|
-
"value": "nodejs20.x"
|
|
1335
|
-
},
|
|
1336
|
-
"ap-northeast-3": {
|
|
1337
|
-
"value": "nodejs20.x"
|
|
1338
|
-
},
|
|
1339
|
-
"ap-south-1": {
|
|
1340
|
-
"value": "nodejs20.x"
|
|
1341
|
-
},
|
|
1342
|
-
"ap-south-2": {
|
|
1343
|
-
"value": "nodejs20.x"
|
|
1344
|
-
},
|
|
1345
|
-
"ap-southeast-1": {
|
|
1346
|
-
"value": "nodejs20.x"
|
|
1347
|
-
},
|
|
1348
|
-
"ap-southeast-2": {
|
|
1349
|
-
"value": "nodejs20.x"
|
|
1350
|
-
},
|
|
1351
|
-
"ap-southeast-3": {
|
|
1352
|
-
"value": "nodejs20.x"
|
|
1353
|
-
},
|
|
1354
|
-
"ap-southeast-4": {
|
|
1355
|
-
"value": "nodejs20.x"
|
|
1356
|
-
},
|
|
1357
|
-
"ap-southeast-5": {
|
|
1358
|
-
"value": "nodejs20.x"
|
|
1359
|
-
},
|
|
1360
|
-
"ap-southeast-7": {
|
|
1361
|
-
"value": "nodejs20.x"
|
|
1362
|
-
},
|
|
1363
|
-
"ca-central-1": {
|
|
1364
|
-
"value": "nodejs20.x"
|
|
1365
|
-
},
|
|
1366
|
-
"ca-west-1": {
|
|
1367
|
-
"value": "nodejs20.x"
|
|
1368
|
-
},
|
|
1369
|
-
"cn-north-1": {
|
|
1370
|
-
"value": "nodejs20.x"
|
|
1371
|
-
},
|
|
1372
|
-
"cn-northwest-1": {
|
|
1373
|
-
"value": "nodejs20.x"
|
|
1374
|
-
},
|
|
1375
|
-
"eu-central-1": {
|
|
1376
|
-
"value": "nodejs20.x"
|
|
1377
|
-
},
|
|
1378
|
-
"eu-central-2": {
|
|
1379
|
-
"value": "nodejs20.x"
|
|
1380
|
-
},
|
|
1381
|
-
"eu-isoe-west-1": {
|
|
1382
|
-
"value": "nodejs18.x"
|
|
1383
|
-
},
|
|
1384
|
-
"eu-north-1": {
|
|
1385
|
-
"value": "nodejs20.x"
|
|
1386
|
-
},
|
|
1387
|
-
"eu-south-1": {
|
|
1388
|
-
"value": "nodejs20.x"
|
|
1389
|
-
},
|
|
1390
|
-
"eu-south-2": {
|
|
1391
|
-
"value": "nodejs20.x"
|
|
1392
|
-
},
|
|
1393
|
-
"eu-west-1": {
|
|
1394
|
-
"value": "nodejs20.x"
|
|
1395
|
-
},
|
|
1396
|
-
"eu-west-2": {
|
|
1397
|
-
"value": "nodejs20.x"
|
|
1398
|
-
},
|
|
1399
|
-
"eu-west-3": {
|
|
1400
|
-
"value": "nodejs20.x"
|
|
1401
|
-
},
|
|
1402
|
-
"il-central-1": {
|
|
1403
|
-
"value": "nodejs20.x"
|
|
1404
|
-
},
|
|
1405
|
-
"me-central-1": {
|
|
1406
|
-
"value": "nodejs20.x"
|
|
1407
|
-
},
|
|
1408
|
-
"me-south-1": {
|
|
1409
|
-
"value": "nodejs20.x"
|
|
1410
|
-
},
|
|
1411
|
-
"mx-central-1": {
|
|
1412
|
-
"value": "nodejs20.x"
|
|
1413
|
-
},
|
|
1414
|
-
"sa-east-1": {
|
|
1415
|
-
"value": "nodejs20.x"
|
|
1416
|
-
},
|
|
1417
|
-
"us-east-1": {
|
|
1418
|
-
"value": "nodejs20.x"
|
|
1419
|
-
},
|
|
1420
|
-
"us-east-2": {
|
|
1421
|
-
"value": "nodejs20.x"
|
|
1422
|
-
},
|
|
1423
|
-
"us-gov-east-1": {
|
|
1424
|
-
"value": "nodejs20.x"
|
|
1425
|
-
},
|
|
1426
|
-
"us-gov-west-1": {
|
|
1427
|
-
"value": "nodejs20.x"
|
|
1428
|
-
},
|
|
1429
|
-
"us-iso-east-1": {
|
|
1430
|
-
"value": "nodejs18.x"
|
|
1431
|
-
},
|
|
1432
|
-
"us-iso-west-1": {
|
|
1433
|
-
"value": "nodejs18.x"
|
|
1434
|
-
},
|
|
1435
|
-
"us-isob-east-1": {
|
|
1436
|
-
"value": "nodejs18.x"
|
|
1437
|
-
},
|
|
1438
|
-
"us-isob-west-1": {
|
|
1439
|
-
"value": "nodejs18.x"
|
|
1440
|
-
},
|
|
1441
|
-
"us-west-1": {
|
|
1442
|
-
"value": "nodejs20.x"
|
|
1443
|
-
},
|
|
1444
|
-
"us-west-2": {
|
|
1445
|
-
"value": "nodejs20.x"
|
|
1446
|
-
}
|
|
1447
|
-
}
|
|
1448
|
-
},
|
|
1449
1310
|
"Parameters": {
|
|
1450
1311
|
"BootstrapVersion": {
|
|
1451
1312
|
"Type": "AWS::SSM::Parameter::Value<String>",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "
|
|
2
|
+
"version": "45.0.0",
|
|
3
3
|
"files": {
|
|
4
4
|
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
|
|
5
5
|
"displayName": "cfts3bucketencryptedwithcmkprovidedasexistingbucketIntegDefaultTestDeployAssertF6031114 Template",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"packaging": "file"
|
|
9
9
|
},
|
|
10
10
|
"destinations": {
|
|
11
|
-
"current_account-current_region": {
|
|
11
|
+
"current_account-current_region-d8d86b35": {
|
|
12
12
|
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
|
|
13
13
|
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
|
|
14
14
|
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
|
package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/integ.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "
|
|
2
|
+
"version": "45.0.0",
|
|
3
3
|
"testCases": {
|
|
4
4
|
"cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket/Integ/DefaultTest": {
|
|
5
5
|
"stacks": [
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"assertionStackName": "cfts3bucketencryptedwithcmkprovidedasexistingbucketIntegDefaultTestDeployAssertF6031114"
|
|
10
10
|
}
|
|
11
11
|
},
|
|
12
|
-
"minimumCliVersion": "2.
|
|
12
|
+
"minimumCliVersion": "2.1020.2"
|
|
13
13
|
}
|