@aws-solutions-constructs/aws-cloudfront-s3 2.0.0-rc.1 → 2.2.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 +291 -1068
- package/README.md +6 -6
- package/lib/index.d.ts +24 -2
- package/lib/index.js +11 -7
- package/package.json +9 -9
- package/test/integ.custom-originPath.d.ts +13 -0
- package/test/integ.custom-originPath.expected.json +422 -0
- package/test/integ.custom-originPath.js +28 -0
- package/test/integ.custom-security-headers.d.ts +1 -1
- package/test/integ.custom-security-headers.expected.json +25 -28
- package/test/integ.custom-security-headers.js +2 -2
- package/test/integ.customCloudFrontLoggingBucket.d.ts +13 -0
- package/test/integ.customCloudFrontLoggingBucket.expected.json +421 -0
- package/test/integ.customCloudFrontLoggingBucket.js +36 -0
- package/test/integ.customLoggingBucket.d.ts +1 -1
- package/test/integ.customLoggingBucket.expected.json +25 -28
- package/test/integ.customLoggingBucket.js +2 -2
- package/test/integ.existing-bucket.d.ts +1 -1
- package/test/integ.existing-bucket.expected.json +9 -10
- package/test/integ.existing-bucket.js +3 -3
- package/test/integ.no-arguments.d.ts +1 -1
- package/test/integ.no-arguments.expected.json +28 -109
- package/test/integ.no-arguments.js +11 -4
- package/test/integ.no-security-headers.d.ts +1 -1
- package/test/integ.no-security-headers.expected.json +25 -28
- package/test/integ.no-security-headers.js +2 -2
- package/test/test.cloudfront-s3.test.d.ts +1 -1
- package/test/test.cloudfront-s3.test.js +97 -7
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"PolicyDocument": {
|
|
47
47
|
"Statement": [
|
|
48
48
|
{
|
|
49
|
-
"Action": "
|
|
49
|
+
"Action": "s3:*",
|
|
50
50
|
"Condition": {
|
|
51
51
|
"Bool": {
|
|
52
52
|
"aws:SecureTransport": "false"
|
|
@@ -57,6 +57,12 @@
|
|
|
57
57
|
"AWS": "*"
|
|
58
58
|
},
|
|
59
59
|
"Resource": [
|
|
60
|
+
{
|
|
61
|
+
"Fn::GetAtt": [
|
|
62
|
+
"testcloudfronts3S3LoggingBucket90D239DD",
|
|
63
|
+
"Arn"
|
|
64
|
+
]
|
|
65
|
+
},
|
|
60
66
|
{
|
|
61
67
|
"Fn::Join": [
|
|
62
68
|
"",
|
|
@@ -70,15 +76,8 @@
|
|
|
70
76
|
"/*"
|
|
71
77
|
]
|
|
72
78
|
]
|
|
73
|
-
},
|
|
74
|
-
{
|
|
75
|
-
"Fn::GetAtt": [
|
|
76
|
-
"testcloudfronts3S3LoggingBucket90D239DD",
|
|
77
|
-
"Arn"
|
|
78
|
-
]
|
|
79
79
|
}
|
|
80
|
-
]
|
|
81
|
-
"Sid": "HttpsOnly"
|
|
80
|
+
]
|
|
82
81
|
}
|
|
83
82
|
],
|
|
84
83
|
"Version": "2012-10-17"
|
|
@@ -137,7 +136,7 @@
|
|
|
137
136
|
"PolicyDocument": {
|
|
138
137
|
"Statement": [
|
|
139
138
|
{
|
|
140
|
-
"Action": "
|
|
139
|
+
"Action": "s3:*",
|
|
141
140
|
"Condition": {
|
|
142
141
|
"Bool": {
|
|
143
142
|
"aws:SecureTransport": "false"
|
|
@@ -148,6 +147,12 @@
|
|
|
148
147
|
"AWS": "*"
|
|
149
148
|
},
|
|
150
149
|
"Resource": [
|
|
150
|
+
{
|
|
151
|
+
"Fn::GetAtt": [
|
|
152
|
+
"testcloudfronts3S3BucketE0C5F76E",
|
|
153
|
+
"Arn"
|
|
154
|
+
]
|
|
155
|
+
},
|
|
151
156
|
{
|
|
152
157
|
"Fn::Join": [
|
|
153
158
|
"",
|
|
@@ -161,15 +166,8 @@
|
|
|
161
166
|
"/*"
|
|
162
167
|
]
|
|
163
168
|
]
|
|
164
|
-
},
|
|
165
|
-
{
|
|
166
|
-
"Fn::GetAtt": [
|
|
167
|
-
"testcloudfronts3S3BucketE0C5F76E",
|
|
168
|
-
"Arn"
|
|
169
|
-
]
|
|
170
169
|
}
|
|
171
|
-
]
|
|
172
|
-
"Sid": "HttpsOnly"
|
|
170
|
+
]
|
|
173
171
|
},
|
|
174
172
|
{
|
|
175
173
|
"Action": "s3:GetObject",
|
|
@@ -269,7 +267,7 @@
|
|
|
269
267
|
"PolicyDocument": {
|
|
270
268
|
"Statement": [
|
|
271
269
|
{
|
|
272
|
-
"Action": "
|
|
270
|
+
"Action": "s3:*",
|
|
273
271
|
"Condition": {
|
|
274
272
|
"Bool": {
|
|
275
273
|
"aws:SecureTransport": "false"
|
|
@@ -280,6 +278,12 @@
|
|
|
280
278
|
"AWS": "*"
|
|
281
279
|
},
|
|
282
280
|
"Resource": [
|
|
281
|
+
{
|
|
282
|
+
"Fn::GetAtt": [
|
|
283
|
+
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
284
|
+
"Arn"
|
|
285
|
+
]
|
|
286
|
+
},
|
|
283
287
|
{
|
|
284
288
|
"Fn::Join": [
|
|
285
289
|
"",
|
|
@@ -293,15 +297,8 @@
|
|
|
293
297
|
"/*"
|
|
294
298
|
]
|
|
295
299
|
]
|
|
296
|
-
},
|
|
297
|
-
{
|
|
298
|
-
"Fn::GetAtt": [
|
|
299
|
-
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
300
|
-
"Arn"
|
|
301
|
-
]
|
|
302
300
|
}
|
|
303
|
-
]
|
|
304
|
-
"Sid": "HttpsOnly"
|
|
301
|
+
]
|
|
305
302
|
}
|
|
306
303
|
],
|
|
307
304
|
"Version": "2012-10-17"
|
|
@@ -391,7 +388,7 @@
|
|
|
391
388
|
"BootstrapVersion": {
|
|
392
389
|
"Type": "AWS::SSM::Parameter::Value<String>",
|
|
393
390
|
"Default": "/cdk-bootstrap/hnb659fds/version",
|
|
394
|
-
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
|
|
391
|
+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
|
|
395
392
|
}
|
|
396
393
|
},
|
|
397
394
|
"Rules": {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Copyright
|
|
3
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
6
|
* with the License. A copy of the License is located at
|
|
@@ -32,4 +32,4 @@ new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
|
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
app.synth();
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuY3VzdG9tTG9nZ2luZ0J1Y2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImludGVnLmN1c3RvbUxvZ2dpbmdCdWNrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOztBQUVILGdCQUFnQjtBQUNoQiw2Q0FBd0Q7QUFDeEQsK0NBQXNEO0FBQ3RELGdDQUF3QztBQUN4Qyx5REFBd0U7QUFFeEUsTUFBTSxHQUFHLEdBQUcsSUFBSSxpQkFBRyxFQUFFLENBQUM7QUFFdEIsa0JBQWtCO0FBQ2xCLE1BQU0sS0FBSyxHQUFHLElBQUksbUJBQUssQ0FBQyxHQUFHLEVBQUUsNkJBQXNCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUVqRSxJQUFJLG9CQUFjLENBQUMsS0FBSyxFQUFFLG9CQUFvQixFQUFFO0lBQzlDLFdBQVcsRUFBRTtRQUNYLGFBQWEsRUFBRSwyQkFBYSxDQUFDLE9BQU87S0FDckM7SUFDRCxrQkFBa0IsRUFBRTtRQUNsQixhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO1FBQ3BDLFVBQVUsRUFBRSx1QkFBdUI7UUFDbkMsVUFBVSxFQUFFLHlCQUFnQixDQUFDLFVBQVU7UUFDdkMsU0FBUyxFQUFFLElBQUk7S0FDaEI7Q0FDRixDQUFDLENBQUM7QUFDSCxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vLyAhY2RrLWludGVnICpcbmltcG9ydCB7IEFwcCwgU3RhY2ssIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IEJ1Y2tldEVuY3J5cHRpb24gfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLXMzXCI7XG5pbXBvcnQgeyBDbG91ZEZyb250VG9TMyB9IGZyb20gXCIuLi9saWJcIjtcbmltcG9ydCB7IGdlbmVyYXRlSW50ZWdTdGFja05hbWUgfSBmcm9tICdAYXdzLXNvbHV0aW9ucy1jb25zdHJ1Y3RzL2NvcmUnO1xuXG5jb25zdCBhcHAgPSBuZXcgQXBwKCk7XG5cbi8vIEVtcHR5IGFyZ3VtZW50c1xuY29uc3Qgc3RhY2sgPSBuZXcgU3RhY2soYXBwLCBnZW5lcmF0ZUludGVnU3RhY2tOYW1lKF9fZmlsZW5hbWUpKTtcblxubmV3IENsb3VkRnJvbnRUb1MzKHN0YWNrLCAndGVzdC1jbG91ZGZyb250LXMzJywge1xuICBidWNrZXRQcm9wczoge1xuICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgfSxcbiAgbG9nZ2luZ0J1Y2tldFByb3BzOiB7XG4gICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZLFxuICAgIGJ1Y2tldE5hbWU6ICdjdXN0b20tbG9nZ2luZy1idWNrZXQnLFxuICAgIGVuY3J5cHRpb246IEJ1Y2tldEVuY3J5cHRpb24uUzNfTUFOQUdFRCxcbiAgICB2ZXJzaW9uZWQ6IHRydWVcbiAgfVxufSk7XG5hcHAuc3ludGgoKTsiXX0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright
|
|
2
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
3
|
*
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
5
5
|
* with the License. A copy of the License is located at
|
|
@@ -169,7 +169,7 @@
|
|
|
169
169
|
"PolicyDocument": {
|
|
170
170
|
"Statement": [
|
|
171
171
|
{
|
|
172
|
-
"Action": "
|
|
172
|
+
"Action": "s3:*",
|
|
173
173
|
"Condition": {
|
|
174
174
|
"Bool": {
|
|
175
175
|
"aws:SecureTransport": "false"
|
|
@@ -180,6 +180,12 @@
|
|
|
180
180
|
"AWS": "*"
|
|
181
181
|
},
|
|
182
182
|
"Resource": [
|
|
183
|
+
{
|
|
184
|
+
"Fn::GetAtt": [
|
|
185
|
+
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
186
|
+
"Arn"
|
|
187
|
+
]
|
|
188
|
+
},
|
|
183
189
|
{
|
|
184
190
|
"Fn::Join": [
|
|
185
191
|
"",
|
|
@@ -193,15 +199,8 @@
|
|
|
193
199
|
"/*"
|
|
194
200
|
]
|
|
195
201
|
]
|
|
196
|
-
},
|
|
197
|
-
{
|
|
198
|
-
"Fn::GetAtt": [
|
|
199
|
-
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
200
|
-
"Arn"
|
|
201
|
-
]
|
|
202
202
|
}
|
|
203
|
-
]
|
|
204
|
-
"Sid": "HttpsOnly"
|
|
203
|
+
]
|
|
205
204
|
}
|
|
206
205
|
],
|
|
207
206
|
"Version": "2012-10-17"
|
|
@@ -356,7 +355,7 @@
|
|
|
356
355
|
"BootstrapVersion": {
|
|
357
356
|
"Type": "AWS::SSM::Parameter::Value<String>",
|
|
358
357
|
"Default": "/cdk-bootstrap/hnb659fds/version",
|
|
359
|
-
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
|
|
358
|
+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
|
|
360
359
|
}
|
|
361
360
|
},
|
|
362
361
|
"Rules": {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Copyright
|
|
3
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
6
|
* with the License. A copy of the License is located at
|
|
@@ -26,7 +26,7 @@ const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filen
|
|
|
26
26
|
let mybucket;
|
|
27
27
|
mybucket = defaults.CreateScrapBucket(stack, { removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY });
|
|
28
28
|
const _construct = new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
|
|
29
|
-
|
|
29
|
+
existingBucketObj: mybucket,
|
|
30
30
|
});
|
|
31
31
|
// Add Cache Policy
|
|
32
32
|
const myCachePolicy = new cloudfront.CachePolicy(stack, 'myCachePolicy', {
|
|
@@ -41,4 +41,4 @@ _construct.cloudFrontWebDistribution.addBehavior('/images/*.jpg', new origins.S3
|
|
|
41
41
|
});
|
|
42
42
|
// Synth
|
|
43
43
|
app.synth();
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuZXhpc3RpbmctYnVja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcuZXhpc3RpbmctYnVja2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1YsNkNBQXdEO0FBRXhELDJEQUEyRDtBQUMzRCxnQ0FBd0M7QUFDeEMsOERBQThEO0FBQzlELHlEQUF5RDtBQUN6RCw2Q0FBdUM7QUFDdkMseURBQXdFO0FBRXhFLFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLGlCQUFHLEVBQUUsQ0FBQztBQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLG1CQUFLLENBQUMsR0FBRyxFQUFFLDZCQUFzQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFFakUsSUFBSSxRQUFtQixDQUFDO0FBQ3hCLFFBQVEsR0FBRyxRQUFRLENBQUMsaUJBQWlCLENBQUMsS0FBSyxFQUFFLEVBQUUsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztBQUV2RixNQUFNLFVBQVUsR0FBRyxJQUFJLG9CQUFjLENBQUMsS0FBSyxFQUFFLG9CQUFvQixFQUFFO0lBQ2pFLGlCQUFpQixFQUFFLFFBQVE7Q0FDNUIsQ0FBQyxDQUFDO0FBRUgsbUJBQW1CO0FBQ25CLE1BQU0sYUFBYSxHQUFHLElBQUksVUFBVSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsZUFBZSxFQUFFO0lBQ3ZFLGVBQWUsRUFBRSxVQUFVO0lBQzNCLFVBQVUsRUFBRSxzQkFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDL0IsTUFBTSxFQUFFLHNCQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUMzQixNQUFNLEVBQUUsc0JBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0NBQzVCLENBQUMsQ0FBQztBQUVILGVBQWU7QUFDZixVQUFVLENBQUMseUJBQXlCLENBQUMsV0FBVyxDQUFDLGVBQWUsRUFBRSxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDaEcsV0FBVyxFQUFFLGFBQWE7Q0FDM0IsQ0FBQyxDQUFDO0FBRUgsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjaywgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0ICogYXMgczMgZnJvbSBcImF3cy1jZGstbGliL2F3cy1zM1wiO1xuaW1wb3J0ICogYXMgZGVmYXVsdHMgZnJvbSBcIkBhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZVwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvUzMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgKiBhcyBvcmlnaW5zIGZyb20gJ2F3cy1jZGstbGliL2F3cy1jbG91ZGZyb250LW9yaWdpbnMnO1xuaW1wb3J0ICogYXMgY2xvdWRmcm9udCBmcm9tICdhd3MtY2RrLWxpYi9hd3MtY2xvdWRmcm9udCc7XG5pbXBvcnQgeyBEdXJhdGlvbiB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZSB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5cbi8vIFNldHVwXG5jb25zdCBhcHAgPSBuZXcgQXBwKCk7XG5jb25zdCBzdGFjayA9IG5ldyBTdGFjayhhcHAsIGdlbmVyYXRlSW50ZWdTdGFja05hbWUoX19maWxlbmFtZSkpO1xuXG5sZXQgbXlidWNrZXQ6IHMzLkJ1Y2tldDtcbm15YnVja2V0ID0gZGVmYXVsdHMuQ3JlYXRlU2NyYXBCdWNrZXQoc3RhY2ssIHsgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZIH0pO1xuXG5jb25zdCBfY29uc3RydWN0ID0gbmV3IENsb3VkRnJvbnRUb1MzKHN0YWNrLCAndGVzdC1jbG91ZGZyb250LXMzJywge1xuICBleGlzdGluZ0J1Y2tldE9iajogbXlidWNrZXQsXG59KTtcblxuLy8gQWRkIENhY2hlIFBvbGljeVxuY29uc3QgbXlDYWNoZVBvbGljeSA9IG5ldyBjbG91ZGZyb250LkNhY2hlUG9saWN5KHN0YWNrLCAnbXlDYWNoZVBvbGljeScsIHtcbiAgY2FjaGVQb2xpY3lOYW1lOiAnTXlQb2xpY3knLFxuICBkZWZhdWx0VHRsOiBEdXJhdGlvbi5taW51dGVzKDApLFxuICBtaW5UdGw6IER1cmF0aW9uLm1pbnV0ZXMoMCksXG4gIG1heFR0bDogRHVyYXRpb24ubWludXRlcygwKSxcbn0pO1xuXG4vLyBBZGQgYmVoYXZpb3Jcbl9jb25zdHJ1Y3QuY2xvdWRGcm9udFdlYkRpc3RyaWJ1dGlvbi5hZGRCZWhhdmlvcignL2ltYWdlcy8qLmpwZycsIG5ldyBvcmlnaW5zLlMzT3JpZ2luKG15YnVja2V0KSwge1xuICBjYWNoZVBvbGljeTogbXlDYWNoZVBvbGljeVxufSk7XG5cbi8vIFN5bnRoXG5hcHAuc3ludGgoKTtcbiJdfQ==
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright
|
|
2
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
3
|
*
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
5
5
|
* with the License. A copy of the License is located at
|
|
@@ -1,90 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"Description": "Integration Test for aws-cloudfront-s3",
|
|
3
3
|
"Resources": {
|
|
4
|
-
"testcloudfronts3S3LoggingBucket90D239DD": {
|
|
5
|
-
"Type": "AWS::S3::Bucket",
|
|
6
|
-
"Properties": {
|
|
7
|
-
"AccessControl": "LogDeliveryWrite",
|
|
8
|
-
"BucketEncryption": {
|
|
9
|
-
"ServerSideEncryptionConfiguration": [
|
|
10
|
-
{
|
|
11
|
-
"ServerSideEncryptionByDefault": {
|
|
12
|
-
"SSEAlgorithm": "AES256"
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
]
|
|
16
|
-
},
|
|
17
|
-
"PublicAccessBlockConfiguration": {
|
|
18
|
-
"BlockPublicAcls": true,
|
|
19
|
-
"BlockPublicPolicy": true,
|
|
20
|
-
"IgnorePublicAcls": true,
|
|
21
|
-
"RestrictPublicBuckets": true
|
|
22
|
-
},
|
|
23
|
-
"VersioningConfiguration": {
|
|
24
|
-
"Status": "Enabled"
|
|
25
|
-
}
|
|
26
|
-
},
|
|
27
|
-
"UpdateReplacePolicy": "Delete",
|
|
28
|
-
"DeletionPolicy": "Delete",
|
|
29
|
-
"Metadata": {
|
|
30
|
-
"cfn_nag": {
|
|
31
|
-
"rules_to_suppress": [
|
|
32
|
-
{
|
|
33
|
-
"id": "W35",
|
|
34
|
-
"reason": "This S3 bucket is used as the access logging bucket for another bucket"
|
|
35
|
-
}
|
|
36
|
-
]
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
},
|
|
40
|
-
"testcloudfronts3S3LoggingBucketPolicy529D4CFF": {
|
|
41
|
-
"Type": "AWS::S3::BucketPolicy",
|
|
42
|
-
"Properties": {
|
|
43
|
-
"Bucket": {
|
|
44
|
-
"Ref": "testcloudfronts3S3LoggingBucket90D239DD"
|
|
45
|
-
},
|
|
46
|
-
"PolicyDocument": {
|
|
47
|
-
"Statement": [
|
|
48
|
-
{
|
|
49
|
-
"Action": "*",
|
|
50
|
-
"Condition": {
|
|
51
|
-
"Bool": {
|
|
52
|
-
"aws:SecureTransport": "false"
|
|
53
|
-
}
|
|
54
|
-
},
|
|
55
|
-
"Effect": "Deny",
|
|
56
|
-
"Principal": {
|
|
57
|
-
"AWS": "*"
|
|
58
|
-
},
|
|
59
|
-
"Resource": [
|
|
60
|
-
{
|
|
61
|
-
"Fn::Join": [
|
|
62
|
-
"",
|
|
63
|
-
[
|
|
64
|
-
{
|
|
65
|
-
"Fn::GetAtt": [
|
|
66
|
-
"testcloudfronts3S3LoggingBucket90D239DD",
|
|
67
|
-
"Arn"
|
|
68
|
-
]
|
|
69
|
-
},
|
|
70
|
-
"/*"
|
|
71
|
-
]
|
|
72
|
-
]
|
|
73
|
-
},
|
|
74
|
-
{
|
|
75
|
-
"Fn::GetAtt": [
|
|
76
|
-
"testcloudfronts3S3LoggingBucket90D239DD",
|
|
77
|
-
"Arn"
|
|
78
|
-
]
|
|
79
|
-
}
|
|
80
|
-
],
|
|
81
|
-
"Sid": "HttpsOnly"
|
|
82
|
-
}
|
|
83
|
-
],
|
|
84
|
-
"Version": "2012-10-17"
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
},
|
|
88
4
|
"testcloudfronts3S3BucketE0C5F76E": {
|
|
89
5
|
"Type": "AWS::S3::Bucket",
|
|
90
6
|
"Properties": {
|
|
@@ -110,11 +26,6 @@
|
|
|
110
26
|
}
|
|
111
27
|
]
|
|
112
28
|
},
|
|
113
|
-
"LoggingConfiguration": {
|
|
114
|
-
"DestinationBucketName": {
|
|
115
|
-
"Ref": "testcloudfronts3S3LoggingBucket90D239DD"
|
|
116
|
-
}
|
|
117
|
-
},
|
|
118
29
|
"PublicAccessBlockConfiguration": {
|
|
119
30
|
"BlockPublicAcls": true,
|
|
120
31
|
"BlockPublicPolicy": true,
|
|
@@ -126,7 +37,17 @@
|
|
|
126
37
|
}
|
|
127
38
|
},
|
|
128
39
|
"UpdateReplacePolicy": "Delete",
|
|
129
|
-
"DeletionPolicy": "Delete"
|
|
40
|
+
"DeletionPolicy": "Delete",
|
|
41
|
+
"Metadata": {
|
|
42
|
+
"cfn_nag": {
|
|
43
|
+
"rules_to_suppress": [
|
|
44
|
+
{
|
|
45
|
+
"id": "W35",
|
|
46
|
+
"reason": "This S3 bucket is created for unit/ integration testing purposes only."
|
|
47
|
+
}
|
|
48
|
+
]
|
|
49
|
+
}
|
|
50
|
+
}
|
|
130
51
|
},
|
|
131
52
|
"testcloudfronts3S3BucketPolicy250F1F61": {
|
|
132
53
|
"Type": "AWS::S3::BucketPolicy",
|
|
@@ -137,7 +58,7 @@
|
|
|
137
58
|
"PolicyDocument": {
|
|
138
59
|
"Statement": [
|
|
139
60
|
{
|
|
140
|
-
"Action": "
|
|
61
|
+
"Action": "s3:*",
|
|
141
62
|
"Condition": {
|
|
142
63
|
"Bool": {
|
|
143
64
|
"aws:SecureTransport": "false"
|
|
@@ -148,6 +69,12 @@
|
|
|
148
69
|
"AWS": "*"
|
|
149
70
|
},
|
|
150
71
|
"Resource": [
|
|
72
|
+
{
|
|
73
|
+
"Fn::GetAtt": [
|
|
74
|
+
"testcloudfronts3S3BucketE0C5F76E",
|
|
75
|
+
"Arn"
|
|
76
|
+
]
|
|
77
|
+
},
|
|
151
78
|
{
|
|
152
79
|
"Fn::Join": [
|
|
153
80
|
"",
|
|
@@ -161,15 +88,8 @@
|
|
|
161
88
|
"/*"
|
|
162
89
|
]
|
|
163
90
|
]
|
|
164
|
-
},
|
|
165
|
-
{
|
|
166
|
-
"Fn::GetAtt": [
|
|
167
|
-
"testcloudfronts3S3BucketE0C5F76E",
|
|
168
|
-
"Arn"
|
|
169
|
-
]
|
|
170
91
|
}
|
|
171
|
-
]
|
|
172
|
-
"Sid": "HttpsOnly"
|
|
92
|
+
]
|
|
173
93
|
},
|
|
174
94
|
{
|
|
175
95
|
"Action": "s3:GetObject",
|
|
@@ -269,7 +189,7 @@
|
|
|
269
189
|
"PolicyDocument": {
|
|
270
190
|
"Statement": [
|
|
271
191
|
{
|
|
272
|
-
"Action": "
|
|
192
|
+
"Action": "s3:*",
|
|
273
193
|
"Condition": {
|
|
274
194
|
"Bool": {
|
|
275
195
|
"aws:SecureTransport": "false"
|
|
@@ -280,6 +200,12 @@
|
|
|
280
200
|
"AWS": "*"
|
|
281
201
|
},
|
|
282
202
|
"Resource": [
|
|
203
|
+
{
|
|
204
|
+
"Fn::GetAtt": [
|
|
205
|
+
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
206
|
+
"Arn"
|
|
207
|
+
]
|
|
208
|
+
},
|
|
283
209
|
{
|
|
284
210
|
"Fn::Join": [
|
|
285
211
|
"",
|
|
@@ -293,15 +219,8 @@
|
|
|
293
219
|
"/*"
|
|
294
220
|
]
|
|
295
221
|
]
|
|
296
|
-
},
|
|
297
|
-
{
|
|
298
|
-
"Fn::GetAtt": [
|
|
299
|
-
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
300
|
-
"Arn"
|
|
301
|
-
]
|
|
302
222
|
}
|
|
303
|
-
]
|
|
304
|
-
"Sid": "HttpsOnly"
|
|
223
|
+
]
|
|
305
224
|
}
|
|
306
225
|
],
|
|
307
226
|
"Version": "2012-10-17"
|
|
@@ -391,7 +310,7 @@
|
|
|
391
310
|
"BootstrapVersion": {
|
|
392
311
|
"Type": "AWS::SSM::Parameter::Value<String>",
|
|
393
312
|
"Default": "/cdk-bootstrap/hnb659fds/version",
|
|
394
|
-
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
|
|
313
|
+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
|
|
395
314
|
}
|
|
396
315
|
},
|
|
397
316
|
"Rules": {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Copyright
|
|
3
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
6
|
* with the License. A copy of the License is located at
|
|
@@ -16,15 +16,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
17
17
|
const lib_1 = require("../lib");
|
|
18
18
|
const core_1 = require("@aws-solutions-constructs/core");
|
|
19
|
+
const defaults = require("@aws-solutions-constructs/core");
|
|
19
20
|
// Setup
|
|
20
21
|
const app = new aws_cdk_lib_1.App();
|
|
21
22
|
const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filename));
|
|
22
23
|
stack.templateOptions.description = 'Integration Test for aws-cloudfront-s3';
|
|
23
|
-
new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
|
|
24
|
+
const construct = new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
|
|
24
25
|
bucketProps: {
|
|
25
26
|
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
|
|
26
|
-
}
|
|
27
|
+
},
|
|
28
|
+
logS3AccessLogs: false
|
|
27
29
|
});
|
|
30
|
+
const s3Bucket = construct.s3Bucket;
|
|
31
|
+
defaults.addCfnSuppressRules(s3Bucket, [
|
|
32
|
+
{ id: 'W35',
|
|
33
|
+
reason: 'This S3 bucket is created for unit/ integration testing purposes only.' },
|
|
34
|
+
]);
|
|
28
35
|
// Synth
|
|
29
36
|
app.synth();
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubm8tYXJndW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcubm8tYXJndW1lbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1YsNkNBQXdEO0FBQ3hELGdDQUF3QztBQUN4Qyx5REFBd0U7QUFFeEUsMkRBQTJEO0FBRTNELFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLGlCQUFHLEVBQUUsQ0FBQztBQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLG1CQUFLLENBQUMsR0FBRyxFQUFFLDZCQUFzQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFDakUsS0FBSyxDQUFDLGVBQWUsQ0FBQyxXQUFXLEdBQUcsd0NBQXdDLENBQUM7QUFFN0UsTUFBTSxTQUFTLEdBQUcsSUFBSSxvQkFBYyxDQUFDLEtBQUssRUFBRSxvQkFBb0IsRUFBRTtJQUNoRSxXQUFXLEVBQUU7UUFDWCxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO0tBQ3JDO0lBQ0QsZUFBZSxFQUFFLEtBQUs7Q0FDdkIsQ0FBQyxDQUFDO0FBRUgsTUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLFFBQXFCLENBQUM7QUFFakQsUUFBUSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsRUFBRTtJQUNyQyxFQUFFLEVBQUUsRUFBRSxLQUFLO1FBQ1QsTUFBTSxFQUFFLHdFQUF3RSxFQUFFO0NBQ3JGLENBQUMsQ0FBQztBQUVILFFBQVE7QUFDUixHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCB7IEFwcCwgU3RhY2ssIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENsb3VkRnJvbnRUb1MzIH0gZnJvbSBcIi4uL2xpYlwiO1xuaW1wb3J0IHsgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZSB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5pbXBvcnQgKiBhcyBzMyBmcm9tIFwiYXdzLWNkay1saWIvYXdzLXMzXCI7XG5pbXBvcnQgKiBhcyBkZWZhdWx0cyBmcm9tICdAYXdzLXNvbHV0aW9ucy1jb25zdHJ1Y3RzL2NvcmUnO1xuXG4vLyBTZXR1cFxuY29uc3QgYXBwID0gbmV3IEFwcCgpO1xuY29uc3Qgc3RhY2sgPSBuZXcgU3RhY2soYXBwLCBnZW5lcmF0ZUludGVnU3RhY2tOYW1lKF9fZmlsZW5hbWUpKTtcbnN0YWNrLnRlbXBsYXRlT3B0aW9ucy5kZXNjcmlwdGlvbiA9ICdJbnRlZ3JhdGlvbiBUZXN0IGZvciBhd3MtY2xvdWRmcm9udC1zMyc7XG5cbmNvbnN0IGNvbnN0cnVjdCA9IG5ldyBDbG91ZEZyb250VG9TMyhzdGFjaywgJ3Rlc3QtY2xvdWRmcm9udC1zMycsIHtcbiAgYnVja2V0UHJvcHM6IHtcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gIH0sXG4gIGxvZ1MzQWNjZXNzTG9nczogZmFsc2Vcbn0pO1xuXG5jb25zdCBzM0J1Y2tldCA9IGNvbnN0cnVjdC5zM0J1Y2tldCBhcyBzMy5CdWNrZXQ7XG5cbmRlZmF1bHRzLmFkZENmblN1cHByZXNzUnVsZXMoczNCdWNrZXQsIFtcbiAgeyBpZDogJ1czNScsXG4gICAgcmVhc29uOiAnVGhpcyBTMyBidWNrZXQgaXMgY3JlYXRlZCBmb3IgdW5pdC8gaW50ZWdyYXRpb24gdGVzdGluZyBwdXJwb3NlcyBvbmx5LicgfSxcbl0pO1xuXG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7XG4iXX0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright
|
|
2
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
3
|
*
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
5
5
|
* with the License. A copy of the License is located at
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"PolicyDocument": {
|
|
47
47
|
"Statement": [
|
|
48
48
|
{
|
|
49
|
-
"Action": "
|
|
49
|
+
"Action": "s3:*",
|
|
50
50
|
"Condition": {
|
|
51
51
|
"Bool": {
|
|
52
52
|
"aws:SecureTransport": "false"
|
|
@@ -57,6 +57,12 @@
|
|
|
57
57
|
"AWS": "*"
|
|
58
58
|
},
|
|
59
59
|
"Resource": [
|
|
60
|
+
{
|
|
61
|
+
"Fn::GetAtt": [
|
|
62
|
+
"testcloudfronts3nosecurityheadersS3LoggingBucketF644B35F",
|
|
63
|
+
"Arn"
|
|
64
|
+
]
|
|
65
|
+
},
|
|
60
66
|
{
|
|
61
67
|
"Fn::Join": [
|
|
62
68
|
"",
|
|
@@ -70,15 +76,8 @@
|
|
|
70
76
|
"/*"
|
|
71
77
|
]
|
|
72
78
|
]
|
|
73
|
-
},
|
|
74
|
-
{
|
|
75
|
-
"Fn::GetAtt": [
|
|
76
|
-
"testcloudfronts3nosecurityheadersS3LoggingBucketF644B35F",
|
|
77
|
-
"Arn"
|
|
78
|
-
]
|
|
79
79
|
}
|
|
80
|
-
]
|
|
81
|
-
"Sid": "HttpsOnly"
|
|
80
|
+
]
|
|
82
81
|
}
|
|
83
82
|
],
|
|
84
83
|
"Version": "2012-10-17"
|
|
@@ -137,7 +136,7 @@
|
|
|
137
136
|
"PolicyDocument": {
|
|
138
137
|
"Statement": [
|
|
139
138
|
{
|
|
140
|
-
"Action": "
|
|
139
|
+
"Action": "s3:*",
|
|
141
140
|
"Condition": {
|
|
142
141
|
"Bool": {
|
|
143
142
|
"aws:SecureTransport": "false"
|
|
@@ -148,6 +147,12 @@
|
|
|
148
147
|
"AWS": "*"
|
|
149
148
|
},
|
|
150
149
|
"Resource": [
|
|
150
|
+
{
|
|
151
|
+
"Fn::GetAtt": [
|
|
152
|
+
"testcloudfronts3nosecurityheadersS3Bucket4D06173D",
|
|
153
|
+
"Arn"
|
|
154
|
+
]
|
|
155
|
+
},
|
|
151
156
|
{
|
|
152
157
|
"Fn::Join": [
|
|
153
158
|
"",
|
|
@@ -161,15 +166,8 @@
|
|
|
161
166
|
"/*"
|
|
162
167
|
]
|
|
163
168
|
]
|
|
164
|
-
},
|
|
165
|
-
{
|
|
166
|
-
"Fn::GetAtt": [
|
|
167
|
-
"testcloudfronts3nosecurityheadersS3Bucket4D06173D",
|
|
168
|
-
"Arn"
|
|
169
|
-
]
|
|
170
169
|
}
|
|
171
|
-
]
|
|
172
|
-
"Sid": "HttpsOnly"
|
|
170
|
+
]
|
|
173
171
|
},
|
|
174
172
|
{
|
|
175
173
|
"Action": "s3:GetObject",
|
|
@@ -257,7 +255,7 @@
|
|
|
257
255
|
"PolicyDocument": {
|
|
258
256
|
"Statement": [
|
|
259
257
|
{
|
|
260
|
-
"Action": "
|
|
258
|
+
"Action": "s3:*",
|
|
261
259
|
"Condition": {
|
|
262
260
|
"Bool": {
|
|
263
261
|
"aws:SecureTransport": "false"
|
|
@@ -268,6 +266,12 @@
|
|
|
268
266
|
"AWS": "*"
|
|
269
267
|
},
|
|
270
268
|
"Resource": [
|
|
269
|
+
{
|
|
270
|
+
"Fn::GetAtt": [
|
|
271
|
+
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucket92A5E2A5",
|
|
272
|
+
"Arn"
|
|
273
|
+
]
|
|
274
|
+
},
|
|
271
275
|
{
|
|
272
276
|
"Fn::Join": [
|
|
273
277
|
"",
|
|
@@ -281,15 +285,8 @@
|
|
|
281
285
|
"/*"
|
|
282
286
|
]
|
|
283
287
|
]
|
|
284
|
-
},
|
|
285
|
-
{
|
|
286
|
-
"Fn::GetAtt": [
|
|
287
|
-
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucket92A5E2A5",
|
|
288
|
-
"Arn"
|
|
289
|
-
]
|
|
290
288
|
}
|
|
291
|
-
]
|
|
292
|
-
"Sid": "HttpsOnly"
|
|
289
|
+
]
|
|
293
290
|
}
|
|
294
291
|
],
|
|
295
292
|
"Version": "2012-10-17"
|
|
@@ -368,7 +365,7 @@
|
|
|
368
365
|
"BootstrapVersion": {
|
|
369
366
|
"Type": "AWS::SSM::Parameter::Value<String>",
|
|
370
367
|
"Default": "/cdk-bootstrap/hnb659fds/version",
|
|
371
|
-
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
|
|
368
|
+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
|
|
372
369
|
}
|
|
373
370
|
},
|
|
374
371
|
"Rules": {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Copyright
|
|
3
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
6
|
* with the License. A copy of the License is located at
|
|
@@ -30,4 +30,4 @@ const props = {
|
|
|
30
30
|
new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3-no-security-headers', props);
|
|
31
31
|
// Synth
|
|
32
32
|
app.synth();
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubm8tc2VjdXJpdHktaGVhZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImludGVnLm5vLXNlY3VyaXR5LWhlYWRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOztBQUVILFVBQVU7QUFDViw2Q0FBd0Q7QUFDeEQsZ0NBQTZEO0FBQzdELHlEQUF3RTtBQUV4RSxRQUFRO0FBQ1IsTUFBTSxHQUFHLEdBQUcsSUFBSSxpQkFBRyxFQUFFLENBQUM7QUFDdEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxtQkFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLEtBQUssQ0FBQyxlQUFlLENBQUMsV0FBVyxHQUFHLHdDQUF3QyxDQUFDO0FBRTdFLGNBQWM7QUFDZCxNQUFNLEtBQUssR0FBd0I7SUFDakMseUJBQXlCLEVBQUUsS0FBSztJQUNoQyxXQUFXLEVBQUU7UUFDWCxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO0tBQ3JDO0NBQ0YsQ0FBQztBQUVGLElBQUksb0JBQWMsQ0FBQyxLQUFLLEVBQUUsd0NBQXdDLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFFM0UsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjaywgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvUzMsIENsb3VkRnJvbnRUb1MzUHJvcHMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5zdGFjay50ZW1wbGF0ZU9wdGlvbnMuZGVzY3JpcHRpb24gPSAnSW50ZWdyYXRpb24gVGVzdCBmb3IgYXdzLWNsb3VkZnJvbnQtczMnO1xuXG4vLyBEZWZpbml0aW9uc1xuY29uc3QgcHJvcHM6IENsb3VkRnJvbnRUb1MzUHJvcHMgPSB7XG4gIGluc2VydEh0dHBTZWN1cml0eUhlYWRlcnM6IGZhbHNlLFxuICBidWNrZXRQcm9wczoge1xuICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgfVxufTtcblxubmV3IENsb3VkRnJvbnRUb1MzKHN0YWNrLCAndGVzdC1jbG91ZGZyb250LXMzLW5vLXNlY3VyaXR5LWhlYWRlcnMnLCBwcm9wcyk7XG5cbi8vIFN5bnRoXG5hcHAuc3ludGgoKTtcbiJdfQ==
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright
|
|
2
|
+
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
3
|
*
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
5
5
|
* with the License. A copy of the License is located at
|