@aws-solutions-constructs/aws-cloudfront-s3 2.58.0 → 2.59.0

package/.jsii

@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@aws-cdk/integ-tests-alpha": "2.143.0-alpha.0",
-    "@aws-solutions-constructs/core": "2.58.0",
-    "@aws-solutions-constructs/resources": "2.58.0",
+    "@aws-solutions-constructs/core": "2.59.0",
+    "@aws-solutions-constructs/resources": "2.59.0",
     "aws-cdk-lib": "^2.143.0",
     "constructs": "^10.0.0"
   },
@@ -3833,7 +3833,7 @@
   },
   "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
   "homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
-  "jsiiVersion": "1.98.0 (build 00b106d)",
+  "jsiiVersion": "1.99.0 (build 8f757e4)",
   "keywords": [
     "aws",
     "cdk",
@@ -3852,7 +3852,7 @@
   },
   "name": "@aws-solutions-constructs/aws-cloudfront-s3",
   "readme": {
-    "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"
+    "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|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|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|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\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"
   },
   "repository": {
     "directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-s3",
@@ -3897,7 +3897,7 @@
         },
         "locationInModule": {
           "filename": "lib/index.ts",
-          "line": 112
+          "line": 142
         },
         "parameters": [
           {
@@ -3932,7 +3932,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/index.ts",
-        "line": 95
+        "line": 124
       },
       "name": "CloudFrontToS3",
       "properties": [
@@ -3940,7 +3940,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 96
+            "line": 125
           },
           "name": "cloudFrontWebDistribution",
           "type": {
@@ -3951,7 +3951,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 99
+            "line": 129
           },
           "name": "s3BucketInterface",
           "type": {
@@ -3962,7 +3962,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 97
+            "line": 126
           },
           "name": "cloudFrontFunction",
           "optional": true,
@@ -3974,7 +3974,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 98
+            "line": 127
           },
           "name": "cloudFrontLoggingBucket",
           "optional": true,
@@ -3986,7 +3986,19 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 102
+            "line": 128
+          },
+          "name": "cloudFrontLoggingBucketAccessLogBucket",
+          "optional": true,
+          "type": {
+            "fqn": "aws-cdk-lib.aws_s3.Bucket"
+          }
+        },
+        {
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 132
           },
           "name": "originAccessControl",
           "optional": true,
@@ -3998,7 +4010,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 100
+            "line": 130
           },
           "name": "s3Bucket",
           "optional": true,
@@ -4010,7 +4022,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 101
+            "line": 131
           },
           "name": "s3LoggingBucket",
           "optional": true,
@@ -4041,12 +4053,12 @@
           "abstract": true,
           "docs": {
             "default": "- Default props are used",
-            "summary": "Optional user provided props to override the default props for the S3 Bucket."
+            "summary": "Optional user provided props to override the default props for the S3 Content Bucket."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 39
+            "line": 77
           },
           "name": "bucketProps",
           "optional": true,
@@ -4063,7 +4075,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 45
+            "line": 33
           },
           "name": "cloudFrontDistributionProps",
           "optional": true,
@@ -4075,12 +4087,30 @@
           "abstract": true,
           "docs": {
             "default": "- Default props are used",
-            "summary": "Optional user provided props to override the default props for the CloudFront Logging Bucket."
+            "remarks": "Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error",
+            "summary": "Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 121
+          },
+          "name": "cloudFrontLoggingBucketAccessLogBucketProps",
+          "optional": true,
+          "type": {
+            "fqn": "aws-cdk-lib.aws_s3.BucketProps"
+          }
+        },
+        {
+          "abstract": true,
+          "docs": {
+            "default": "- Default props are used",
+            "summary": "Optional user provided props to override the default props for the CloudFront Log Bucket."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 85
+            "line": 103
           },
           "name": "cloudFrontLoggingBucketProps",
           "optional": true,
@@ -4092,12 +4122,12 @@
           "abstract": true,
           "docs": {
             "default": "- None",
-            "summary": "Existing instance of S3 Bucket object, providing both this and `bucketProps` will cause an error."
+            "summary": "Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 33
+            "line": 71
           },
           "name": "existingBucketObj",
           "optional": true,
@@ -4115,7 +4145,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 54
+            "line": 42
           },
           "name": "insertHttpSecurityHeaders",
           "optional": true,
@@ -4123,16 +4153,34 @@
             "primitive": "boolean"
           }
         },
+        {
+          "abstract": true,
+          "docs": {
+            "default": "- true",
+            "remarks": "Specifying false for this\nwhile providing info about the log bucket will cause an error.",
+            "summary": "Optional - Whether to maintain access logs for the CloudFront Logging bucket."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 114
+          },
+          "name": "logCloudFrontAccessLog",
+          "optional": true,
+          "type": {
+            "primitive": "boolean"
+          }
+        },
         {
           "abstract": true,
           "docs": {
             "default": "- Default props are used",
-            "summary": "Optional user provided props to override the default props for the S3 Logging Bucket."
+            "summary": "Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 79
+            "line": 93
           },
           "name": "loggingBucketProps",
           "optional": true,
@@ -4144,13 +4192,12 @@
           "abstract": true,
           "docs": {
             "default": "- true",
-            "remarks": "Enabling Access Logging is a best practice.",
-            "summary": "Whether to turn on Access Logs for the S3 bucket with the associated storage costs."
+            "summary": "Optional - Whether to maintain access logs for the S3 Content bucket."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 92
+            "line": 87
           },
           "name": "logS3AccessLogs",
           "optional": true,
@@ -4168,7 +4215,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 73
+            "line": 61
           },
           "name": "originPath",
           "optional": true,
@@ -4186,7 +4233,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 66
+            "line": 54
           },
           "name": "responseHeadersPolicyProps",
           "optional": true,
@@ -4198,6 +4245,6 @@
       "symbolId": "lib/index:CloudFrontToS3Props"
     }
   },
-  "version": "2.58.0",
-  "fingerprint": "zQ8Ir/GddwxU7dnfp7mFdNwrxyYD/OpTa7Tq5f6fM2g="
+  "version": "2.59.0",
+  "fingerprint": "7yCO8iZzUm5FX/3RDU/ZWoMF8PmOEfFptd1ZomP1pKM="
 }

package/README.md

@@ -57,15 +57,17 @@ new CloudFrontToS3(this, "test-cloudfront-s3", new CloudFrontToS3Props.Builder()
 
 | **Name**     | **Type**        | **Description** |
 |:-------------|:----------------|-----------------|
-|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. |
-|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.|
 |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|
 |insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|
-| 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.|
+|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.|
 |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 `'/'`|
-|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.|
-|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.|
+|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. |
+|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`|
 |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|
+|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.|
+|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 |
+|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 |
+|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`|
 
 ## Pattern Properties
 
@@ -73,11 +75,12 @@ new CloudFrontToS3(this, "test-cloudfront-s3", new CloudFrontToS3Props.Builder()
 |:-------------|:----------------|-----------------|
 |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.|
 |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.|
-|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.|
+|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.|
 |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.|
 |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`|
 |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.|
-|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.|
+|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)|
+|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`|
 
 ## Default settings
 

package/lib/index.d.ts

@@ -17,18 +17,6 @@ import { Construct } from 'constructs';
  * @summary The properties for the CloudFrontToS3 Construct
  */
 export interface CloudFrontToS3Props {
-    /**
-     * Existing instance of S3 Bucket object, providing both this and `bucketProps` will cause an error.
-     *
-     * @default - None
-     */
-    readonly existingBucketObj?: s3.IBucket;
-    /**
-     * Optional user provided props to override the default props for the S3 Bucket.
-     *
-     * @default - Default props are used
-     */
-    readonly bucketProps?: s3.BucketProps;
     /**
      * Optional user provided props to override the default props
      *
@@ -64,29 +52,55 @@ export interface CloudFrontToS3Props {
      */
     readonly originPath?: string;
     /**
-     * Optional user provided props to override the default props for the S3 Logging Bucket.
+     * Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error.
+     *
+     * @default - None
+     */
+    readonly existingBucketObj?: s3.IBucket;
+    /**
+     * Optional user provided props to override the default props for the S3 Content Bucket.
+     *
+     * @default - Default props are used
+     */
+    readonly bucketProps?: s3.BucketProps;
+    /**
+     * Optional - Whether to maintain access logs for the S3 Content bucket
+     *
+     * @default - true
+     */
+    readonly logS3AccessLogs?: boolean;
+    /**
+     * Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket.
      *
      * @default - Default props are used
      */
     readonly loggingBucketProps?: s3.BucketProps;
     /**
-     * Optional user provided props to override the default props for the CloudFront Logging Bucket.
+     * Optional user provided props to override the default props for the CloudFront Log Bucket.
      *
      * @default - Default props are used
      */
     readonly cloudFrontLoggingBucketProps?: s3.BucketProps;
     /**
-     * Whether to turn on Access Logs for the S3 bucket with the associated storage costs.
-     * Enabling Access Logging is a best practice.
+     * 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
      */
-    readonly logS3AccessLogs?: boolean;
+    readonly logCloudFrontAccessLog?: boolean;
+    /**
+     * 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
+     *
+     * @default - Default props are used
+     */
+    readonly cloudFrontLoggingBucketAccessLogBucketProps?: s3.BucketProps;
 }
 export declare class CloudFrontToS3 extends Construct {
     readonly cloudFrontWebDistribution: cloudfront.Distribution;
     readonly cloudFrontFunction?: cloudfront.Function;
     readonly cloudFrontLoggingBucket?: s3.Bucket;
+    readonly cloudFrontLoggingBucketAccessLogBucket?: s3.Bucket;
     readonly s3BucketInterface: s3.IBucket;
     readonly s3Bucket?: s3.Bucket;
     readonly s3LoggingBucket?: s3.Bucket;
@@ -100,4 +114,5 @@ export declare class CloudFrontToS3 extends Construct {
      * @access public
      */
     constructor(scope: Construct, id: string, props: CloudFrontToS3Props);
+    private CheckConstructSpecificProps;
 }

package/lib/index.js

@@ -37,6 +37,7 @@ class CloudFrontToS3 extends constructs_1.Construct {
         this.node.setContext("@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy", true);
         defaults.CheckS3Props(props);
         defaults.CheckCloudFrontProps(props);
+        this.CheckConstructSpecificProps(props);
         let originBucket;
         if (!props.existingBucketObj) {
             const buildS3BucketResponse = defaults.buildS3Bucket(this, {
@@ -58,13 +59,15 @@ class CloudFrontToS3 extends constructs_1.Construct {
             cloudFrontDistributionProps: props.cloudFrontDistributionProps,
             httpSecurityHeaders: props.insertHttpSecurityHeaders,
             cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,
-            responseHeadersPolicyProps: props.responseHeadersPolicyProps
+            responseHeadersPolicyProps: props.responseHeadersPolicyProps,
+            cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps
         };
         const cloudFrontDistributionForS3Response = defaults.createCloudFrontDistributionForS3(this, id, cloudFrontDistributionForS3Props);
         this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;
         this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;
         this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;
         this.originAccessControl = cloudFrontDistributionForS3Response.originAccessControl;
+        this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;
         // Attach the OriginAccessControl to the CloudFront Distribution, and remove the OriginAccessIdentity
         const l1CloudFrontDistribution = this.cloudFrontWebDistribution.node.defaultChild;
         l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginAccessControlId', this.originAccessControl?.attrId);
@@ -104,8 +107,35 @@ class CloudFrontToS3 extends constructs_1.Construct {
             });
         }
     }
+    CheckConstructSpecificProps(props) {
+        let errorMessages = '';
+        let errorFound = false;
+        if ((props.logS3AccessLogs === false) && props.bucketProps?.serverAccessLogsBucket) {
+            errorMessages += 'Error - logS3AccessLogs is false, but a log bucket was provided in bucketProps.\n';
+            errorFound = true;
+        }
+        if (props.loggingBucketProps && props.bucketProps?.serverAccessLogsBucket) {
+            errorMessages += 'Error - bothlog bucket props and an existing log bucket were provided.\n';
+            errorFound = true;
+        }
+        if (props.cloudFrontLoggingBucketAccessLogBucketProps && props.cloudFrontLoggingBucketProps?.serverAccessLogsBucket) {
+            errorMessages += 'Error - an existing CloudFront log bucket S3 access log bucket and cloudFrontLoggingBucketAccessLogBucketProps were provided\n';
+            errorFound = true;
+        }
+        if (props.cloudFrontLoggingBucketAccessLogBucketProps && props.logCloudFrontAccessLog === false) {
+            errorMessages += 'Error - cloudFrontLoggingBucketAccessLogBucketProps were provided but logCloudFrontAccessLog was false\n';
+            errorFound = true;
+        }
+        if (props.cloudFrontLoggingBucketProps?.serverAccessLogsBucket && props.logCloudFrontAccessLog === false) {
+            errorMessages += 'Error - props.cloudFrontLoggingBucketProps.serverAccessLogsBucket was provided but logCloudFrontAccessLog was false\n';
+            errorFound = true;
+        }
+        if (errorFound) {
+            throw new Error(errorMessages);
+        }
+    }
 }
 exports.CloudFrontToS3 = CloudFrontToS3;
 _a = JSII_RTTI_SYMBOL_1;
-CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.58.0" };
-//# 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, id,  {\n        distribution: this.cloudFrontWebDistribution,\n        encryptionKey\n      });\n    }\n  }\n}"]}
+CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.59.0" };
+//# 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   * 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 CloudFrontToS3 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 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    this.CheckConstructSpecificProps(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      cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps\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    this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;\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, id,  {\n        distribution: this.cloudFrontWebDistribution,\n        encryptionKey\n      });\n    }\n  }\n\n  private CheckConstructSpecificProps(props: CloudFrontToS3Props) {\n    let errorMessages = '';\n    let errorFound = false;\n\n    if ((props.logS3AccessLogs === false) && props.bucketProps?.serverAccessLogsBucket) {\n      errorMessages += 'Error - logS3AccessLogs is false, but a log bucket was provided in bucketProps.\\n';\n      errorFound = true;\n    }\n\n    if (props.loggingBucketProps && props.bucketProps?.serverAccessLogsBucket) {\n      errorMessages += 'Error - bothlog bucket props and an existing log bucket were provided.\\n';\n      errorFound = true;\n    }\n\n    if (props.cloudFrontLoggingBucketAccessLogBucketProps && props.cloudFrontLoggingBucketProps?.serverAccessLogsBucket) {\n      errorMessages += 'Error - an existing CloudFront log bucket S3 access log bucket and cloudFrontLoggingBucketAccessLogBucketProps were provided\\n';\n      errorFound = true;\n    }\n\n    if (props.cloudFrontLoggingBucketAccessLogBucketProps && props.logCloudFrontAccessLog === false) {\n      errorMessages += 'Error - cloudFrontLoggingBucketAccessLogBucketProps were provided but logCloudFrontAccessLog was false\\n';\n      errorFound = true;\n    }\n\n    if (props.cloudFrontLoggingBucketProps?.serverAccessLogsBucket && props.logCloudFrontAccessLog === false) {\n      errorMessages += 'Error - props.cloudFrontLoggingBucketProps.serverAccessLogsBucket was provided but logCloudFrontAccessLog was false\\n';\n      errorFound = true;\n    }\n\n    if (errorFound) {\n      throw new Error(errorMessages);\n    }\n  }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-solutions-constructs/aws-cloudfront-s3",
-  "version": "2.58.0",
+  "version": "2.59.0",
   "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -54,8 +54,8 @@
   },
   "dependencies": {
     "@aws-cdk/integ-tests-alpha": "2.143.0-alpha.0",
-    "@aws-solutions-constructs/core": "2.58.0",
-    "@aws-solutions-constructs/resources": "2.58.0",
+    "@aws-solutions-constructs/core": "2.59.0",
+    "@aws-solutions-constructs/resources": "2.59.0",
     "constructs": "^10.0.0"
   },
   "devDependencies": {
@@ -79,8 +79,8 @@
     ]
   },
   "peerDependencies": {
-    "@aws-solutions-constructs/core": "2.58.0",
-    "@aws-solutions-constructs/resources": "2.58.0",
+    "@aws-solutions-constructs/core": "2.59.0",
+    "@aws-solutions-constructs/resources": "2.59.0",
     "constructs": "^10.0.0",
     "aws-cdk-lib": "^2.143.0"
   },