@aws-solutions-constructs/aws-cloudfront-oai-s3 2.85.1 → 2.85.3

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 CHANGED
@@ -8,8 +8,8 @@
8
8
  "url": "https://aws.amazon.com"
9
9
  },
10
10
  "dependencies": {
11
- "@aws-solutions-constructs/core": "2.85.1",
12
- "@aws-solutions-constructs/resources": "2.85.1",
11
+ "@aws-solutions-constructs/core": "2.85.3",
12
+ "@aws-solutions-constructs/resources": "2.85.3",
13
13
  "aws-cdk-lib": "^2.193.0",
14
14
  "constructs": "^10.0.0"
15
15
  },
@@ -4018,7 +4018,7 @@
4018
4018
  },
4019
4019
  "name": "@aws-solutions-constructs/aws-cloudfront-oai-s3",
4020
4020
  "readme": {
4021
- "markdown": "# aws-cloudfront-oai-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_oai_s3`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-cloudfront-oai-s3`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfrontoais3`|\n\n## Overview\nThis AWS Solutions Construct provisions an Amazon CloudFront Distribution that serves objects from an AWS S3 Bucket via an Origin Access Identity (OAI).\n\nIMPORTANT: The recommended architecture for this pattern is to use an Origin Access Control, which is available in aws-cloudfront-s3. This construct is provided to support China regions where Origin Access Controls are not available.\n\nHere is a minimal deployable pattern definition:\n\nTypescript\n``` typescript\nimport { Construct } from 'constructs';\nimport { Stack, StackProps } from 'aws-cdk-lib';\nimport { CloudFrontToOaiToS3 } from '@aws-solutions-constructs/aws-cloudfront-oai-s3';\n\nnew CloudFrontToOaiToS3(this, 'test-cloudfront-oai-s3', {});\n```\n\nPython\n``` python\nfrom aws_solutions_constructs.aws_cloudfront_oai_s3 import CloudFrontToOaiToS3\nfrom aws_cdk import Stack\nfrom constructs import Construct\n\nCloudFrontToOaiToS3(self, 'test-cloudfront-oai-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.cloudfrontoais3.*;\n\nnew CloudFrontToOaiToS3(this, \"test-cloudfront-oai-s3\", new CloudFrontToOaiToS3Props.Builder()\n .build());\n```\n\n## Pattern Construct Props\n\n| **Name** | **Type** | **Description** |\n|:-------------|:----------------|-----------------|\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|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Existing instance of S3 content 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 content bucket. Note - to log S3 access for this bucket to an existing S3 bucket, put the existing log bucket in bucketProps: `serverAccessLogsBucket`|\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|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. Note: to use an existing bucketto hold CloudFront logs, pass the existing log bucket in |\n|logCloudFrontAccessLog|`boolean`|Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this while providing info about the log bucket will cause an error. Default = true |\n|cloudFrontLoggingBucketAccessLogBucketProps|[`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 Log Bucket Access Log bucket. Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error. To provide an existing bucket to accept these logs, pass the existing bucket in `cloudFrontLoggingBucketProps::serverAccessLogBucket`|\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|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|cloudFrontLoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket created by the construct to hold CloudFront logs. Only populated if the construct creates the bucket (not if an existing bucket is passed in via DistributionProps)|\n|cloudFrontLoggingBucketAccessLogBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket containing the S3 access logs for the CloudFront log bucket. Only populated if the construct creates the bucket (not if the bucket is passed in via `cloudFrontLoggingBucketProps::serverAccessLogBucket`|\n|originaAccessIdentity?|[`cloudfront.OriginAccessIdentity`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.OriginAccessIdentity.html)| The Origina Access Identity created to connect the CloudFront distribution to the S3 bucket (only suitable for use in regions without OAC, such as China)|\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* Create an Origin Access Identity to access S3 bucket\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* Block 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"
4021
+ "markdown": "Documentation for this pattern can be found [here](https://github.com/awslabs/aws-solutions-constructs/blob/main/source/patterns/%40aws-solutions-constructs/aws-cloudfront-oai-s3/README.adoc)\n"
4022
4022
  },
4023
4023
  "repository": {
4024
4024
  "directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-oai-s3",
@@ -4410,6 +4410,6 @@
4410
4410
  "symbolId": "lib/index:CloudFrontToOaiToS3Props"
4411
4411
  }
4412
4412
  },
4413
- "version": "2.85.1",
4414
- "fingerprint": "dEkV3NzeVtDAtU99m+lL3bKLkupNCe/wgNEA1+uRYXA="
4413
+ "version": "2.85.3",
4414
+ "fingerprint": "hdLLGh2FlW2+Xu+btg6c4Nz+PfBUHSbm414DG/+U/zA="
4415
4415
  }
package/README.adoc ADDED
@@ -0,0 +1,233 @@
1
+ //!!NODE_ROOT <section>
2
+ //== aws-cloudfront-oai-s3 module
3
+
4
+ [.topic]
5
+ = aws-cloudfront-oai-s3
6
+ :info_doctype: section
7
+ :info_title: aws-cloudfront-oai-s3
8
+
9
+
10
+ image:https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge[Stability:Stable]
11
+
12
+ [width="100%",cols="<50%,<50%",options="header",]
13
+ |===
14
+ |*Reference Documentation*:
15
+ |https://docs.aws.amazon.com/solutions/latest/constructs/
16
+ |===
17
+
18
+ [width="100%",cols="<46%,54%",options="header",]
19
+ |===
20
+ |*Language* |*Package*
21
+ |image:https://docs.aws.amazon.com/cdk/api/latest/img/python32.png[Python
22
+ Logo] Python
23
+ |`aws_solutions_constructs.aws_cloudfront_oai_s3`
24
+
25
+ |image:https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png[Typescript
26
+ Logo] Typescript |`@aws-solutions-constructs/aws-cloudfront-oai-s3`
27
+
28
+ |image:https://docs.aws.amazon.com/cdk/api/latest/img/java32.png[Java
29
+ Logo] Java |`software.amazon.awsconstructs.services.cloudfrontoais3`
30
+ |===
31
+
32
+ == Overview
33
+
34
+ This AWS Solutions Construct provisions an Amazon CloudFront
35
+ Distribution that serves objects from an AWS S3 Bucket via an Origin
36
+ Access Identity (OAI).
37
+
38
+ IMPORTANT: The recommended architecture for this pattern is to use an
39
+ Origin Access Control, which is available in aws-cloudfront-s3. This
40
+ construct is provided to support China regions where Origin Access
41
+ Controls are not available.
42
+
43
+ Here is a minimal deployable pattern definition:
44
+
45
+ ====
46
+ [role="tablist"]
47
+ Typescript::
48
+ +
49
+ [source,typescript]
50
+ ----
51
+ import { Construct } from 'constructs';
52
+ import { Stack, StackProps } from 'aws-cdk-lib';
53
+ import { CloudFrontToOaiToS3 } from '@aws-solutions-constructs/aws-cloudfront-oai-s3';
54
+
55
+ new CloudFrontToOaiToS3(this, 'test-cloudfront-oai-s3', {});
56
+ ----
57
+
58
+ Python::
59
+ +
60
+ [source,python]
61
+ ----
62
+ from aws_solutions_constructs.aws_cloudfront_oai_s3 import CloudFrontToOaiToS3
63
+ from aws_cdk import Stack
64
+ from constructs import Construct
65
+
66
+ CloudFrontToOaiToS3(self, 'test-cloudfront-oai-s3')
67
+ ----
68
+
69
+ Java::
70
+ +
71
+ [source,java]
72
+ ----
73
+ import software.constructs.Construct;
74
+
75
+ import software.amazon.awscdk.Stack;
76
+ import software.amazon.awscdk.StackProps;
77
+ import software.amazon.awsconstructs.services.cloudfrontoais3.*;
78
+
79
+ new CloudFrontToOaiToS3(this, "test-cloudfront-oai-s3", new CloudFrontToOaiToS3Props.Builder()
80
+ .build());
81
+ ----
82
+ ====
83
+
84
+ == Pattern Construct Props
85
+
86
+ [width="100%",cols="<30%,<35%,35%",options="header",]
87
+ |===
88
+ |*Name* |*Type* |*Description*
89
+ |cloudFrontDistributionProps?
90
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.DistributionProps.html[`cloudfront.DistributionProps`]
91
+ |Optional user provided props to override the default props for
92
+ CloudFront Distribution
93
+
94
+ |insertHttpSecurityHeaders? |`boolean` |Optional user provided props to
95
+ turn on/off the automatic injection of best practice HTTP security
96
+ headers in all responses from CloudFront
97
+
98
+ |responseHeadersPolicyProps?
99
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.ResponseHeadersPolicyProps.html[`cloudfront.ResponseHeadersPolicyProps`]
100
+ |Optional user provided configuration that cloudfront applies to all
101
+ http responses.
102
+
103
+ |originPath? |`string` |Optional user provided props to provide
104
+ anhttps://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront_origins.S3OriginProps.html#originpath[originPath]
105
+ that CloudFront appends to the origin domain name when CloudFront
106
+ requests content from the origin. The string should start with a `/`,
107
+ for example: `/production`. Default value is `'/'`
108
+
109
+ |existingBucketObj?
110
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html[`s3.IBucket`]
111
+ |Existing instance of S3 content bucket object or interface. If this is
112
+ provided, then also providing bucketProps will cause an error.
113
+
114
+ |bucketProps?
115
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html[`s3.BucketProps`]
116
+ |Optional user provided props to override the default props for the S3
117
+ content bucket. Note - to log S3 access for this bucket to an existing
118
+ S3 bucket, put the existing log bucket in bucketProps:
119
+ `serverAccessLogsBucket`
120
+
121
+ |logS3AccessLogs? |boolean |Whether to turn on Access Logging for the S3
122
+ bucket. Creates an S3 bucket with associated storage costs for the logs.
123
+ Enabling Access Logging is a best practice. default - true
124
+
125
+ |loggingBucketProps?
126
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html[`s3.BucketProps`]
127
+ |Optional user provided props to override the default props for the S3
128
+ Logging Bucket.
129
+
130
+ |cloudFrontLoggingBucketProps?
131
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html[`s3.BucketProps`]
132
+ |Optional user provided props to override the default props for the
133
+ CloudFront Logging Bucket. Note: to use an existing bucketto hold
134
+ CloudFront logs, pass the existing log bucket in
135
+
136
+ |logCloudFrontAccessLog |`boolean` |Optional - Whether to maintain
137
+ access logs for the CloudFront Logging bucket. Specifying false for this
138
+ while providing info about the log bucket will cause an error. Default =
139
+ true
140
+
141
+ |cloudFrontLoggingBucketAccessLogBucketProps
142
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html[`s3.BucketProps`]
143
+ |Optional user provided props to override the default props for the
144
+ CloudFront Log Bucket Access Log bucket. Providing both this and
145
+ `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error. To
146
+ provide an existing bucket to accept these logs, pass the existing
147
+ bucket in `cloudFrontLoggingBucketProps::serverAccessLogBucket`
148
+ |===
149
+
150
+ == Pattern Properties
151
+
152
+ [width="100%",cols="<30%,<35%,35%",options="header",]
153
+ |===
154
+ |*Name* |*Type* |*Description*
155
+ |cloudFrontWebDistribution
156
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html[`cloudfront.Distribution`]
157
+ |Returns an instance of cloudfront.Distribution created by the
158
+ construct.
159
+
160
+ |cloudFrontFunction?
161
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Function.html[`cloudfront.Function`]
162
+ |Returns an instance of the Cloudfront function created by the
163
+ construct.
164
+
165
+ |s3BucketInterface
166
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html[`s3.IBucket`]
167
+ |Returns an instance of s3.IBucket created by the construct.
168
+
169
+ |s3Bucket?
170
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html[`s3.Bucket`]
171
+ |Returns an instance of s3.Bucket created by the construct. IMPORTANT:
172
+ If `existingBucketObj` was provided in Pattern Construct Props, this
173
+ property will be `undefined`
174
+
175
+ |s3LoggingBucket?
176
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html[`s3.Bucket`]
177
+ |Returns an instance of s3.Bucket created by the construct as the
178
+ logging bucket for the primary bucket.
179
+
180
+ |cloudFrontLoggingBucket?
181
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html[`s3.Bucket`]
182
+ |The S3 bucket created by the construct to hold CloudFront logs. Only
183
+ populated if the construct creates the bucket (not if an existing bucket
184
+ is passed in via DistributionProps)
185
+
186
+ |cloudFrontLoggingBucketAccessLogBucket?
187
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html[`s3.Bucket`]
188
+ |The S3 bucket containing the S3 access logs for the CloudFront log
189
+ bucket. Only populated if the construct creates the bucket (not if the
190
+ bucket is passed in via
191
+ `cloudFrontLoggingBucketProps::serverAccessLogBucket`
192
+
193
+ |originaAccessIdentity?
194
+ |https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.OriginAccessIdentity.html[`cloudfront.OriginAccessIdentity`]
195
+ |The Origina Access Identity created to connect the CloudFront
196
+ distribution to the S3 bucket (only suStable for use in regions without
197
+ OAC, such as China)
198
+ |===
199
+
200
+ == Default settings
201
+
202
+ Out of the box implementation of the Construct without any override will
203
+ set the following defaults:
204
+
205
+ === Amazon CloudFront
206
+
207
+ * Configure Access logging for CloudFront Distribution
208
+ * Enable automatic injection of best practice HTTP security headers in
209
+ all responses from CloudFront Distribution
210
+ * CloudFront originPath set to `'/'`
211
+ * Create an Origin Access Identity to access S3 bucket
212
+
213
+ === Amazon S3 Bucket
214
+
215
+ * Configure Access logging for S3 Bucket
216
+ * Enable server-side encryption for S3 Bucket using AWS managed KMS Key
217
+ * Enforce encryption of data in transit
218
+ * Turn on the versioning for S3 Bucket
219
+ * Block public access for S3 Bucket
220
+ * Retain the S3 Bucket when deleting the CloudFormation stack
221
+ * Applies Lifecycle rule to move noncurrent object versions to Glacier
222
+ storage after 90 days
223
+
224
+ == Architecture
225
+
226
+
227
+ image::aws-cloudfront-oai-s3.png["Diagram showing data flow between AWS services including CLoudFront, S3, and an Origin Access Identity",scaledwidth=100%]
228
+
229
+ // github block
230
+
231
+ '''''
232
+
233
+ © Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
package/README.md CHANGED
@@ -1,110 +1 @@
1
- # aws-cloudfront-oai-s3 module
2
- <!--BEGIN STABILITY BANNER-->
3
-
4
- ---
5
-
6
- ![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
7
-
8
- ---
9
- <!--END STABILITY BANNER-->
10
-
11
- | **Reference Documentation**:| <span style="font-weight: normal">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|
12
- |:-------------|:-------------|
13
- <div style="height:8px"></div>
14
-
15
- | **Language** | **Package** |
16
- |:-------------|-----------------|
17
- |![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_cloudfront_oai_s3`|
18
- |![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-cloudfront-oai-s3`|
19
- |![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfrontoais3`|
20
-
21
- ## Overview
22
- This AWS Solutions Construct provisions an Amazon CloudFront Distribution that serves objects from an AWS S3 Bucket via an Origin Access Identity (OAI).
23
-
24
- IMPORTANT: The recommended architecture for this pattern is to use an Origin Access Control, which is available in aws-cloudfront-s3. This construct is provided to support China regions where Origin Access Controls are not available.
25
-
26
- Here is a minimal deployable pattern definition:
27
-
28
- Typescript
29
- ``` typescript
30
- import { Construct } from 'constructs';
31
- import { Stack, StackProps } from 'aws-cdk-lib';
32
- import { CloudFrontToOaiToS3 } from '@aws-solutions-constructs/aws-cloudfront-oai-s3';
33
-
34
- new CloudFrontToOaiToS3(this, 'test-cloudfront-oai-s3', {});
35
- ```
36
-
37
- Python
38
- ``` python
39
- from aws_solutions_constructs.aws_cloudfront_oai_s3 import CloudFrontToOaiToS3
40
- from aws_cdk import Stack
41
- from constructs import Construct
42
-
43
- CloudFrontToOaiToS3(self, 'test-cloudfront-oai-s3')
44
- ```
45
-
46
- Java
47
- ``` java
48
- import software.constructs.Construct;
49
-
50
- import software.amazon.awscdk.Stack;
51
- import software.amazon.awscdk.StackProps;
52
- import software.amazon.awsconstructs.services.cloudfrontoais3.*;
53
-
54
- new CloudFrontToOaiToS3(this, "test-cloudfront-oai-s3", new CloudFrontToOaiToS3Props.Builder()
55
- .build());
56
- ```
57
-
58
- ## Pattern Construct Props
59
-
60
- | **Name** | **Type** | **Description** |
61
- |:-------------|:----------------|-----------------|
62
- |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|
63
- |insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|
64
- |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.|
65
- |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 `'/'`|
66
- |existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Existing instance of S3 content bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |
67
- |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 content bucket. Note - to log S3 access for this bucket to an existing S3 bucket, put the existing log bucket in bucketProps: `serverAccessLogsBucket`|
68
- |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|
69
- |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.|
70
- |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. Note: to use an existing bucketto hold CloudFront logs, pass the existing log bucket in |
71
- |logCloudFrontAccessLog|`boolean`|Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this while providing info about the log bucket will cause an error. Default = true |
72
- |cloudFrontLoggingBucketAccessLogBucketProps|[`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 Log Bucket Access Log bucket. Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error. To provide an existing bucket to accept these logs, pass the existing bucket in `cloudFrontLoggingBucketProps::serverAccessLogBucket`|
73
-
74
- ## Pattern Properties
75
-
76
- | **Name** | **Type** | **Description** |
77
- |:-------------|:----------------|-----------------|
78
- |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.|
79
- |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.|
80
- |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.|
81
- |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`|
82
- |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.|
83
- |cloudFrontLoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket created by the construct to hold CloudFront logs. Only populated if the construct creates the bucket (not if an existing bucket is passed in via DistributionProps)|
84
- |cloudFrontLoggingBucketAccessLogBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket containing the S3 access logs for the CloudFront log bucket. Only populated if the construct creates the bucket (not if the bucket is passed in via `cloudFrontLoggingBucketProps::serverAccessLogBucket`|
85
- |originaAccessIdentity?|[`cloudfront.OriginAccessIdentity`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.OriginAccessIdentity.html)| The Origina Access Identity created to connect the CloudFront distribution to the S3 bucket (only suitable for use in regions without OAC, such as China)|
86
-
87
- ## Default settings
88
-
89
- Out of the box implementation of the Construct without any override will set the following defaults:
90
-
91
- ### Amazon CloudFront
92
- * Configure Access logging for CloudFront Distribution
93
- * Enable automatic injection of best practice HTTP security headers in all responses from CloudFront Distribution
94
- * CloudFront originPath set to `'/'`
95
- * Create an Origin Access Identity to access S3 bucket
96
-
97
- ### Amazon S3 Bucket
98
- * Configure Access logging for S3 Bucket
99
- * Enable server-side encryption for S3 Bucket using AWS managed KMS Key
100
- * Enforce encryption of data in transit
101
- * Turn on the versioning for S3 Bucket
102
- * Block public access for S3 Bucket
103
- * Retain the S3 Bucket when deleting the CloudFormation stack
104
- * Applies Lifecycle rule to move noncurrent object versions to Glacier storage after 90 days
105
-
106
- ## Architecture
107
- ![Architecture Diagram](architecture.png)
108
-
109
- ***
110
- &copy; Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ Documentation for this pattern can be found [here](https://github.com/awslabs/aws-solutions-constructs/blob/main/source/patterns/%40aws-solutions-constructs/aws-cloudfront-oai-s3/README.adoc)
package/lib/index.js CHANGED
@@ -103,5 +103,5 @@ class CloudFrontToOaiToS3 extends constructs_1.Construct {
103
103
  }
104
104
  exports.CloudFrontToOaiToS3 = CloudFrontToOaiToS3;
105
105
  _a = JSII_RTTI_SYMBOL_1;
106
- CloudFrontToOaiToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-oai-s3.CloudFrontToOaiToS3", version: "2.85.1" };
106
+ CloudFrontToOaiToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-oai-s3.CloudFrontToOaiToS3", version: "2.85.3" };
107
107
  //# 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 s3 from 'aws-cdk-lib/aws-s3';\nimport * as defaults from '@aws-solutions-constructs/core';\n// import * as resources from '@aws-solutions-constructs/resources';\n// import * as kms from 'aws-cdk-lib/aws-kms';\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 CloudFrontToOaiToS3 Construct\n */\nexport interface CloudFrontToOaiToS3Props {\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  /**\n   * Optional user provided props to turn on/off the automatic injection of best practice HTTP\n   * security headers in all responses from cloudfront.\n   * Turning this on will inject default headers and is mutually exclusive with passing custom security headers\n   * via the responseHeadersPolicyProps parameter.\n   *\n   * @default - true\n   */\n  readonly insertHttpSecurityHeaders?: boolean;\n  /**\n   * Optional user provided configuration that cloudfront applies to all http responses.\n   * Can be used to pass a custom ResponseSecurityHeadersBehavior, ResponseCustomHeadersBehavior or\n   * ResponseHeadersCorsBehavior to the cloudfront distribution.\n   *\n   * Passing a custom ResponseSecurityHeadersBehavior is mutually exclusive with turning on the default security headers\n   * via `insertHttpSecurityHeaders` prop. Will throw an error if both `insertHttpSecurityHeaders` is set to `true`\n   * and ResponseSecurityHeadersBehavior is passed.\n   *\n   * @default - undefined\n   */\n  readonly responseHeadersPolicyProps?: cloudfront.ResponseHeadersPolicyProps\n  /**\n   * Optional user provided props to provide an originPath that CloudFront appends to the\n   * origin domain name when CloudFront requests content from the origin.\n   * The string should start with a `/`, for example `/production`.\n   * @default = '/'\n   */\n  readonly originPath?: string,\n\n  // =====================\n  // S3 Content Bucket\n  // =====================\n  /**\n   * Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingBucketObj?: s3.IBucket,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\n\n  // =====================\n  // S3 Content Bucket Access Logs Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the S3 Content bucket\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Log Bucket\n  // =====================\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Logs Bucket Access Log Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this\n   * while providing info about the log bucket will cause an error.\n   *\n   * @default - true\n   */\n  readonly logCloudFrontAccessLog?: boolean,\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket.\n   * Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketAccessLogBucketProps?: s3.BucketProps,\n}\n\nexport class CloudFrontToOaiToS3 extends Construct {\n  public readonly cloudFrontWebDistribution: cloudfront.Distribution;\n  public readonly cloudFrontFunction?: cloudfront.Function;\n  public readonly cloudFrontLoggingBucket?: s3.Bucket;\n  public readonly cloudFrontLoggingBucketAccessLogBucket?: s3.Bucket;\n  public readonly s3BucketInterface: s3.IBucket;\n  public readonly s3Bucket?: s3.Bucket;\n  public readonly s3LoggingBucket?: s3.Bucket;\n  public readonly originAccessIdentity: cloudfront.OriginAccessIdentity;\n\n  /**\n   * @summary Constructs a new instance of the CloudFrontToOaiToS3 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 {CloudFrontToOaiToS3Props} props - user provided props for the construct\n   * @since 0.8.0\n   * @access public\n   */\n  constructor(scope: Construct, id: string, props: CloudFrontToOaiToS3Props) {\n    super(scope, id);\n\n    defaults.printWarning(`This construct deploys a Cloudfront/S3 pattern connected with an Origin Access Identity,\n      the recommended architecture is to use an Origin Access Connector (provided in aws-cloudfront-oai-s3). This construct\n      is provided only for use in China regions, where OACs are not available.`);\n\n    // All our tests are based upon this behavior being on, so we're setting\n    // context here rather than assuming the client will set it\n    this.node.setContext(\"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy\", true);\n\n    defaults.CheckS3Props(props);\n    defaults.CheckCloudFrontProps(props);\n    defaults.CheckCloudfrontS3Props(props);\n    this.checkForKmsKey(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 cloudFrontOaiDistributionForS3Props: defaults.CreateCloudFrontOaiDistributionForS3Props = {\n      originPath: props.originPath,\n      sourceBucket: this.s3BucketInterface,\n      cloudFrontDistributionProps: props.cloudFrontDistributionProps,\n      httpSecurityHeaders: props.insertHttpSecurityHeaders,\n      cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,\n      responseHeadersPolicyProps: props.responseHeadersPolicyProps,\n      cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps,\n      logCloudFrontAccessLog: props.logCloudFrontAccessLog\n    };\n    const cloudFrontDistributionForS3Response = defaults.createCloudFrontOaiDistributionForS3(this, cloudFrontOaiDistributionForS3Props);\n    this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;\n    this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;\n    this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;\n    this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;\n    this.originAccessIdentity = cloudFrontDistributionForS3Response.originAccessIdentity;\n\n    // Grant CloudFront permission to get the objects from the s3 bucket origin\n    originBucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: ['s3:GetObject'],\n        principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],\n        resources: [originBucket.arnForObjects('*')],\n        conditions: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:${Aws.PARTITION}:cloudfront::${Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`\n          }\n        }\n      })\n    );\n\n  }\n\n  private checkForKmsKey(props: CloudFrontToOaiToS3Props) {\n    let errorMessages = '';\n    let errorFound = false;\n\n    if ((props.bucketProps && props.bucketProps.encryptionKey) ||\n      (props.existingBucketObj && props.existingBucketObj.encryptionKey)) {\n      errorMessages += 'Error - buckets cannot use CMKs with OAIs\\n';\n      errorFound = true;\n    }\n\n    if (errorFound) {\n      throw new Error(errorMessages);\n    }\n  }\n}"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-solutions-constructs/aws-cloudfront-oai-s3",
3
- "version": "2.85.1",
3
+ "version": "2.85.3",
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",
@@ -22,12 +22,13 @@
22
22
  "test": "jest --coverage",
23
23
  "clean": "tsc -b --clean",
24
24
  "watch": "tsc -b -w",
25
+ "asciidoc": "asciidoctor --failure-level WARNING -o /dev/null README.adoc",
25
26
  "integ": "integ-runner --update-on-failed",
26
27
  "integ-no-clean": "integ-runner --update-on-failed --no-clean",
27
28
  "integ-assert": "integ-runner",
28
29
  "jsii": "jsii",
29
30
  "jsii-pacmak": "jsii-pacmak",
30
- "build+lint+test": "npm run jsii && npm run lint && npm test && npm run integ-assert",
31
+ "build+lint+test": "npm run jsii && npm run lint && npm run asciidoc && npm test && npm run integ-assert",
31
32
  "blt": "npm run build+lint+test",
32
33
  "snapshot-update": "npm run jsii && npm test -- -u && npm run integ-assert"
33
34
  },
@@ -54,8 +55,8 @@
54
55
  }
55
56
  },
56
57
  "dependencies": {
57
- "@aws-solutions-constructs/core": "2.85.1",
58
- "@aws-solutions-constructs/resources": "2.85.1",
58
+ "@aws-solutions-constructs/core": "2.85.3",
59
+ "@aws-solutions-constructs/resources": "2.85.3",
59
60
  "constructs": "^10.0.0"
60
61
  },
61
62
  "devDependencies": {
@@ -79,8 +80,8 @@
79
80
  ]
80
81
  },
81
82
  "peerDependencies": {
82
- "@aws-solutions-constructs/core": "2.85.1",
83
- "@aws-solutions-constructs/resources": "2.85.1",
83
+ "@aws-solutions-constructs/core": "2.85.3",
84
+ "@aws-solutions-constructs/resources": "2.85.3",
84
85
  "constructs": "^10.0.0",
85
86
  "aws-cdk-lib": "^2.193.0"
86
87
  },
File without changes