@aws-solutions-constructs/aws-cloudfront-s3 2.47.0 → 2.48.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.
Files changed (36) hide show
  1. package/.eslintignore +2 -2
  2. package/.jsii +60 -23
  3. package/README.md +7 -6
  4. package/lib/index.d.ts +1 -0
  5. package/lib/index.js +70 -8
  6. package/package.json +5 -3
  7. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json +958 -0
  8. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js +44 -0
  9. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json +592 -0
  10. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js +39 -0
  11. package/test/integ.cfts3-bucket-with-http-origin.d.ts +13 -0
  12. package/test/integ.cfts3-bucket-with-http-origin.expected.json +559 -0
  13. package/test/integ.cfts3-bucket-with-http-origin.js +44 -0
  14. package/test/integ.cfts3-cmk-encryption.expected.json +527 -0
  15. package/test/integ.cfts3-cmk-provided-as-bucket-prop.d.ts +13 -0
  16. package/test/integ.cfts3-cmk-provided-as-bucket-prop.expected.json +958 -0
  17. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js +41 -0
  18. package/test/integ.cfts3-custom-headers.expected.json +307 -27
  19. package/test/integ.cfts3-custom-headers.js +6 -2
  20. package/test/integ.cfts3-custom-originPath.expected.json +307 -27
  21. package/test/integ.cfts3-custom-originPath.js +6 -2
  22. package/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json +54 -23
  23. package/test/integ.cfts3-customLoggingBuckets.d.ts +13 -0
  24. package/test/{integ.cfts3-customLoggingBucket.expected.json → integ.cfts3-customLoggingBuckets.expected.json} +285 -31
  25. package/test/integ.cfts3-customLoggingBuckets.js +58 -0
  26. package/test/integ.cfts3-existing-bucket.expected.json +493 -80
  27. package/test/integ.cfts3-existing-bucket.js +2 -2
  28. package/test/integ.cfts3-no-arguments.expected.json +430 -27
  29. package/test/integ.cfts3-no-arguments.js +5 -2
  30. package/test/integ.cfts3-no-security-headers.expected.json +307 -27
  31. package/test/integ.cfts3-no-security-headers.js +5 -1
  32. package/test/test.cloudfront-s3.test.js +149 -28
  33. package/test/integ.cfts3-customCloudFrontLoggingBucket.js +0 -39
  34. package/test/integ.cfts3-customLoggingBucket.js +0 -42
  35. /package/test/{integ.cfts3-customCloudFrontLoggingBucket.d.ts → integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.d.ts} +0 -0
  36. /package/test/{integ.cfts3-customLoggingBucket.d.ts → integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.d.ts} +0 -0
package/.eslintignore CHANGED
@@ -1,5 +1,5 @@
1
- lib/*.js
1
+ lib/**/*.js
2
2
  test/*.js
3
3
  *.d.ts
4
4
  coverage
5
- test/lambda/index.js
5
+ node_modules
package/.jsii CHANGED
@@ -8,7 +8,8 @@
8
8
  "url": "https://aws.amazon.com"
9
9
  },
10
10
  "dependencies": {
11
- "@aws-solutions-constructs/core": "2.47.0",
11
+ "@aws-solutions-constructs/core": "2.48.0",
12
+ "@aws-solutions-constructs/resources": "2.48.0",
12
13
  "aws-cdk-lib": "^2.111.0",
13
14
  "constructs": "^10.0.0"
14
15
  },
@@ -115,6 +116,30 @@
115
116
  }
116
117
  }
117
118
  },
119
+ "@aws-solutions-constructs/resources": {
120
+ "targets": {
121
+ "dotnet": {
122
+ "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png",
123
+ "namespace": "Amazon.SolutionsConstructs.AWS.Resources",
124
+ "packageId": "Amazon.SolutionsConstructs.AWS.Resources",
125
+ "signAssembly": true
126
+ },
127
+ "java": {
128
+ "maven": {
129
+ "artifactId": "resources",
130
+ "groupId": "software.amazon.awsconstructs"
131
+ },
132
+ "package": "software.amazon.awsconstructs.services.resources"
133
+ },
134
+ "js": {
135
+ "npm": "@aws-solutions-constructs/resources"
136
+ },
137
+ "python": {
138
+ "distName": "aws-solutions-constructs.resources",
139
+ "module": "aws_solutions_constructs.resources"
140
+ }
141
+ }
142
+ },
118
143
  "aws-cdk-lib": {
119
144
  "submodules": {
120
145
  "aws-cdk-lib.alexa_ask": {
@@ -3579,7 +3604,7 @@
3579
3604
  },
3580
3605
  "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
3581
3606
  "homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
3582
- "jsiiVersion": "1.92.0 (build db7f27d)",
3607
+ "jsiiVersion": "1.94.0 (build b380f01)",
3583
3608
  "keywords": [
3584
3609
  "aws",
3585
3610
  "cdk",
@@ -3598,7 +3623,7 @@
3598
3623
  },
3599
3624
  "name": "@aws-solutions-constructs/aws-cloudfront-s3",
3600
3625
  "readme": {
3601
- "markdown": "# aws-cloudfront-s3 module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)\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 Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_cloudfront_s3`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-cloudfront-s3`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfronts3`|\n\n## Overview\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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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| responseHeadersPolicyProps? | [`cloudfront.ResponseHeadersPolicyProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.ResponseHeadersPolicyProps.html) | Optional user provided configuration that cloudfront applies to all http responses.|\n|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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.Distribution`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html)|Returns an instance of cloudfront.Distribution created by the construct|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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 Distribution.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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 Distribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront Distribution\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![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
3626
+ "markdown": "# aws-cloudfront-s3 module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)\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 Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_cloudfront_s3`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-cloudfront-s3`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfronts3`|\n\n## Overview\nThis AWS Solutions Construct provisions an Amazon CloudFront Distribution that serves objects from an AWS S3 Bucket via an Origin Access Control (OAC).\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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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| responseHeadersPolicyProps? | [`cloudfront.ResponseHeadersPolicyProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.ResponseHeadersPolicyProps.html) | Optional user provided configuration that cloudfront applies to all http responses.|\n|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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.Distribution`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html)|Returns an instance of cloudfront.Distribution created by the construct.|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the construct.|\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 the CloudFront Distribution.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.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/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|\n|originAccessControl?|[`cloudfront.CfnOriginAccessControl`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.cloudfront.CfnOriginAccessControl.html)|Returns an instance of cloudfront.CfnOriginAccessControl created by the construct.|\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 Distribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront Distribution\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![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
3602
3627
  },
3603
3628
  "repository": {
3604
3629
  "directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-s3",
@@ -3643,7 +3668,7 @@
3643
3668
  },
3644
3669
  "locationInModule": {
3645
3670
  "filename": "lib/index.ts",
3646
- "line": 107
3671
+ "line": 112
3647
3672
  },
3648
3673
  "parameters": [
3649
3674
  {
@@ -3678,7 +3703,7 @@
3678
3703
  "kind": "class",
3679
3704
  "locationInModule": {
3680
3705
  "filename": "lib/index.ts",
3681
- "line": 91
3706
+ "line": 95
3682
3707
  },
3683
3708
  "name": "CloudFrontToS3",
3684
3709
  "properties": [
@@ -3686,7 +3711,7 @@
3686
3711
  "immutable": true,
3687
3712
  "locationInModule": {
3688
3713
  "filename": "lib/index.ts",
3689
- "line": 92
3714
+ "line": 96
3690
3715
  },
3691
3716
  "name": "cloudFrontWebDistribution",
3692
3717
  "type": {
@@ -3697,7 +3722,7 @@
3697
3722
  "immutable": true,
3698
3723
  "locationInModule": {
3699
3724
  "filename": "lib/index.ts",
3700
- "line": 95
3725
+ "line": 99
3701
3726
  },
3702
3727
  "name": "s3BucketInterface",
3703
3728
  "type": {
@@ -3708,7 +3733,7 @@
3708
3733
  "immutable": true,
3709
3734
  "locationInModule": {
3710
3735
  "filename": "lib/index.ts",
3711
- "line": 93
3736
+ "line": 97
3712
3737
  },
3713
3738
  "name": "cloudFrontFunction",
3714
3739
  "optional": true,
@@ -3720,7 +3745,7 @@
3720
3745
  "immutable": true,
3721
3746
  "locationInModule": {
3722
3747
  "filename": "lib/index.ts",
3723
- "line": 94
3748
+ "line": 98
3724
3749
  },
3725
3750
  "name": "cloudFrontLoggingBucket",
3726
3751
  "optional": true,
@@ -3732,7 +3757,19 @@
3732
3757
  "immutable": true,
3733
3758
  "locationInModule": {
3734
3759
  "filename": "lib/index.ts",
3735
- "line": 96
3760
+ "line": 102
3761
+ },
3762
+ "name": "originAccessControl",
3763
+ "optional": true,
3764
+ "type": {
3765
+ "fqn": "aws-cdk-lib.aws_cloudfront.CfnOriginAccessControl"
3766
+ }
3767
+ },
3768
+ {
3769
+ "immutable": true,
3770
+ "locationInModule": {
3771
+ "filename": "lib/index.ts",
3772
+ "line": 100
3736
3773
  },
3737
3774
  "name": "s3Bucket",
3738
3775
  "optional": true,
@@ -3744,7 +3781,7 @@
3744
3781
  "immutable": true,
3745
3782
  "locationInModule": {
3746
3783
  "filename": "lib/index.ts",
3747
- "line": 97
3784
+ "line": 101
3748
3785
  },
3749
3786
  "name": "s3LoggingBucket",
3750
3787
  "optional": true,
@@ -3767,7 +3804,7 @@
3767
3804
  "kind": "interface",
3768
3805
  "locationInModule": {
3769
3806
  "filename": "lib/index.ts",
3770
- "line": 23
3807
+ "line": 27
3771
3808
  },
3772
3809
  "name": "CloudFrontToS3Props",
3773
3810
  "properties": [
@@ -3780,7 +3817,7 @@
3780
3817
  "immutable": true,
3781
3818
  "locationInModule": {
3782
3819
  "filename": "lib/index.ts",
3783
- "line": 35
3820
+ "line": 39
3784
3821
  },
3785
3822
  "name": "bucketProps",
3786
3823
  "optional": true,
@@ -3797,7 +3834,7 @@
3797
3834
  "immutable": true,
3798
3835
  "locationInModule": {
3799
3836
  "filename": "lib/index.ts",
3800
- "line": 41
3837
+ "line": 45
3801
3838
  },
3802
3839
  "name": "cloudFrontDistributionProps",
3803
3840
  "optional": true,
@@ -3814,7 +3851,7 @@
3814
3851
  "immutable": true,
3815
3852
  "locationInModule": {
3816
3853
  "filename": "lib/index.ts",
3817
- "line": 81
3854
+ "line": 85
3818
3855
  },
3819
3856
  "name": "cloudFrontLoggingBucketProps",
3820
3857
  "optional": true,
@@ -3831,7 +3868,7 @@
3831
3868
  "immutable": true,
3832
3869
  "locationInModule": {
3833
3870
  "filename": "lib/index.ts",
3834
- "line": 29
3871
+ "line": 33
3835
3872
  },
3836
3873
  "name": "existingBucketObj",
3837
3874
  "optional": true,
@@ -3849,7 +3886,7 @@
3849
3886
  "immutable": true,
3850
3887
  "locationInModule": {
3851
3888
  "filename": "lib/index.ts",
3852
- "line": 50
3889
+ "line": 54
3853
3890
  },
3854
3891
  "name": "insertHttpSecurityHeaders",
3855
3892
  "optional": true,
@@ -3866,7 +3903,7 @@
3866
3903
  "immutable": true,
3867
3904
  "locationInModule": {
3868
3905
  "filename": "lib/index.ts",
3869
- "line": 75
3906
+ "line": 79
3870
3907
  },
3871
3908
  "name": "loggingBucketProps",
3872
3909
  "optional": true,
@@ -3884,7 +3921,7 @@
3884
3921
  "immutable": true,
3885
3922
  "locationInModule": {
3886
3923
  "filename": "lib/index.ts",
3887
- "line": 88
3924
+ "line": 92
3888
3925
  },
3889
3926
  "name": "logS3AccessLogs",
3890
3927
  "optional": true,
@@ -3902,7 +3939,7 @@
3902
3939
  "immutable": true,
3903
3940
  "locationInModule": {
3904
3941
  "filename": "lib/index.ts",
3905
- "line": 69
3942
+ "line": 73
3906
3943
  },
3907
3944
  "name": "originPath",
3908
3945
  "optional": true,
@@ -3920,7 +3957,7 @@
3920
3957
  "immutable": true,
3921
3958
  "locationInModule": {
3922
3959
  "filename": "lib/index.ts",
3923
- "line": 62
3960
+ "line": 66
3924
3961
  },
3925
3962
  "name": "responseHeadersPolicyProps",
3926
3963
  "optional": true,
@@ -3932,6 +3969,6 @@
3932
3969
  "symbolId": "lib/index:CloudFrontToS3Props"
3933
3970
  }
3934
3971
  },
3935
- "version": "2.47.0",
3936
- "fingerprint": "XHg1tFbsC4Yd2S7/GlIXjgPUt3kY31No2/Sv1aV2tZc="
3972
+ "version": "2.48.0",
3973
+ "fingerprint": "AjygxE7i/ssFcO2P88DZKj6ZzHrR39ceITl1m+qckCM="
3937
3974
  }
package/README.md CHANGED
@@ -19,7 +19,7 @@
19
19
  |![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfronts3`|
20
20
 
21
21
  ## Overview
22
- This AWS Solutions Construct implements an AWS CloudFront fronting an AWS S3 Bucket.
22
+ This AWS Solutions Construct provisions an Amazon CloudFront Distribution that serves objects from an AWS S3 Bucket via an Origin Access Control (OAC).
23
23
 
24
24
  Here is a minimal deployable pattern definition:
25
25
 
@@ -71,12 +71,13 @@ new CloudFrontToS3(this, "test-cloudfront-s3", new CloudFrontToS3Props.Builder()
71
71
 
72
72
  | **Name** | **Type** | **Description** |
73
73
  |:-------------|:----------------|-----------------|
74
- |cloudFrontWebDistribution|[`cloudfront.Distribution`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html)|Returns an instance of cloudfront.Distribution created by the construct|
75
- |cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the pattern.|
76
- |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 Distribution.|
77
- |s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct|
78
- |s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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`|
74
+ |cloudFrontWebDistribution|[`cloudfront.Distribution`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html)|Returns an instance of cloudfront.Distribution created by the construct.|
75
+ |cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the construct.|
76
+ |cloudFrontLoggingBucket|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-s3-readme.html)|Returns an instance of the logging bucket for the CloudFront Distribution.|
77
+ |s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct.|
78
+ |s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.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`|
79
79
  |s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|
80
+ |originAccessControl?|[`cloudfront.CfnOriginAccessControl`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.cloudfront.CfnOriginAccessControl.html)|Returns an instance of cloudfront.CfnOriginAccessControl created by the construct.|
80
81
 
81
82
  ## Default settings
82
83
 
package/lib/index.d.ts CHANGED
@@ -90,6 +90,7 @@ export declare class CloudFrontToS3 extends Construct {
90
90
  readonly s3BucketInterface: s3.IBucket;
91
91
  readonly s3Bucket?: s3.Bucket;
92
92
  readonly s3LoggingBucket?: s3.Bucket;
93
+ readonly originAccessControl?: cloudfront.CfnOriginAccessControl;
93
94
  /**
94
95
  * @summary Constructs a new instance of the CloudFrontToS3 class.
95
96
  * @param {Construct} scope - represents the scope for all the resources.
package/lib/index.js CHANGED
@@ -3,9 +3,24 @@ var _a;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.CloudFrontToS3 = void 0;
5
5
  const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
6
+ /**
7
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
8
+ *
9
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
10
+ * with the License. A copy of the License is located at
11
+ *
12
+ * http://www.apache.org/licenses/LICENSE-2.0
13
+ *
14
+ * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
15
+ * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
16
+ * and limitations under the License.
17
+ */
18
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
19
+ const iam = require("aws-cdk-lib/aws-iam");
20
+ const defaults = require("@aws-solutions-constructs/core");
21
+ const resources = require("@aws-solutions-constructs/resources");
6
22
  // Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
7
23
  const constructs_1 = require("constructs");
8
- const defaults = require("@aws-solutions-constructs/core");
9
24
  class CloudFrontToS3 extends constructs_1.Construct {
10
25
  /**
11
26
  * @summary Constructs a new instance of the CloudFrontToS3 class.
@@ -22,7 +37,7 @@ class CloudFrontToS3 extends constructs_1.Construct {
22
37
  this.node.setContext("@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy", true);
23
38
  defaults.CheckS3Props(props);
24
39
  defaults.CheckCloudFrontProps(props);
25
- let bucket;
40
+ let originBucket;
26
41
  if (!props.existingBucketObj) {
27
42
  const buildS3BucketResponse = defaults.buildS3Bucket(this, {
28
43
  bucketProps: props.bucketProps,
@@ -31,19 +46,66 @@ class CloudFrontToS3 extends constructs_1.Construct {
31
46
  });
32
47
  this.s3Bucket = buildS3BucketResponse.bucket;
33
48
  this.s3LoggingBucket = buildS3BucketResponse.loggingBucket;
34
- bucket = this.s3Bucket;
49
+ originBucket = this.s3Bucket;
35
50
  }
36
51
  else {
37
- bucket = props.existingBucketObj;
52
+ originBucket = props.existingBucketObj;
38
53
  }
39
- this.s3BucketInterface = bucket;
40
- const cloudFrontDistributionForS3Response = defaults.CloudFrontDistributionForS3(this, this.s3BucketInterface, props.cloudFrontDistributionProps, props.insertHttpSecurityHeaders, props.originPath, props.cloudFrontLoggingBucketProps, props.responseHeadersPolicyProps);
54
+ this.s3BucketInterface = originBucket;
55
+ // Define the CloudFront Distribution
56
+ const cloudFrontDistributionForS3Props = {
57
+ sourceBucket: this.s3BucketInterface,
58
+ cloudFrontDistributionProps: props.cloudFrontDistributionProps,
59
+ httpSecurityHeaders: props.insertHttpSecurityHeaders,
60
+ cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,
61
+ responseHeadersPolicyProps: props.responseHeadersPolicyProps
62
+ };
63
+ const cloudFrontDistributionForS3Response = defaults.createCloudFrontDistributionForS3(this, id, cloudFrontDistributionForS3Props);
41
64
  this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;
42
65
  this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;
43
66
  this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;
67
+ this.originAccessControl = cloudFrontDistributionForS3Response.originAccessControl;
68
+ // Attach the OriginAccessControl to the CloudFront Distribution, and remove the OriginAccessIdentity
69
+ const l1CloudFrontDistribution = this.cloudFrontWebDistribution.node.defaultChild;
70
+ l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginAccessControlId', this.originAccessControl?.attrId);
71
+ if (props.originPath) {
72
+ l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginPath', props.originPath);
73
+ }
74
+ // Grant CloudFront permission to get the objects from the s3 bucket origin
75
+ originBucket.addToResourcePolicy(new iam.PolicyStatement({
76
+ effect: iam.Effect.ALLOW,
77
+ actions: ['s3:GetObject'],
78
+ principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],
79
+ resources: [originBucket.arnForObjects('*')],
80
+ conditions: {
81
+ StringEquals: {
82
+ 'AWS:SourceArn': `arn:aws:cloudfront::${aws_cdk_lib_1.Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`
83
+ }
84
+ }
85
+ }));
86
+ // We need to create a custom resource to introduce the indirection necessary to avoid
87
+ // a circular dependency when granting the CloudFront distribution access to use the
88
+ // KMS key to decrypt objects. Without this indirection, it is not possible to reference
89
+ // the CloudFront distribution ID in the KMS key policy because -
90
+ // * The S3 bucket references the KMS key
91
+ // * The CloudFront distribution references the bucket
92
+ // * The KMS key references the CloudFront distribution
93
+ let encryptionKey;
94
+ if (props.bucketProps && props.bucketProps.encryptionKey) {
95
+ encryptionKey = props.bucketProps.encryptionKey;
96
+ }
97
+ else if (props.existingBucketObj && props.existingBucketObj.encryptionKey) {
98
+ encryptionKey = props.existingBucketObj.encryptionKey;
99
+ }
100
+ if (encryptionKey) {
101
+ resources.createKeyPolicyUpdaterCustomResource(this, {
102
+ distribution: this.cloudFrontWebDistribution,
103
+ encryptionKey
104
+ });
105
+ }
44
106
  }
45
107
  }
46
108
  exports.CloudFrontToS3 = CloudFrontToS3;
47
109
  _a = JSII_RTTI_SYMBOL_1;
48
- CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.47.0" };
49
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;AAeA,wFAAwF;AACxF,2CAAuC;AACvC,2DAA2D;AAyE3D,MAAa,cAAe,SAAQ,sBAAS;IAQ3C;;;;;;;OAOG;IACH,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA0B;QAClE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,wEAAwE;QACxE,2DAA2D;QAC3D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iDAAiD,EAAE,IAAI,CAAC,CAAC;QAE9E,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAErC,IAAI,MAAkB,CAAC;QAEvB,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE;YAC5B,MAAM,qBAAqB,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE;gBACzD,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;gBAC5C,eAAe,EAAE,KAAK,CAAC,eAAe;aACvC,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,IAAI,CAAC,eAAe,GAAG,qBAAqB,CAAC,aAAa,CAAC;YAC3D,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;SACxB;aAAM;YACL,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC;SAClC;QAED,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;QAEhC,MAAM,mCAAmC,GAAG,QAAQ,CAAC,2BAA2B,CAC9E,IAAI,EACJ,IAAI,CAAC,iBAAiB,EACtB,KAAK,CAAC,2BAA2B,EACjC,KAAK,CAAC,yBAAyB,EAC/B,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,4BAA4B,EAClC,KAAK,CAAC,0BAA0B,CACjC,CAAC;QACF,IAAI,CAAC,yBAAyB,GAAG,mCAAmC,CAAC,YAAY,CAAC;QAClF,IAAI,CAAC,kBAAkB,GAAG,mCAAmC,CAAC,kBAAkB,CAAC;QACjF,IAAI,CAAC,uBAAuB,GAAG,mCAAmC,CAAC,aAAa,CAAC;IACnF,CAAC;;AAvDH,wCAyDC","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 * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\nimport * as defaults from '@aws-solutions-constructs/core';\n\n/**\n * @summary The properties for the CloudFrontToS3 Construct\n */\nexport interface CloudFrontToS3Props {\n  /**\n   * Existing instance of S3 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 Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\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   * Optional user provided props to override the default props for the S3 Logging Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps\n  /**\n   * Optional user provided props to override the default props for the CloudFront Logging Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps\n  /**\n   * Whether to turn on Access Logs for the S3 bucket with the associated storage costs.\n   * Enabling Access Logging is a best practice.\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean;\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 s3BucketInterface: s3.IBucket;\n  public readonly s3Bucket?: s3.Bucket;\n  public readonly s3LoggingBucket?: s3.Bucket;\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\n    let bucket: 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      bucket = this.s3Bucket;\n    } else {\n      bucket = props.existingBucketObj;\n    }\n\n    this.s3BucketInterface = bucket;\n\n    const cloudFrontDistributionForS3Response = defaults.CloudFrontDistributionForS3(\n      this,\n      this.s3BucketInterface,\n      props.cloudFrontDistributionProps,\n      props.insertHttpSecurityHeaders,\n      props.originPath,\n      props.cloudFrontLoggingBucketProps,\n      props.responseHeadersPolicyProps\n    );\n    this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;\n    this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;\n    this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;\n  }\n\n}\n"]}
110
+ CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.48.0" };
111
+ //# 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   * Existing instance of S3 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 Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\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   * Optional user provided props to override the default props for the S3 Logging Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps\n  /**\n   * Optional user provided props to override the default props for the CloudFront Logging Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps\n  /**\n   * Whether to turn on Access Logs for the S3 bucket with the associated storage costs.\n   * Enabling Access Logging is a best practice.\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean;\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 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\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    };\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\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: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, {\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.47.0",
3
+ "version": "2.48.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",
@@ -53,7 +53,8 @@
53
53
  }
54
54
  },
55
55
  "dependencies": {
56
- "@aws-solutions-constructs/core": "2.47.0"
56
+ "@aws-solutions-constructs/core": "2.48.0",
57
+ "@aws-solutions-constructs/resources": "2.48.0"
57
58
  },
58
59
  "devDependencies": {
59
60
  "@types/jest": "^27.4.0",
@@ -76,7 +77,8 @@
76
77
  ]
77
78
  },
78
79
  "peerDependencies": {
79
- "@aws-solutions-constructs/core": "2.47.0",
80
+ "@aws-solutions-constructs/core": "2.48.0",
81
+ "@aws-solutions-constructs/resources": "2.48.0",
80
82
  "aws-cdk-lib": "^2.111.0",
81
83
  "constructs": "^10.0.0"
82
84
  },