@aws-solutions-constructs/aws-cloudfront-s3 1.146.0 → 1.147.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 +10 -10
- package/lib/index.js +1 -1
- package/package.json +16 -16
- package/test/integ.custom-originPath.expected.json +208 -6
- package/test/integ.custom-originPath.js +11 -2
- package/test/integ.custom-security-headers.expected.json +204 -2
- package/test/integ.custom-security-headers.js +7 -1
- package/test/integ.customCloudFrontLoggingBucket.expected.json +202 -0
- package/test/integ.customCloudFrontLoggingBucket.js +4 -1
- package/test/integ.customLoggingBucket.expected.json +267 -2
- package/test/integ.customLoggingBucket.js +8 -1
- package/test/integ.existing-bucket.expected.json +204 -2
- package/test/integ.existing-bucket.js +10 -2
- package/test/integ.no-arguments.expected.json +204 -2
- package/test/integ.no-arguments.js +7 -1
- package/test/integ.no-security-headers.expected.json +204 -2
- package/test/integ.no-security-headers.js +8 -2
|
@@ -120,6 +120,12 @@
|
|
|
120
120
|
"IgnorePublicAcls": true,
|
|
121
121
|
"RestrictPublicBuckets": true
|
|
122
122
|
},
|
|
123
|
+
"Tags": [
|
|
124
|
+
{
|
|
125
|
+
"Key": "aws-cdk:auto-delete-objects",
|
|
126
|
+
"Value": "true"
|
|
127
|
+
}
|
|
128
|
+
],
|
|
123
129
|
"VersioningConfiguration": {
|
|
124
130
|
"Status": "Enabled"
|
|
125
131
|
}
|
|
@@ -169,6 +175,44 @@
|
|
|
169
175
|
}
|
|
170
176
|
]
|
|
171
177
|
},
|
|
178
|
+
{
|
|
179
|
+
"Action": [
|
|
180
|
+
"s3:GetBucket*",
|
|
181
|
+
"s3:List*",
|
|
182
|
+
"s3:DeleteObject*"
|
|
183
|
+
],
|
|
184
|
+
"Effect": "Allow",
|
|
185
|
+
"Principal": {
|
|
186
|
+
"AWS": {
|
|
187
|
+
"Fn::GetAtt": [
|
|
188
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
189
|
+
"Arn"
|
|
190
|
+
]
|
|
191
|
+
}
|
|
192
|
+
},
|
|
193
|
+
"Resource": [
|
|
194
|
+
{
|
|
195
|
+
"Fn::GetAtt": [
|
|
196
|
+
"testcloudfronts3nosecurityheadersS3Bucket4D06173D",
|
|
197
|
+
"Arn"
|
|
198
|
+
]
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
"Fn::Join": [
|
|
202
|
+
"",
|
|
203
|
+
[
|
|
204
|
+
{
|
|
205
|
+
"Fn::GetAtt": [
|
|
206
|
+
"testcloudfronts3nosecurityheadersS3Bucket4D06173D",
|
|
207
|
+
"Arn"
|
|
208
|
+
]
|
|
209
|
+
},
|
|
210
|
+
"/*"
|
|
211
|
+
]
|
|
212
|
+
]
|
|
213
|
+
}
|
|
214
|
+
]
|
|
215
|
+
},
|
|
172
216
|
{
|
|
173
217
|
"Action": "s3:GetObject",
|
|
174
218
|
"Effect": "Allow",
|
|
@@ -210,6 +254,25 @@
|
|
|
210
254
|
}
|
|
211
255
|
}
|
|
212
256
|
},
|
|
257
|
+
"testcloudfronts3nosecurityheadersS3BucketAutoDeleteObjectsCustomResource7011F955": {
|
|
258
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
259
|
+
"Properties": {
|
|
260
|
+
"ServiceToken": {
|
|
261
|
+
"Fn::GetAtt": [
|
|
262
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
263
|
+
"Arn"
|
|
264
|
+
]
|
|
265
|
+
},
|
|
266
|
+
"BucketName": {
|
|
267
|
+
"Ref": "testcloudfronts3nosecurityheadersS3Bucket4D06173D"
|
|
268
|
+
}
|
|
269
|
+
},
|
|
270
|
+
"DependsOn": [
|
|
271
|
+
"testcloudfronts3nosecurityheadersS3BucketPolicy99D27ED1"
|
|
272
|
+
],
|
|
273
|
+
"UpdateReplacePolicy": "Delete",
|
|
274
|
+
"DeletionPolicy": "Delete"
|
|
275
|
+
},
|
|
213
276
|
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucket92A5E2A5": {
|
|
214
277
|
"Type": "AWS::S3::Bucket",
|
|
215
278
|
"Properties": {
|
|
@@ -229,12 +292,18 @@
|
|
|
229
292
|
"IgnorePublicAcls": true,
|
|
230
293
|
"RestrictPublicBuckets": true
|
|
231
294
|
},
|
|
295
|
+
"Tags": [
|
|
296
|
+
{
|
|
297
|
+
"Key": "aws-cdk:auto-delete-objects",
|
|
298
|
+
"Value": "true"
|
|
299
|
+
}
|
|
300
|
+
],
|
|
232
301
|
"VersioningConfiguration": {
|
|
233
302
|
"Status": "Enabled"
|
|
234
303
|
}
|
|
235
304
|
},
|
|
236
|
-
"UpdateReplacePolicy": "
|
|
237
|
-
"DeletionPolicy": "
|
|
305
|
+
"UpdateReplacePolicy": "Delete",
|
|
306
|
+
"DeletionPolicy": "Delete",
|
|
238
307
|
"Metadata": {
|
|
239
308
|
"cfn_nag": {
|
|
240
309
|
"rules_to_suppress": [
|
|
@@ -287,12 +356,69 @@
|
|
|
287
356
|
]
|
|
288
357
|
}
|
|
289
358
|
]
|
|
359
|
+
},
|
|
360
|
+
{
|
|
361
|
+
"Action": [
|
|
362
|
+
"s3:GetBucket*",
|
|
363
|
+
"s3:List*",
|
|
364
|
+
"s3:DeleteObject*"
|
|
365
|
+
],
|
|
366
|
+
"Effect": "Allow",
|
|
367
|
+
"Principal": {
|
|
368
|
+
"AWS": {
|
|
369
|
+
"Fn::GetAtt": [
|
|
370
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
371
|
+
"Arn"
|
|
372
|
+
]
|
|
373
|
+
}
|
|
374
|
+
},
|
|
375
|
+
"Resource": [
|
|
376
|
+
{
|
|
377
|
+
"Fn::GetAtt": [
|
|
378
|
+
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucket92A5E2A5",
|
|
379
|
+
"Arn"
|
|
380
|
+
]
|
|
381
|
+
},
|
|
382
|
+
{
|
|
383
|
+
"Fn::Join": [
|
|
384
|
+
"",
|
|
385
|
+
[
|
|
386
|
+
{
|
|
387
|
+
"Fn::GetAtt": [
|
|
388
|
+
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucket92A5E2A5",
|
|
389
|
+
"Arn"
|
|
390
|
+
]
|
|
391
|
+
},
|
|
392
|
+
"/*"
|
|
393
|
+
]
|
|
394
|
+
]
|
|
395
|
+
}
|
|
396
|
+
]
|
|
290
397
|
}
|
|
291
398
|
],
|
|
292
399
|
"Version": "2012-10-17"
|
|
293
400
|
}
|
|
294
401
|
}
|
|
295
402
|
},
|
|
403
|
+
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucketAutoDeleteObjectsCustomResource5BEC5CA0": {
|
|
404
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
405
|
+
"Properties": {
|
|
406
|
+
"ServiceToken": {
|
|
407
|
+
"Fn::GetAtt": [
|
|
408
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
409
|
+
"Arn"
|
|
410
|
+
]
|
|
411
|
+
},
|
|
412
|
+
"BucketName": {
|
|
413
|
+
"Ref": "testcloudfronts3nosecurityheadersCloudfrontLoggingBucket92A5E2A5"
|
|
414
|
+
}
|
|
415
|
+
},
|
|
416
|
+
"DependsOn": [
|
|
417
|
+
"testcloudfronts3nosecurityheadersCloudfrontLoggingBucketPolicy7D709982"
|
|
418
|
+
],
|
|
419
|
+
"UpdateReplacePolicy": "Delete",
|
|
420
|
+
"DeletionPolicy": "Delete"
|
|
421
|
+
},
|
|
296
422
|
"testcloudfronts3nosecurityheadersCloudFrontDistributionOrigin1S3Origin38CFDB89": {
|
|
297
423
|
"Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity",
|
|
298
424
|
"Properties": {
|
|
@@ -359,6 +485,82 @@
|
|
|
359
485
|
]
|
|
360
486
|
}
|
|
361
487
|
}
|
|
488
|
+
},
|
|
489
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
|
|
490
|
+
"Type": "AWS::IAM::Role",
|
|
491
|
+
"Properties": {
|
|
492
|
+
"AssumeRolePolicyDocument": {
|
|
493
|
+
"Version": "2012-10-17",
|
|
494
|
+
"Statement": [
|
|
495
|
+
{
|
|
496
|
+
"Action": "sts:AssumeRole",
|
|
497
|
+
"Effect": "Allow",
|
|
498
|
+
"Principal": {
|
|
499
|
+
"Service": "lambda.amazonaws.com"
|
|
500
|
+
}
|
|
501
|
+
}
|
|
502
|
+
]
|
|
503
|
+
},
|
|
504
|
+
"ManagedPolicyArns": [
|
|
505
|
+
{
|
|
506
|
+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
|
|
507
|
+
}
|
|
508
|
+
]
|
|
509
|
+
}
|
|
510
|
+
},
|
|
511
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
|
|
512
|
+
"Type": "AWS::Lambda::Function",
|
|
513
|
+
"Properties": {
|
|
514
|
+
"Code": {
|
|
515
|
+
"S3Bucket": {
|
|
516
|
+
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
|
|
517
|
+
},
|
|
518
|
+
"S3Key": "15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538.zip"
|
|
519
|
+
},
|
|
520
|
+
"Timeout": 900,
|
|
521
|
+
"MemorySize": 128,
|
|
522
|
+
"Handler": "__entrypoint__.handler",
|
|
523
|
+
"Role": {
|
|
524
|
+
"Fn::GetAtt": [
|
|
525
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
526
|
+
"Arn"
|
|
527
|
+
]
|
|
528
|
+
},
|
|
529
|
+
"Runtime": "nodejs12.x",
|
|
530
|
+
"Description": {
|
|
531
|
+
"Fn::Join": [
|
|
532
|
+
"",
|
|
533
|
+
[
|
|
534
|
+
"Lambda function for auto-deleting objects in ",
|
|
535
|
+
{
|
|
536
|
+
"Ref": "testcloudfronts3nosecurityheadersS3Bucket4D06173D"
|
|
537
|
+
},
|
|
538
|
+
" S3 bucket."
|
|
539
|
+
]
|
|
540
|
+
]
|
|
541
|
+
}
|
|
542
|
+
},
|
|
543
|
+
"DependsOn": [
|
|
544
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
|
|
545
|
+
],
|
|
546
|
+
"Metadata": {
|
|
547
|
+
"cfn_nag": {
|
|
548
|
+
"rules_to_suppress": [
|
|
549
|
+
{
|
|
550
|
+
"id": "W58",
|
|
551
|
+
"reason": "CDK generated custom resource"
|
|
552
|
+
},
|
|
553
|
+
{
|
|
554
|
+
"id": "W89",
|
|
555
|
+
"reason": "CDK generated custom resource"
|
|
556
|
+
},
|
|
557
|
+
{
|
|
558
|
+
"id": "W92",
|
|
559
|
+
"reason": "CDK generated custom resource"
|
|
560
|
+
}
|
|
561
|
+
]
|
|
562
|
+
}
|
|
563
|
+
}
|
|
362
564
|
}
|
|
363
565
|
},
|
|
364
566
|
"Parameters": {
|
|
@@ -22,12 +22,18 @@ const stack = new core_1.Stack(app, core_2.generateIntegStackName(__filename));
|
|
|
22
22
|
stack.templateOptions.description = 'Integration Test for aws-cloudfront-s3';
|
|
23
23
|
// Definitions
|
|
24
24
|
const props = {
|
|
25
|
+
cloudFrontLoggingBucketProps: {
|
|
26
|
+
removalPolicy: core_1.RemovalPolicy.DESTROY,
|
|
27
|
+
autoDeleteObjects: true
|
|
28
|
+
},
|
|
25
29
|
insertHttpSecurityHeaders: false,
|
|
26
30
|
bucketProps: {
|
|
27
31
|
removalPolicy: core_1.RemovalPolicy.DESTROY,
|
|
28
|
-
|
|
32
|
+
autoDeleteObjects: true
|
|
33
|
+
},
|
|
29
34
|
};
|
|
30
35
|
new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3-no-security-headers', props);
|
|
36
|
+
core_2.suppressAutoDeleteHandlerWarnings(stack);
|
|
31
37
|
// Synth
|
|
32
38
|
app.synth();
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubm8tc2VjdXJpdHktaGVhZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImludGVnLm5vLXNlY3VyaXR5LWhlYWRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOztBQUVILFVBQVU7QUFDVix3Q0FBMEQ7QUFDMUQsZ0NBQTZEO0FBQzdELHlEQUEyRztBQUUzRyxRQUFRO0FBQ1IsTUFBTSxHQUFHLEdBQUcsSUFBSSxVQUFHLEVBQUUsQ0FBQztBQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLFlBQUssQ0FBQyxHQUFHLEVBQUUsNkJBQXNCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUNqRSxLQUFLLENBQUMsZUFBZSxDQUFDLFdBQVcsR0FBRyx3Q0FBd0MsQ0FBQztBQUU3RSxjQUFjO0FBQ2QsTUFBTSxLQUFLLEdBQXdCO0lBQ2pDLDRCQUE0QixFQUFFO1FBQzVCLGFBQWEsRUFBRSxvQkFBYSxDQUFDLE9BQU87UUFDcEMsaUJBQWlCLEVBQUUsSUFBSTtLQUN4QjtJQUNELHlCQUF5QixFQUFFLEtBQUs7SUFDaEMsV0FBVyxFQUFFO1FBQ1gsYUFBYSxFQUFFLG9CQUFhLENBQUMsT0FBTztRQUNwQyxpQkFBaUIsRUFBRSxJQUFJO0tBQ3hCO0NBQ0YsQ0FBQztBQUVGLElBQUksb0JBQWMsQ0FBQyxLQUFLLEVBQUUsd0NBQXdDLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFFM0Usd0NBQWlDLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDekMsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjaywgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJAYXdzLWNkay9jb3JlXCI7XG5pbXBvcnQgeyBDbG91ZEZyb250VG9TMywgQ2xvdWRGcm9udFRvUzNQcm9wcyB9IGZyb20gXCIuLi9saWJcIjtcbmltcG9ydCB7IGdlbmVyYXRlSW50ZWdTdGFja05hbWUsIHN1cHByZXNzQXV0b0RlbGV0ZUhhbmRsZXJXYXJuaW5ncyB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5cbi8vIFNldHVwXG5jb25zdCBhcHAgPSBuZXcgQXBwKCk7XG5jb25zdCBzdGFjayA9IG5ldyBTdGFjayhhcHAsIGdlbmVyYXRlSW50ZWdTdGFja05hbWUoX19maWxlbmFtZSkpO1xuc3RhY2sudGVtcGxhdGVPcHRpb25zLmRlc2NyaXB0aW9uID0gJ0ludGVncmF0aW9uIFRlc3QgZm9yIGF3cy1jbG91ZGZyb250LXMzJztcblxuLy8gRGVmaW5pdGlvbnNcbmNvbnN0IHByb3BzOiBDbG91ZEZyb250VG9TM1Byb3BzID0ge1xuICBjbG91ZEZyb250TG9nZ2luZ0J1Y2tldFByb3BzOiB7XG4gICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZLFxuICAgIGF1dG9EZWxldGVPYmplY3RzOiB0cnVlXG4gIH0sXG4gIGluc2VydEh0dHBTZWN1cml0eUhlYWRlcnM6IGZhbHNlLFxuICBidWNrZXRQcm9wczoge1xuICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgICBhdXRvRGVsZXRlT2JqZWN0czogdHJ1ZVxuICB9LFxufTtcblxubmV3IENsb3VkRnJvbnRUb1MzKHN0YWNrLCAndGVzdC1jbG91ZGZyb250LXMzLW5vLXNlY3VyaXR5LWhlYWRlcnMnLCBwcm9wcyk7XG5cbnN1cHByZXNzQXV0b0RlbGV0ZUhhbmRsZXJXYXJuaW5ncyhzdGFjayk7XG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7XG4iXX0=
|