@aws-solutions-constructs/aws-cloudfront-s3 2.3.0 → 2.6.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 +112 -8
- package/README.md +20 -9
- package/lib/index.js +1 -1
- package/package.json +7 -7
- 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
package/.jsii
CHANGED
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
"url": "https://aws.amazon.com"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@aws-solutions-constructs/core": "2.
|
|
12
|
-
"aws-cdk-lib": "^2.
|
|
11
|
+
"@aws-solutions-constructs/core": "2.6.0",
|
|
12
|
+
"aws-cdk-lib": "^2.20.0",
|
|
13
13
|
"constructs": "^10.0.0"
|
|
14
14
|
},
|
|
15
15
|
"dependencyClosure": {
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"targets": {
|
|
18
18
|
"dotnet": {
|
|
19
19
|
"iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png",
|
|
20
|
-
"namespace": "Amazon.
|
|
21
|
-
"packageId": "Amazon.
|
|
20
|
+
"namespace": "Amazon.SolutionsConstructs.AWS.Core",
|
|
21
|
+
"packageId": "Amazon.SolutionsConstructs.AWS.Core",
|
|
22
22
|
"signAssembly": true
|
|
23
23
|
},
|
|
24
24
|
"java": {
|
|
@@ -403,6 +403,19 @@
|
|
|
403
403
|
}
|
|
404
404
|
}
|
|
405
405
|
},
|
|
406
|
+
"aws-cdk-lib.aws_billingconductor": {
|
|
407
|
+
"targets": {
|
|
408
|
+
"dotnet": {
|
|
409
|
+
"namespace": "Amazon.CDK.AWS.BillingConductor"
|
|
410
|
+
},
|
|
411
|
+
"java": {
|
|
412
|
+
"package": "software.amazon.awscdk.services.billingconductor"
|
|
413
|
+
},
|
|
414
|
+
"python": {
|
|
415
|
+
"module": "aws_cdk.aws_billingconductor"
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
},
|
|
406
419
|
"aws-cdk-lib.aws_budgets": {
|
|
407
420
|
"targets": {
|
|
408
421
|
"dotnet": {
|
|
@@ -1210,6 +1223,19 @@
|
|
|
1210
1223
|
}
|
|
1211
1224
|
}
|
|
1212
1225
|
},
|
|
1226
|
+
"aws-cdk-lib.aws_forecast": {
|
|
1227
|
+
"targets": {
|
|
1228
|
+
"dotnet": {
|
|
1229
|
+
"namespace": "Amazon.CDK.AWS.Forecast"
|
|
1230
|
+
},
|
|
1231
|
+
"java": {
|
|
1232
|
+
"package": "software.amazon.awscdk.services.forecast"
|
|
1233
|
+
},
|
|
1234
|
+
"python": {
|
|
1235
|
+
"module": "aws_cdk.aws_forecast"
|
|
1236
|
+
}
|
|
1237
|
+
}
|
|
1238
|
+
},
|
|
1213
1239
|
"aws-cdk-lib.aws_frauddetector": {
|
|
1214
1240
|
"targets": {
|
|
1215
1241
|
"dotnet": {
|
|
@@ -1392,6 +1418,19 @@
|
|
|
1392
1418
|
}
|
|
1393
1419
|
}
|
|
1394
1420
|
},
|
|
1421
|
+
"aws-cdk-lib.aws_inspectorv2": {
|
|
1422
|
+
"targets": {
|
|
1423
|
+
"dotnet": {
|
|
1424
|
+
"namespace": "Amazon.CDK.AWS.InspectorV2"
|
|
1425
|
+
},
|
|
1426
|
+
"java": {
|
|
1427
|
+
"package": "software.amazon.awscdk.services.inspectorv2"
|
|
1428
|
+
},
|
|
1429
|
+
"python": {
|
|
1430
|
+
"module": "aws_cdk.aws_inspectorv2"
|
|
1431
|
+
}
|
|
1432
|
+
}
|
|
1433
|
+
},
|
|
1395
1434
|
"aws-cdk-lib.aws_iot": {
|
|
1396
1435
|
"targets": {
|
|
1397
1436
|
"dotnet": {
|
|
@@ -1522,6 +1561,19 @@
|
|
|
1522
1561
|
}
|
|
1523
1562
|
}
|
|
1524
1563
|
},
|
|
1564
|
+
"aws-cdk-lib.aws_kafkaconnect": {
|
|
1565
|
+
"targets": {
|
|
1566
|
+
"dotnet": {
|
|
1567
|
+
"namespace": "Amazon.CDK.AWS.KafkaConnect"
|
|
1568
|
+
},
|
|
1569
|
+
"java": {
|
|
1570
|
+
"package": "software.amazon.awscdk.services.kafkaconnect"
|
|
1571
|
+
},
|
|
1572
|
+
"python": {
|
|
1573
|
+
"module": "aws_cdk.aws_kafkaconnect"
|
|
1574
|
+
}
|
|
1575
|
+
}
|
|
1576
|
+
},
|
|
1525
1577
|
"aws-cdk-lib.aws_kendra": {
|
|
1526
1578
|
"targets": {
|
|
1527
1579
|
"dotnet": {
|
|
@@ -1561,6 +1613,19 @@
|
|
|
1561
1613
|
}
|
|
1562
1614
|
}
|
|
1563
1615
|
},
|
|
1616
|
+
"aws-cdk-lib.aws_kinesisanalyticsv2": {
|
|
1617
|
+
"targets": {
|
|
1618
|
+
"dotnet": {
|
|
1619
|
+
"namespace": "Amazon.CDK.AWS.KinesisAnalyticsV2"
|
|
1620
|
+
},
|
|
1621
|
+
"java": {
|
|
1622
|
+
"package": "software.amazon.awscdk.services.kinesisanalyticsv2"
|
|
1623
|
+
},
|
|
1624
|
+
"python": {
|
|
1625
|
+
"module": "aws_cdk.aws_kinesisanalyticsv2"
|
|
1626
|
+
}
|
|
1627
|
+
}
|
|
1628
|
+
},
|
|
1564
1629
|
"aws-cdk-lib.aws_kinesisfirehose": {
|
|
1565
1630
|
"targets": {
|
|
1566
1631
|
"dotnet": {
|
|
@@ -1574,6 +1639,19 @@
|
|
|
1574
1639
|
}
|
|
1575
1640
|
}
|
|
1576
1641
|
},
|
|
1642
|
+
"aws-cdk-lib.aws_kinesisvideo": {
|
|
1643
|
+
"targets": {
|
|
1644
|
+
"dotnet": {
|
|
1645
|
+
"namespace": "Amazon.CDK.AWS.KinesisVideo"
|
|
1646
|
+
},
|
|
1647
|
+
"java": {
|
|
1648
|
+
"package": "software.amazon.awscdk.services.kinesisvideo"
|
|
1649
|
+
},
|
|
1650
|
+
"python": {
|
|
1651
|
+
"module": "aws_cdk.aws_kinesisvideo"
|
|
1652
|
+
}
|
|
1653
|
+
}
|
|
1654
|
+
},
|
|
1577
1655
|
"aws-cdk-lib.aws_kms": {
|
|
1578
1656
|
"targets": {
|
|
1579
1657
|
"dotnet": {
|
|
@@ -2003,6 +2081,19 @@
|
|
|
2003
2081
|
}
|
|
2004
2082
|
}
|
|
2005
2083
|
},
|
|
2084
|
+
"aws-cdk-lib.aws_personalize": {
|
|
2085
|
+
"targets": {
|
|
2086
|
+
"dotnet": {
|
|
2087
|
+
"namespace": "Amazon.CDK.AWS.Personalize"
|
|
2088
|
+
},
|
|
2089
|
+
"java": {
|
|
2090
|
+
"package": "software.amazon.awscdk.services.personalize"
|
|
2091
|
+
},
|
|
2092
|
+
"python": {
|
|
2093
|
+
"module": "aws_cdk.aws_personalize"
|
|
2094
|
+
}
|
|
2095
|
+
}
|
|
2096
|
+
},
|
|
2006
2097
|
"aws-cdk-lib.aws_pinpoint": {
|
|
2007
2098
|
"targets": {
|
|
2008
2099
|
"dotnet": {
|
|
@@ -2821,6 +2912,19 @@
|
|
|
2821
2912
|
"module": "aws_cdk.region_info"
|
|
2822
2913
|
}
|
|
2823
2914
|
}
|
|
2915
|
+
},
|
|
2916
|
+
"aws-cdk-lib.triggers": {
|
|
2917
|
+
"targets": {
|
|
2918
|
+
"dotnet": {
|
|
2919
|
+
"namespace": "Amazon.CDK.Triggers"
|
|
2920
|
+
},
|
|
2921
|
+
"java": {
|
|
2922
|
+
"package": "software.amazon.awscdk.triggers"
|
|
2923
|
+
},
|
|
2924
|
+
"python": {
|
|
2925
|
+
"module": "aws_cdk.triggers"
|
|
2926
|
+
}
|
|
2927
|
+
}
|
|
2824
2928
|
}
|
|
2825
2929
|
},
|
|
2826
2930
|
"targets": {
|
|
@@ -2877,7 +2981,7 @@
|
|
|
2877
2981
|
},
|
|
2878
2982
|
"description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
|
|
2879
2983
|
"homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
|
|
2880
|
-
"jsiiVersion": "1.
|
|
2984
|
+
"jsiiVersion": "1.58.0 (build f8ba112)",
|
|
2881
2985
|
"keywords": [
|
|
2882
2986
|
"aws",
|
|
2883
2987
|
"cdk",
|
|
@@ -2896,7 +3000,7 @@
|
|
|
2896
3000
|
},
|
|
2897
3001
|
"name": "@aws-solutions-constructs/aws-cloudfront-s3",
|
|
2898
3002
|
"readme": {
|
|
2899
|
-
"markdown": "# aws-cloudfront-s3 module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language** | **Package** |\n|:-------------|-----------------|\n| Python|`aws_solutions_constructs.aws_cloudfront_s3`|\n| Typescript|`@aws-solutions-constructs/aws-cloudfront-s3`|\n| Java|`software.amazon.awsconstructs.services.cloudfronts3`|\n\nThis AWS Solutions Construct implements an AWS CloudFront fronting an AWS S3 Bucket.\n\nHere is a minimal deployable pattern definition
|
|
3003
|
+
"markdown": "# aws-cloudfront-s3 module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language** | **Package** |\n|:-------------|-----------------|\n| Python|`aws_solutions_constructs.aws_cloudfront_s3`|\n| Typescript|`@aws-solutions-constructs/aws-cloudfront-s3`|\n| Java|`software.amazon.awsconstructs.services.cloudfronts3`|\n\nThis AWS Solutions Construct implements an AWS CloudFront fronting an AWS S3 Bucket.\n\nHere is a minimal deployable pattern definition:\n\nTypescript\n``` typescript\nimport { Construct } from 'constructs';\nimport { Stack, StackProps } from 'aws-cdk-lib';\nimport { CloudFrontToS3 } from '@aws-solutions-constructs/aws-cloudfront-s3';\n\nnew CloudFrontToS3(this, 'test-cloudfront-s3', {});\n```\n\nPython\n``` python\nfrom aws_solutions_constructs.aws_cloudfront_s3 import CloudFrontToS3\nfrom aws_cdk import Stack\nfrom constructs import Construct\n\nCloudFrontToS3(self, 'test-cloudfront-s3')\n```\n\nJava\n``` java\nimport software.constructs.Construct;\n\nimport software.amazon.awscdk.Stack;\nimport software.amazon.awscdk.StackProps;\nimport software.amazon.awsconstructs.services.cloudfronts3.*;\n\nnew CloudFrontToS3(this, \"test-cloudfront-s3\", new CloudFrontToS3Props.Builder()\n .build());\n```\n\n## Pattern Construct Props\n\n| **Name** | **Type** | **Description** |\n|:-------------|:----------------|-----------------|\n|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Existing instance of S3 Bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |\n|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Bucket.|\n|cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|\n|insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|\n|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront-origins.S3OriginProps.html#originpath) that CloudFront appends to the origin domain name when CloudFront requests content from the origin. The string should start with a `/`, for example: `/production`. Default value is `'/'`|\n|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|\n|cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket.|\n|logS3AccessLogs?| boolean|Whether to turn on Access Logging for the S3 bucket. Creates an S3 bucket with associated storage costs for the logs. Enabling Access Logging is a best practice. default - true|\n\n## Pattern Properties\n\n| **Name** | **Type** | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontWebDistribution|[`cloudfront.CloudFrontWebDistribution`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.CloudFrontWebDistribution.html)|Returns an instance of cloudfront.CloudFrontWebDistribution created by the construct|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the pattern.|\n|cloudFrontLoggingBucket|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-s3-readme.html)|Returns an instance of the logging bucket for CloudFront WebDistribution.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct|\n|s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct. IMPORTANT: If existingBucketObj was provided in Pattern Construct Props, this property will be `undefined`|\n|s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon CloudFront\n* Configure Access logging for CloudFront WebDistribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront WebDistribution\n* CloudFront originPath set to `'/'`\n\n### Amazon S3 Bucket\n* Configure Access logging for S3 Bucket\n* Enable server-side encryption for S3 Bucket using AWS managed KMS Key\n* Enforce encryption of data in transit\n* Turn on the versioning for S3 Bucket\n* Don't allow public access for S3 Bucket\n* Retain the S3 Bucket when deleting the CloudFormation stack\n* Applies Lifecycle rule to move noncurrent object versions to Glacier storage after 90 days\n\n## Architecture\n\n\n***\n© Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
|
|
2900
3004
|
},
|
|
2901
3005
|
"repository": {
|
|
2902
3006
|
"directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-s3",
|
|
@@ -3213,6 +3317,6 @@
|
|
|
3213
3317
|
"symbolId": "lib/index:CloudFrontToS3Props"
|
|
3214
3318
|
}
|
|
3215
3319
|
},
|
|
3216
|
-
"version": "2.
|
|
3217
|
-
"fingerprint": "
|
|
3320
|
+
"version": "2.6.0",
|
|
3321
|
+
"fingerprint": "n9uZaLP2ORZRrTlVj4WM80yQJTSCbGLyxAxY8OF4F/E="
|
|
3218
3322
|
}
|
package/README.md
CHANGED
|
@@ -20,26 +20,37 @@
|
|
|
20
20
|
|
|
21
21
|
This AWS Solutions Construct implements an AWS CloudFront fronting an AWS S3 Bucket.
|
|
22
22
|
|
|
23
|
-
Here is a minimal deployable pattern definition
|
|
23
|
+
Here is a minimal deployable pattern definition:
|
|
24
24
|
|
|
25
|
+
Typescript
|
|
25
26
|
``` typescript
|
|
27
|
+
import { Construct } from 'constructs';
|
|
28
|
+
import { Stack, StackProps } from 'aws-cdk-lib';
|
|
26
29
|
import { CloudFrontToS3 } from '@aws-solutions-constructs/aws-cloudfront-s3';
|
|
27
30
|
|
|
28
31
|
new CloudFrontToS3(this, 'test-cloudfront-s3', {});
|
|
29
|
-
|
|
30
32
|
```
|
|
31
33
|
|
|
32
|
-
|
|
34
|
+
Python
|
|
35
|
+
``` python
|
|
36
|
+
from aws_solutions_constructs.aws_cloudfront_s3 import CloudFrontToS3
|
|
37
|
+
from aws_cdk import Stack
|
|
38
|
+
from constructs import Construct
|
|
33
39
|
|
|
34
|
-
|
|
35
|
-
new CloudFrontToS3(scope: Construct, id: string, props: CloudFrontToS3Props);
|
|
40
|
+
CloudFrontToS3(self, 'test-cloudfront-s3')
|
|
36
41
|
```
|
|
37
42
|
|
|
38
|
-
|
|
43
|
+
Java
|
|
44
|
+
``` java
|
|
45
|
+
import software.constructs.Construct;
|
|
46
|
+
|
|
47
|
+
import software.amazon.awscdk.Stack;
|
|
48
|
+
import software.amazon.awscdk.StackProps;
|
|
49
|
+
import software.amazon.awsconstructs.services.cloudfronts3.*;
|
|
39
50
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
51
|
+
new CloudFrontToS3(this, "test-cloudfront-s3", new CloudFrontToS3Props.Builder()
|
|
52
|
+
.build());
|
|
53
|
+
```
|
|
43
54
|
|
|
44
55
|
## Pattern Construct Props
|
|
45
56
|
|
package/lib/index.js
CHANGED
|
@@ -37,5 +37,5 @@ class CloudFrontToS3 extends constructs_1.Construct {
|
|
|
37
37
|
}
|
|
38
38
|
exports.CloudFrontToS3 = CloudFrontToS3;
|
|
39
39
|
_a = JSII_RTTI_SYMBOL_1;
|
|
40
|
-
CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.
|
|
40
|
+
CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.6.0" };
|
|
41
41
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWVBLHdGQUF3RjtBQUN4RiwyQ0FBdUM7QUFDdkMsMkRBQTJEO0FBMkQzRCxNQUFhLGNBQWUsU0FBUSxzQkFBUztJQVEzQzs7Ozs7OztPQU9HO0lBQ0gsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUEwQjtRQUNsRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFM0IsSUFBSSxNQUFrQixDQUFDO1FBRXZCLElBQUksQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEVBQUU7WUFDNUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtnQkFDbkUsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO2dCQUM5QixrQkFBa0IsRUFBRSxLQUFLLENBQUMsa0JBQWtCO2dCQUM1QyxlQUFlLEVBQUUsS0FBSyxDQUFDLGVBQWU7YUFDdkMsQ0FBQyxDQUFDO1lBQ0gsTUFBTSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7U0FDeEI7YUFBTTtZQUNMLE1BQU0sR0FBRyxLQUFLLENBQUMsaUJBQWlCLENBQUM7U0FDbEM7UUFFRCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsTUFBTSxDQUFDO1FBRWhDLENBQUMsSUFBSSxDQUFDLHlCQUF5QixFQUFFLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxJQUFJLENBQUMsdUJBQXVCLENBQUM7WUFDckYsUUFBUSxDQUFDLDJCQUEyQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQy9ELEtBQUssQ0FBQywyQkFBMkIsRUFBRSxLQUFLLENBQUMseUJBQXlCLEVBQUUsS0FBSyxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUNoSSxDQUFDOztBQXRDSCx3Q0F3Q0MiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbmltcG9ydCAqIGFzIGNsb3VkZnJvbnQgZnJvbSAnYXdzLWNkay1saWIvYXdzLWNsb3VkZnJvbnQnO1xuaW1wb3J0ICogYXMgczMgZnJvbSAnYXdzLWNkay1saWIvYXdzLXMzJztcbi8vIE5vdGU6IFRvIGVuc3VyZSBDREt2MiBjb21wYXRpYmlsaXR5LCBrZWVwIHRoZSBpbXBvcnQgc3RhdGVtZW50IGZvciBDb25zdHJ1Y3Qgc2VwYXJhdGVcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0ICogYXMgZGVmYXVsdHMgZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuLyoqXG4gKiBAc3VtbWFyeSBUaGUgcHJvcGVydGllcyBmb3IgdGhlIENsb3VkRnJvbnRUb1MzIENvbnN0cnVjdFxuICovXG5leHBvcnQgaW50ZXJmYWNlIENsb3VkRnJvbnRUb1MzUHJvcHMge1xuICAvKipcbiAgICogRXhpc3RpbmcgaW5zdGFuY2Ugb2YgUzMgQnVja2V0IG9iamVjdCwgcHJvdmlkaW5nIGJvdGggdGhpcyBhbmQgYGJ1Y2tldFByb3BzYCB3aWxsIGNhdXNlIGFuIGVycm9yLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIE5vbmVcbiAgICovXG4gIHJlYWRvbmx5IGV4aXN0aW5nQnVja2V0T2JqPzogczMuSUJ1Y2tldCxcbiAgLyoqXG4gICAqIE9wdGlvbmFsIHVzZXIgcHJvdmlkZWQgcHJvcHMgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgcHJvcHMgZm9yIHRoZSBTMyBCdWNrZXQuXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gRGVmYXVsdCBwcm9wcyBhcmUgdXNlZFxuICAgKi9cbiAgcmVhZG9ubHkgYnVja2V0UHJvcHM/OiBzMy5CdWNrZXRQcm9wcyxcbiAgLyoqXG4gICAqIE9wdGlvbmFsIHVzZXIgcHJvdmlkZWQgcHJvcHMgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgcHJvcHNcbiAgICpcbiAgICogQGRlZmF1bHQgLSBEZWZhdWx0IHByb3BzIGFyZSB1c2VkXG4gICAqL1xuICByZWFkb25seSBjbG91ZEZyb250RGlzdHJpYnV0aW9uUHJvcHM/OiBjbG91ZGZyb250LkRpc3RyaWJ1dGlvblByb3BzIHwgYW55LFxuICAvKipcbiAgICogT3B0aW9uYWwgdXNlciBwcm92aWRlZCBwcm9wcyB0byB0dXJuIG9uL29mZiB0aGUgYXV0b21hdGljIGluamVjdGlvbiBvZiBiZXN0IHByYWN0aWNlIEhUVFBcbiAgICogc2VjdXJpdHkgaGVhZGVycyBpbiBhbGwgcmVzcG9uc2VzIGZyb20gY2xvdWRmcm9udFxuICAgKlxuICAgKiBAZGVmYXVsdCAtIHRydWVcbiAgICovXG4gIHJlYWRvbmx5IGluc2VydEh0dHBTZWN1cml0eUhlYWRlcnM/OiBib29sZWFuO1xuICAvKipcbiAgICogT3B0aW9uYWwgdXNlciBwcm92aWRlZCBwcm9wcyB0byBwcm92aWRlIGFuIG9yaWdpblBhdGggdGhhdCBDbG91ZEZyb250IGFwcGVuZHMgdG8gdGhlXG4gICAqIG9yaWdpbiBkb21haW4gbmFtZSB3aGVuIENsb3VkRnJvbnQgcmVxdWVzdHMgY29udGVudCBmcm9tIHRoZSBvcmlnaW4uXG4gICAqIFRoZSBzdHJpbmcgc2hvdWxkIHN0YXJ0IHdpdGggYSBgL2AsIGZvciBleGFtcGxlIGAvcHJvZHVjdGlvbmAuXG4gICAqIEBkYWZhdWx0ID0gJy8nXG4gICAqL1xuICByZWFkb25seSBvcmlnaW5QYXRoPzogc3RyaW5nLFxuICAvKipcbiAgICogT3B0aW9uYWwgdXNlciBwcm92aWRlZCBwcm9wcyB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCBwcm9wcyBmb3IgdGhlIFMzIExvZ2dpbmcgQnVja2V0LlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIERlZmF1bHQgcHJvcHMgYXJlIHVzZWRcbiAgICovXG4gIHJlYWRvbmx5IGxvZ2dpbmdCdWNrZXRQcm9wcz86IHMzLkJ1Y2tldFByb3BzXG4gIC8qKlxuICAgKiBPcHRpb25hbCB1c2VyIHByb3ZpZGVkIHByb3BzIHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHByb3BzIGZvciB0aGUgQ2xvdWRGcm9udCBMb2dnaW5nIEJ1Y2tldC5cbiAgICpcbiAgICogQGRlZmF1bHQgLSBEZWZhdWx0IHByb3BzIGFyZSB1c2VkXG4gICAqL1xuICByZWFkb25seSBjbG91ZEZyb250TG9nZ2luZ0J1Y2tldFByb3BzPzogczMuQnVja2V0UHJvcHNcbiAgLyoqXG4gICAqIFdoZXRoZXIgdG8gdHVybiBvbiBBY2Nlc3MgTG9ncyBmb3IgdGhlIFMzIGJ1Y2tldCB3aXRoIHRoZSBhc3NvY2lhdGVkIHN0b3JhZ2UgY29zdHMuXG4gICAqIEVuYWJsaW5nIEFjY2VzcyBMb2dnaW5nIGlzIGEgYmVzdCBwcmFjdGljZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB0cnVlXG4gICAqL1xuICByZWFkb25seSBsb2dTM0FjY2Vzc0xvZ3M/OiBib29sZWFuO1xufVxuXG5leHBvcnQgY2xhc3MgQ2xvdWRGcm9udFRvUzMgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBwdWJsaWMgcmVhZG9ubHkgY2xvdWRGcm9udFdlYkRpc3RyaWJ1dGlvbjogY2xvdWRmcm9udC5EaXN0cmlidXRpb247XG4gIHB1YmxpYyByZWFkb25seSBjbG91ZEZyb250RnVuY3Rpb24/OiBjbG91ZGZyb250LkZ1bmN0aW9uO1xuICBwdWJsaWMgcmVhZG9ubHkgY2xvdWRGcm9udExvZ2dpbmdCdWNrZXQ/OiBzMy5CdWNrZXQ7XG4gIHB1YmxpYyByZWFkb25seSBzM0J1Y2tldEludGVyZmFjZTogczMuSUJ1Y2tldDtcbiAgcHVibGljIHJlYWRvbmx5IHMzQnVja2V0PzogczMuQnVja2V0O1xuICBwdWJsaWMgcmVhZG9ubHkgczNMb2dnaW5nQnVja2V0PzogczMuQnVja2V0O1xuXG4gIC8qKlxuICAgKiBAc3VtbWFyeSBDb25zdHJ1Y3RzIGEgbmV3IGluc3RhbmNlIG9mIHRoZSBDbG91ZEZyb250VG9TMyBjbGFzcy5cbiAgICogQHBhcmFtIHtjZGsuQXBwfSBzY29wZSAtIHJlcHJlc2VudHMgdGhlIHNjb3BlIGZvciBhbGwgdGhlIHJlc291cmNlcy5cbiAgICogQHBhcmFtIHtzdHJpbmd9IGlkIC0gdGhpcyBpcyBhIGEgc2NvcGUtdW5pcXVlIGlkLlxuICAgKiBAcGFyYW0ge0Nsb3VkRnJvbnRUb1MzUHJvcHN9IHByb3BzIC0gdXNlciBwcm92aWRlZCBwcm9wcyBmb3IgdGhlIGNvbnN0cnVjdFxuICAgKiBAc2luY2UgMC44LjBcbiAgICogQGFjY2VzcyBwdWJsaWNcbiAgICovXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBDbG91ZEZyb250VG9TM1Byb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcbiAgICBkZWZhdWx0cy5DaGVja1Byb3BzKHByb3BzKTtcblxuICAgIGxldCBidWNrZXQ6IHMzLklCdWNrZXQ7XG5cbiAgICBpZiAoIXByb3BzLmV4aXN0aW5nQnVja2V0T2JqKSB7XG4gICAgICBbdGhpcy5zM0J1Y2tldCwgdGhpcy5zM0xvZ2dpbmdCdWNrZXRdID0gZGVmYXVsdHMuYnVpbGRTM0J1Y2tldCh0aGlzLCB7XG4gICAgICAgIGJ1Y2tldFByb3BzOiBwcm9wcy5idWNrZXRQcm9wcyxcbiAgICAgICAgbG9nZ2luZ0J1Y2tldFByb3BzOiBwcm9wcy5sb2dnaW5nQnVja2V0UHJvcHMsXG4gICAgICAgIGxvZ1MzQWNjZXNzTG9nczogcHJvcHMubG9nUzNBY2Nlc3NMb2dzXG4gICAgICB9KTtcbiAgICAgIGJ1Y2tldCA9IHRoaXMuczNCdWNrZXQ7XG4gICAgfSBlbHNlIHtcbiAgICAgIGJ1Y2tldCA9IHByb3BzLmV4aXN0aW5nQnVja2V0T2JqO1xuICAgIH1cblxuICAgIHRoaXMuczNCdWNrZXRJbnRlcmZhY2UgPSBidWNrZXQ7XG5cbiAgICBbdGhpcy5jbG91ZEZyb250V2ViRGlzdHJpYnV0aW9uLCB0aGlzLmNsb3VkRnJvbnRGdW5jdGlvbiwgdGhpcy5jbG91ZEZyb250TG9nZ2luZ0J1Y2tldF0gPVxuICAgICAgZGVmYXVsdHMuQ2xvdWRGcm9udERpc3RyaWJ1dGlvbkZvclMzKHRoaXMsIHRoaXMuczNCdWNrZXRJbnRlcmZhY2UsXG4gICAgICAgIHByb3BzLmNsb3VkRnJvbnREaXN0cmlidXRpb25Qcm9wcywgcHJvcHMuaW5zZXJ0SHR0cFNlY3VyaXR5SGVhZGVycywgcHJvcHMub3JpZ2luUGF0aCwgcHJvcHMuY2xvdWRGcm9udExvZ2dpbmdCdWNrZXRQcm9wcyk7XG4gIH1cblxufVxuIl19
|
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.6.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",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"integ-no-clean": "cdk-integ --no-clean",
|
|
27
27
|
"integ-assert": "cdk-integ-assert-v2",
|
|
28
28
|
"jsii": "jsii",
|
|
29
|
-
"jsii-pacmak": "jsii-pacmak
|
|
29
|
+
"jsii-pacmak": "jsii-pacmak",
|
|
30
30
|
"build+lint+test": "npm run jsii && npm run lint && npm test && npm run integ-assert",
|
|
31
31
|
"snapshot-update": "npm run jsii && npm test -- -u && npm run integ-assert"
|
|
32
32
|
},
|
|
@@ -53,13 +53,13 @@
|
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@aws-solutions-constructs/core": "2.
|
|
56
|
+
"@aws-solutions-constructs/core": "2.6.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@aws-cdk/assert": "2.
|
|
59
|
+
"@aws-cdk/assert": "2.20.0",
|
|
60
60
|
"@types/jest": "^27.4.0",
|
|
61
61
|
"@types/node": "^10.3.0",
|
|
62
|
-
"aws-cdk-lib": "2.
|
|
62
|
+
"aws-cdk-lib": "2.20.0",
|
|
63
63
|
"constructs": "^10.0.0"
|
|
64
64
|
},
|
|
65
65
|
"jest": {
|
|
@@ -77,8 +77,8 @@
|
|
|
77
77
|
]
|
|
78
78
|
},
|
|
79
79
|
"peerDependencies": {
|
|
80
|
-
"@aws-solutions-constructs/core": "2.
|
|
81
|
-
"aws-cdk-lib": "^2.
|
|
80
|
+
"@aws-solutions-constructs/core": "2.6.0",
|
|
81
|
+
"aws-cdk-lib": "^2.20.0",
|
|
82
82
|
"constructs": "^10.0.0"
|
|
83
83
|
},
|
|
84
84
|
"keywords": [
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"Status": "Enabled"
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
|
-
"UpdateReplacePolicy": "
|
|
28
|
-
"DeletionPolicy": "
|
|
27
|
+
"UpdateReplacePolicy": "Delete",
|
|
28
|
+
"DeletionPolicy": "Delete",
|
|
29
29
|
"Metadata": {
|
|
30
30
|
"cfn_nag": {
|
|
31
31
|
"rules_to_suppress": [
|
|
@@ -120,12 +120,18 @@
|
|
|
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
|
}
|
|
126
132
|
},
|
|
127
|
-
"UpdateReplacePolicy": "
|
|
128
|
-
"DeletionPolicy": "
|
|
133
|
+
"UpdateReplacePolicy": "Delete",
|
|
134
|
+
"DeletionPolicy": "Delete"
|
|
129
135
|
},
|
|
130
136
|
"testcloudfronts3S3BucketPolicy250F1F61": {
|
|
131
137
|
"Type": "AWS::S3::BucketPolicy",
|
|
@@ -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
|
+
"testcloudfronts3S3BucketE0C5F76E",
|
|
197
|
+
"Arn"
|
|
198
|
+
]
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
"Fn::Join": [
|
|
202
|
+
"",
|
|
203
|
+
[
|
|
204
|
+
{
|
|
205
|
+
"Fn::GetAtt": [
|
|
206
|
+
"testcloudfronts3S3BucketE0C5F76E",
|
|
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
|
+
"testcloudfronts3S3BucketAutoDeleteObjectsCustomResourceA13DD8F7": {
|
|
258
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
259
|
+
"Properties": {
|
|
260
|
+
"ServiceToken": {
|
|
261
|
+
"Fn::GetAtt": [
|
|
262
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
263
|
+
"Arn"
|
|
264
|
+
]
|
|
265
|
+
},
|
|
266
|
+
"BucketName": {
|
|
267
|
+
"Ref": "testcloudfronts3S3BucketE0C5F76E"
|
|
268
|
+
}
|
|
269
|
+
},
|
|
270
|
+
"DependsOn": [
|
|
271
|
+
"testcloudfronts3S3BucketPolicy250F1F61"
|
|
272
|
+
],
|
|
273
|
+
"UpdateReplacePolicy": "Delete",
|
|
274
|
+
"DeletionPolicy": "Delete"
|
|
275
|
+
},
|
|
213
276
|
"testcloudfronts3SetHttpSecurityHeaders6C5A1E69": {
|
|
214
277
|
"Type": "AWS::CloudFront::Function",
|
|
215
278
|
"Properties": {
|
|
@@ -241,12 +304,18 @@
|
|
|
241
304
|
"IgnorePublicAcls": true,
|
|
242
305
|
"RestrictPublicBuckets": true
|
|
243
306
|
},
|
|
307
|
+
"Tags": [
|
|
308
|
+
{
|
|
309
|
+
"Key": "aws-cdk:auto-delete-objects",
|
|
310
|
+
"Value": "true"
|
|
311
|
+
}
|
|
312
|
+
],
|
|
244
313
|
"VersioningConfiguration": {
|
|
245
314
|
"Status": "Enabled"
|
|
246
315
|
}
|
|
247
316
|
},
|
|
248
|
-
"UpdateReplacePolicy": "
|
|
249
|
-
"DeletionPolicy": "
|
|
317
|
+
"UpdateReplacePolicy": "Delete",
|
|
318
|
+
"DeletionPolicy": "Delete",
|
|
250
319
|
"Metadata": {
|
|
251
320
|
"cfn_nag": {
|
|
252
321
|
"rules_to_suppress": [
|
|
@@ -299,12 +368,69 @@
|
|
|
299
368
|
]
|
|
300
369
|
}
|
|
301
370
|
]
|
|
371
|
+
},
|
|
372
|
+
{
|
|
373
|
+
"Action": [
|
|
374
|
+
"s3:GetBucket*",
|
|
375
|
+
"s3:List*",
|
|
376
|
+
"s3:DeleteObject*"
|
|
377
|
+
],
|
|
378
|
+
"Effect": "Allow",
|
|
379
|
+
"Principal": {
|
|
380
|
+
"AWS": {
|
|
381
|
+
"Fn::GetAtt": [
|
|
382
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
383
|
+
"Arn"
|
|
384
|
+
]
|
|
385
|
+
}
|
|
386
|
+
},
|
|
387
|
+
"Resource": [
|
|
388
|
+
{
|
|
389
|
+
"Fn::GetAtt": [
|
|
390
|
+
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
391
|
+
"Arn"
|
|
392
|
+
]
|
|
393
|
+
},
|
|
394
|
+
{
|
|
395
|
+
"Fn::Join": [
|
|
396
|
+
"",
|
|
397
|
+
[
|
|
398
|
+
{
|
|
399
|
+
"Fn::GetAtt": [
|
|
400
|
+
"testcloudfronts3CloudfrontLoggingBucket985C0FE8",
|
|
401
|
+
"Arn"
|
|
402
|
+
]
|
|
403
|
+
},
|
|
404
|
+
"/*"
|
|
405
|
+
]
|
|
406
|
+
]
|
|
407
|
+
}
|
|
408
|
+
]
|
|
302
409
|
}
|
|
303
410
|
],
|
|
304
411
|
"Version": "2012-10-17"
|
|
305
412
|
}
|
|
306
413
|
}
|
|
307
414
|
},
|
|
415
|
+
"testcloudfronts3CloudfrontLoggingBucketAutoDeleteObjectsCustomResource19604D88": {
|
|
416
|
+
"Type": "Custom::S3AutoDeleteObjects",
|
|
417
|
+
"Properties": {
|
|
418
|
+
"ServiceToken": {
|
|
419
|
+
"Fn::GetAtt": [
|
|
420
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
|
|
421
|
+
"Arn"
|
|
422
|
+
]
|
|
423
|
+
},
|
|
424
|
+
"BucketName": {
|
|
425
|
+
"Ref": "testcloudfronts3CloudfrontLoggingBucket985C0FE8"
|
|
426
|
+
}
|
|
427
|
+
},
|
|
428
|
+
"DependsOn": [
|
|
429
|
+
"testcloudfronts3CloudfrontLoggingBucketPolicyDF55851B"
|
|
430
|
+
],
|
|
431
|
+
"UpdateReplacePolicy": "Delete",
|
|
432
|
+
"DeletionPolicy": "Delete"
|
|
433
|
+
},
|
|
308
434
|
"testcloudfronts3CloudFrontDistributionOrigin1S3Origin4695F058": {
|
|
309
435
|
"Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity",
|
|
310
436
|
"Properties": {
|
|
@@ -383,6 +509,82 @@
|
|
|
383
509
|
]
|
|
384
510
|
}
|
|
385
511
|
}
|
|
512
|
+
},
|
|
513
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
|
|
514
|
+
"Type": "AWS::IAM::Role",
|
|
515
|
+
"Properties": {
|
|
516
|
+
"AssumeRolePolicyDocument": {
|
|
517
|
+
"Version": "2012-10-17",
|
|
518
|
+
"Statement": [
|
|
519
|
+
{
|
|
520
|
+
"Action": "sts:AssumeRole",
|
|
521
|
+
"Effect": "Allow",
|
|
522
|
+
"Principal": {
|
|
523
|
+
"Service": "lambda.amazonaws.com"
|
|
524
|
+
}
|
|
525
|
+
}
|
|
526
|
+
]
|
|
527
|
+
},
|
|
528
|
+
"ManagedPolicyArns": [
|
|
529
|
+
{
|
|
530
|
+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
|
|
531
|
+
}
|
|
532
|
+
]
|
|
533
|
+
}
|
|
534
|
+
},
|
|
535
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
|
|
536
|
+
"Type": "AWS::Lambda::Function",
|
|
537
|
+
"Properties": {
|
|
538
|
+
"Code": {
|
|
539
|
+
"S3Bucket": {
|
|
540
|
+
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
|
|
541
|
+
},
|
|
542
|
+
"S3Key": "15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538.zip"
|
|
543
|
+
},
|
|
544
|
+
"Timeout": 900,
|
|
545
|
+
"MemorySize": 128,
|
|
546
|
+
"Handler": "__entrypoint__.handler",
|
|
547
|
+
"Role": {
|
|
548
|
+
"Fn::GetAtt": [
|
|
549
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
|
|
550
|
+
"Arn"
|
|
551
|
+
]
|
|
552
|
+
},
|
|
553
|
+
"Runtime": "nodejs12.x",
|
|
554
|
+
"Description": {
|
|
555
|
+
"Fn::Join": [
|
|
556
|
+
"",
|
|
557
|
+
[
|
|
558
|
+
"Lambda function for auto-deleting objects in ",
|
|
559
|
+
{
|
|
560
|
+
"Ref": "testcloudfronts3S3BucketE0C5F76E"
|
|
561
|
+
},
|
|
562
|
+
" S3 bucket."
|
|
563
|
+
]
|
|
564
|
+
]
|
|
565
|
+
}
|
|
566
|
+
},
|
|
567
|
+
"DependsOn": [
|
|
568
|
+
"CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
|
|
569
|
+
],
|
|
570
|
+
"Metadata": {
|
|
571
|
+
"cfn_nag": {
|
|
572
|
+
"rules_to_suppress": [
|
|
573
|
+
{
|
|
574
|
+
"id": "W58",
|
|
575
|
+
"reason": "CDK generated custom resource"
|
|
576
|
+
},
|
|
577
|
+
{
|
|
578
|
+
"id": "W89",
|
|
579
|
+
"reason": "CDK generated custom resource"
|
|
580
|
+
},
|
|
581
|
+
{
|
|
582
|
+
"id": "W92",
|
|
583
|
+
"reason": "CDK generated custom resource"
|
|
584
|
+
}
|
|
585
|
+
]
|
|
586
|
+
}
|
|
587
|
+
}
|
|
386
588
|
}
|
|
387
589
|
},
|
|
388
590
|
"Parameters": {
|
|
@@ -21,8 +21,17 @@ const app = new aws_cdk_lib_1.App();
|
|
|
21
21
|
const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filename));
|
|
22
22
|
stack.templateOptions.description = 'Integration Test for originPath with aws-cloudfront-s3';
|
|
23
23
|
new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
|
|
24
|
-
|
|
24
|
+
cloudFrontLoggingBucketProps: {
|
|
25
|
+
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
|
|
26
|
+
autoDeleteObjects: true
|
|
27
|
+
},
|
|
28
|
+
originPath: '/testPath',
|
|
29
|
+
bucketProps: {
|
|
30
|
+
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
|
|
31
|
+
autoDeleteObjects: true
|
|
32
|
+
}
|
|
25
33
|
});
|
|
34
|
+
core_1.suppressAutoDeleteHandlerWarnings(stack);
|
|
26
35
|
// Synth
|
|
27
36
|
app.synth();
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuY3VzdG9tLW9yaWdpblBhdGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnRlZy5jdXN0b20tb3JpZ2luUGF0aC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7O0FBRUgsVUFBVTtBQUNWLDZDQUF3RDtBQUN4RCxnQ0FBd0M7QUFDeEMseURBQTJHO0FBRTNHLFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLGlCQUFHLEVBQUUsQ0FBQztBQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLG1CQUFLLENBQUMsR0FBRyxFQUFFLDZCQUFzQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFDakUsS0FBSyxDQUFDLGVBQWUsQ0FBQyxXQUFXLEdBQUcsd0RBQXdELENBQUM7QUFFN0YsSUFBSSxvQkFBYyxDQUFDLEtBQUssRUFBRSxvQkFBb0IsRUFBRTtJQUM5Qyw0QkFBNEIsRUFBRTtRQUM1QixhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO1FBQ3BDLGlCQUFpQixFQUFFLElBQUk7S0FDeEI7SUFDRCxVQUFVLEVBQUUsV0FBVztJQUN2QixXQUFXLEVBQUU7UUFDWCxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO1FBQ3BDLGlCQUFpQixFQUFFLElBQUk7S0FDeEI7Q0FDRixDQUFDLENBQUM7QUFFSCx3Q0FBaUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUN6QyxRQUFRO0FBQ1IsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IDIwMjIgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG4vLyBJbXBvcnRzXG5pbXBvcnQgeyBBcHAsIFJlbW92YWxQb2xpY3ksIFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDbG91ZEZyb250VG9TMyB9IGZyb20gXCIuLi9saWJcIjtcbmltcG9ydCB7IGdlbmVyYXRlSW50ZWdTdGFja05hbWUsIHN1cHByZXNzQXV0b0RlbGV0ZUhhbmRsZXJXYXJuaW5ncyB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5cbi8vIFNldHVwXG5jb25zdCBhcHAgPSBuZXcgQXBwKCk7XG5jb25zdCBzdGFjayA9IG5ldyBTdGFjayhhcHAsIGdlbmVyYXRlSW50ZWdTdGFja05hbWUoX19maWxlbmFtZSkpO1xuc3RhY2sudGVtcGxhdGVPcHRpb25zLmRlc2NyaXB0aW9uID0gJ0ludGVncmF0aW9uIFRlc3QgZm9yIG9yaWdpblBhdGggd2l0aCBhd3MtY2xvdWRmcm9udC1zMyc7XG5cbm5ldyBDbG91ZEZyb250VG9TMyhzdGFjaywgJ3Rlc3QtY2xvdWRmcm9udC1zMycsIHtcbiAgY2xvdWRGcm9udExvZ2dpbmdCdWNrZXRQcm9wczoge1xuICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgICBhdXRvRGVsZXRlT2JqZWN0czogdHJ1ZVxuICB9LFxuICBvcmlnaW5QYXRoOiAnL3Rlc3RQYXRoJyxcbiAgYnVja2V0UHJvcHM6IHtcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gICAgYXV0b0RlbGV0ZU9iamVjdHM6IHRydWVcbiAgfVxufSk7XG5cbnN1cHByZXNzQXV0b0RlbGV0ZUhhbmRsZXJXYXJuaW5ncyhzdGFjayk7XG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7Il19
|