@aws-solutions-constructs/aws-cloudfront-s3 1.126.0 → 1.127.0

package/.jsii

@@ -8,13 +8,13 @@
     "url": "https://aws.amazon.com"
   },
   "dependencies": {
-    "@aws-cdk/aws-certificatemanager": "1.126.0",
-    "@aws-cdk/aws-cloudfront": "1.126.0",
-    "@aws-cdk/aws-cloudfront-origins": "1.126.0",
-    "@aws-cdk/aws-lambda": "1.126.0",
-    "@aws-cdk/aws-s3": "1.126.0",
-    "@aws-cdk/core": "1.126.0",
-    "@aws-solutions-constructs/core": "1.126.0",
+    "@aws-cdk/aws-certificatemanager": "1.127.0",
+    "@aws-cdk/aws-cloudfront": "1.127.0",
+    "@aws-cdk/aws-cloudfront-origins": "1.127.0",
+    "@aws-cdk/aws-lambda": "1.127.0",
+    "@aws-cdk/aws-s3": "1.127.0",
+    "@aws-cdk/core": "1.127.0",
+    "@aws-solutions-constructs/core": "1.127.0",
     "constructs": "^3.2.0"
   },
   "dependencyClosure": {
@@ -182,12 +182,7 @@
     },
     "@aws-cdk/aws-cloudfront": {
       "submodules": {
-        "@aws-cdk/aws-cloudfront.experimental": {
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 12
-          }
-        }
+        "@aws-cdk/aws-cloudfront.experimental": {}
       },
       "targets": {
         "dotnet": {
@@ -1455,7 +1450,7 @@
   },
   "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
   "homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
-  "jsiiVersion": "1.40.0 (build 9713b9d)",
+  "jsiiVersion": "1.46.0 (build cd08c55)",
   "keywords": [
     "aws",
     "cdk",
@@ -1474,7 +1469,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\nThis AWS Solutions Construct implements an AWS CloudFront fronting an AWS S3 Bucket.\n\nHere is a minimal deployable pattern definition in Typescript:\n\n``` typescript\nimport { CloudFrontToS3 } from '@aws-solutions-constructs/aws-cloudfront-s3';\n\nnew CloudFrontToS3(this, 'test-cloudfront-s3', {});\n\n```\n\n## Initializer\n\n``` text\nnew CloudFrontToS3(scope: Construct, id: string, props: CloudFrontToS3Props);\n```\n\n_Parameters_\n\n* scope [`Construct`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_core.Construct.html)\n* id `string`\n* props [`CloudFrontToS3Props`](#pattern-construct-props)\n\n## Pattern Construct Props\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|existingBucketInterface?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Existing instance of S3 Bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |\n|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Bucket.|\n|cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|\n|insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|\n|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|\n|cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket.|\n\n## Pattern Properties\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontWebDistribution|[`cloudfront.CloudFrontWebDistribution`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.CloudFrontWebDistribution.html)|Returns an instance of cloudfront.CloudFrontWebDistribution created by the construct|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the pattern.|\n|cloudFrontLoggingBucket|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-s3-readme.html)|Returns an instance of the logging bucket for CloudFront WebDistribution.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct|\n|s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct. IMPORTANT: If existingBucketInterface was provided in Pattern Construct Props, this property will be `undefined`|\n|s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon CloudFront\n* Configure Access logging for CloudFront WebDistribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront WebDistribution\n\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 2021 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\nThis AWS Solutions Construct implements an AWS CloudFront fronting an AWS S3 Bucket.\n\nHere is a minimal deployable pattern definition in Typescript:\n\n``` typescript\nimport { CloudFrontToS3 } from '@aws-solutions-constructs/aws-cloudfront-s3';\n\nnew CloudFrontToS3(this, 'test-cloudfront-s3', {});\n\n```\n\n## Initializer\n\n``` text\nnew CloudFrontToS3(scope: Construct, id: string, props: CloudFrontToS3Props);\n```\n\n_Parameters_\n\n* scope [`Construct`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_core.Construct.html)\n* id `string`\n* props [`CloudFrontToS3Props`](#pattern-construct-props)\n\n## Pattern Construct Props\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Existing instance of S3 Bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |\n|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Bucket.|\n|cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|\n|insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|\n|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront-origins.S3OriginProps.html#originpath) that CloudFront appends to the origin domain name when CloudFront requests content from the origin. The string should start with a `/`, for example: `/production`. Default value is `'/'`|\n|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|\n|cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket.|\n|logS3AccessLogs?| boolean|Whether to turn on Access Logging for the S3 bucket. Creates an S3 bucket with associated storage costs for the logs. Enabling Access Logging is a best practice. default - true|\n\n## Pattern Properties\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontWebDistribution|[`cloudfront.CloudFrontWebDistribution`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.CloudFrontWebDistribution.html)|Returns an instance of cloudfront.CloudFrontWebDistribution created by the construct|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the pattern.|\n|cloudFrontLoggingBucket|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-s3-readme.html)|Returns an instance of the logging bucket for CloudFront WebDistribution.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct|\n|s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct. IMPORTANT: If existingBucketInterface was provided in Pattern Construct Props, this property will be `undefined`|\n|s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon CloudFront\n* Configure Access logging for CloudFront WebDistribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront WebDistribution\n* CloudFront originPath set to `'/'`\n\n### Amazon S3 Bucket\n* Configure Access logging for S3 Bucket\n* Enable server-side encryption for S3 Bucket using AWS managed KMS Key\n* Enforce encryption of data in transit\n* Turn on the versioning for S3 Bucket\n* Don't allow public access for S3 Bucket\n* Retain the S3 Bucket when deleting the CloudFormation stack\n* Applies Lifecycle rule to move noncurrent object versions to Glacier storage after 90 days\n\n## Architecture\n![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
   },
   "repository": {
     "directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-s3",
@@ -1485,8 +1480,8 @@
   "targets": {
     "dotnet": {
       "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png",
-      "namespace": "Amazon.Constructs.AWS.CloudfrontS3",
-      "packageId": "Amazon.Constructs.AWS.CloudfrontS3",
+      "namespace": "Amazon.SolutionsConstructs.AWS.CloudfrontS3",
+      "packageId": "Amazon.SolutionsConstructs.AWS.CloudfrontS3",
       "signAssembly": true
     },
     "java": {
@@ -1519,7 +1514,7 @@
         },
         "locationInModule": {
           "filename": "lib/index.ts",
-          "line": 79
+          "line": 93
         },
         "parameters": [
           {
@@ -1554,7 +1549,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/index.ts",
-        "line": 63
+        "line": 77
       },
       "name": "CloudFrontToS3",
       "properties": [
@@ -1562,7 +1557,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 64
+            "line": 78
           },
           "name": "cloudFrontWebDistribution",
           "type": {
@@ -1573,7 +1568,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 67
+            "line": 81
           },
           "name": "s3BucketInterface",
           "type": {
@@ -1584,7 +1579,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 65
+            "line": 79
           },
           "name": "cloudFrontFunction",
           "optional": true,
@@ -1596,7 +1591,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 66
+            "line": 80
           },
           "name": "cloudFrontLoggingBucket",
           "optional": true,
@@ -1608,7 +1603,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 68
+            "line": 82
           },
           "name": "s3Bucket",
           "optional": true,
@@ -1620,7 +1615,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 69
+            "line": 83
           },
           "name": "s3LoggingBucket",
           "optional": true,
@@ -1690,7 +1685,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 60
+            "line": 67
           },
           "name": "cloudFrontLoggingBucketProps",
           "optional": true,
@@ -1709,7 +1704,7 @@
             "filename": "lib/index.ts",
             "line": 29
           },
-          "name": "existingBucketInterface",
+          "name": "existingBucketObj",
           "optional": true,
           "type": {
             "fqn": "@aws-cdk/aws-s3.IBucket"
@@ -1741,18 +1736,56 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 54
+            "line": 61
           },
           "name": "loggingBucketProps",
           "optional": true,
           "type": {
             "fqn": "@aws-cdk/aws-s3.BucketProps"
           }
+        },
+        {
+          "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."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 74
+          },
+          "name": "logS3AccessLogs",
+          "optional": true,
+          "type": {
+            "primitive": "boolean"
+          }
+        },
+        {
+          "abstract": true,
+          "docs": {
+            "custom": {
+              "dafault": "= '/'"
+            },
+            "remarks": "The string should start with a `/`, for example `/production`.",
+            "summary": "Optional user provided props to provide an originPath that CloudFront appends to the origin domain name when CloudFront requests content from the origin."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 55
+          },
+          "name": "originPath",
+          "optional": true,
+          "type": {
+            "primitive": "string"
+          }
         }
       ],
       "symbolId": "lib/index:CloudFrontToS3Props"
     }
   },
-  "version": "1.126.0",
-  "fingerprint": "E6+iy6H+j98lQ0LoOjYspHTlH6Rh5ukGOd2GUHEEvFo="
+  "version": "1.127.0",
+  "fingerprint": "4o/SdFjVD3NffCSdowbLIfjmhh9/uT3rT6oWt6JE4jA="
 }

package/README.md

@@ -45,12 +45,14 @@ _Parameters_
 
 | **Name**     | **Type**        | **Description** |
 |:-------------|:----------------|-----------------|
-|existingBucketInterface?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Existing instance of S3 Bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |
+|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Existing instance of S3 Bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |
 |bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Bucket.|
 |cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|
 |insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|
+|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudfront-origins.S3OriginProps.html#originpath) that CloudFront appends to the origin domain name when CloudFront requests content from the origin. The string should start with a `/`, for example: `/production`. Default value is `'/'`|
 |loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|
 |cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket.|
+|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|
 
 ## Pattern Properties
 
@@ -70,6 +72,7 @@ Out of the box implementation of the Construct without any override will set the
 ### Amazon CloudFront
 * Configure Access logging for CloudFront WebDistribution
 * Enable automatic injection of best practice HTTP security headers in all responses from CloudFront WebDistribution
+* CloudFront originPath set to `'/'` 
 
 ### Amazon S3 Bucket
 * Configure Access logging for S3 Bucket

package/lib/index.d.ts

@@ -22,7 +22,7 @@ export interface CloudFrontToS3Props {
      *
      * @default - None
      */
-    readonly existingBucketInterface?: s3.IBucket;
+    readonly existingBucketObj?: s3.IBucket;
     /**
      * Optional user provided props to override the default props for the S3 Bucket.
      *
@@ -41,6 +41,14 @@ export interface CloudFrontToS3Props {
      * @default - true
      */
     readonly insertHttpSecurityHeaders?: boolean;
+    /**
+     * Optional user provided props to provide an 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`.
+     *
+     * @dafault = '/'
+     */
+    readonly originPath?: string;
     /**
      * Optional user provided props to override the default props for the S3 Logging Bucket.
      *
@@ -53,6 +61,14 @@ export interface CloudFrontToS3Props {
      * @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.
+     *
+     * @default - true
+     */
+    readonly logS3AccessLogs?: boolean;
 }
 export declare class CloudFrontToS3 extends Construct {
     readonly cloudFrontWebDistribution: cloudfront.Distribution;

package/lib/index.js

@@ -18,21 +18,24 @@ class CloudFrontToS3 extends core_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         defaults.CheckProps(props);
-        if (!props.existingBucketInterface) {
+        let bucket;
+        if (!props.existingBucketObj) {
             [this.s3Bucket, this.s3LoggingBucket] = defaults.buildS3Bucket(this, {
                 bucketProps: props.bucketProps,
-                loggingBucketProps: props.loggingBucketProps
+                loggingBucketProps: props.loggingBucketProps,
+                logS3AccessLogs: props.logS3AccessLogs
             });
-            this.s3BucketInterface = this.s3Bucket;
+            bucket = this.s3Bucket;
         }
         else {
-            this.s3BucketInterface = props.existingBucketInterface;
+            bucket = props.existingBucketObj;
         }
+        this.s3BucketInterface = bucket;
         [this.cloudFrontWebDistribution, this.cloudFrontFunction, this.cloudFrontLoggingBucket] =
-            defaults.CloudFrontDistributionForS3(this, this.s3BucketInterface, props.cloudFrontDistributionProps, props.insertHttpSecurityHeaders, props.cloudFrontLoggingBucketProps);
+            defaults.CloudFrontDistributionForS3(this, this.s3BucketInterface, props.cloudFrontDistributionProps, props.insertHttpSecurityHeaders, props.originPath, props.cloudFrontLoggingBucketProps);
     }
 }
 exports.CloudFrontToS3 = CloudFrontToS3;
 _a = JSII_RTTI_SYMBOL_1;
-CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "1.126.0" };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWVBLHdGQUF3RjtBQUN4Rix3Q0FBMEM7QUFDMUMsMkRBQTJEO0FBa0IzRCxNQUFhLGNBQWUsU0FBUSxnQkFBUzs7Ozs7Ozs7O0lBU3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBMEI7UUFDbEUsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixRQUFRLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRTNCLElBQUksQ0FBQyxLQUFLLENBQUMsdUJBQXVCLEVBQUU7WUFDbEMsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtnQkFDbkUsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO2dCQUM5QixrQkFBa0IsRUFBRSxLQUFLLENBQUMsa0JBQWtCO2FBQzdDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxpQkFBaUIsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1NBQ3hDO2FBQU07WUFDTCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsS0FBSyxDQUFDLHVCQUF1QixDQUFDO1NBQ3hEO1FBRUQsQ0FBQyxJQUFJLENBQUMseUJBQXlCLEVBQUUsSUFBSSxDQUFDLGtCQUFrQixFQUFFLElBQUksQ0FBQyx1QkFBdUIsQ0FBQztZQUNuRixRQUFRLENBQUMsMkJBQTJCLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFDL0QsS0FBSyxDQUFDLDJCQUEyQixFQUFFLEtBQUssQ0FBQyx5QkFBeUIsRUFBRSxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUNoSCxDQUFDOztBQTFCTix3Q0EyQkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMSBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbmltcG9ydCAqIGFzIGNsb3VkZnJvbnQgZnJvbSAnQGF3cy1jZGsvYXdzLWNsb3VkZnJvbnQnO1xuaW1wb3J0ICogYXMgczMgZnJvbSAnQGF3cy1jZGsvYXdzLXMzJztcbi8vIE5vdGU6IFRvIGVuc3VyZSBDREt2MiBjb21wYXRpYmlsaXR5LCBrZWVwIHRoZSBpbXBvcnQgc3RhdGVtZW50IGZvciBDb25zdHJ1Y3Qgc2VwYXJhdGVcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0ICogYXMgZGVmYXVsdHMgZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuZXhwb3J0IGludGVyZmFjZSBDbG91ZEZyb250VG9TM1Byb3BzIHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgIHJlYWRvbmx5IGV4aXN0aW5nQnVja2V0SW50ZXJmYWNlPzogczMuSUJ1Y2tldCxcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gICByZWFkb25seSBidWNrZXRQcm9wcz86IHMzLkJ1Y2tldFByb3BzLFxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICAgcmVhZG9ubHkgY2xvdWRGcm9udERpc3RyaWJ1dGlvblByb3BzPzogY2xvdWRmcm9udC5EaXN0cmlidXRpb25Qcm9wcyB8IGFueSxcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgIHJlYWRvbmx5IGluc2VydEh0dHBTZWN1cml0eUhlYWRlcnM/OiBib29sZWFuO1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICAgIHJlYWRvbmx5IGxvZ2dpbmdCdWNrZXRQcm9wcz86IHMzLkJ1Y2tldFByb3BzXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICAgIHJlYWRvbmx5IGNsb3VkRnJvbnRMb2dnaW5nQnVja2V0UHJvcHM/OiBzMy5CdWNrZXRQcm9wc1xuIH1cblxuZXhwb3J0IGNsYXNzIENsb3VkRnJvbnRUb1MzIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgICAgcHVibGljIHJlYWRvbmx5IGNsb3VkRnJvbnRXZWJEaXN0cmlidXRpb246IGNsb3VkZnJvbnQuRGlzdHJpYnV0aW9uO1xuICAgICBwdWJsaWMgcmVhZG9ubHkgY2xvdWRGcm9udEZ1bmN0aW9uPzogY2xvdWRmcm9udC5GdW5jdGlvbjtcbiAgICAgcHVibGljIHJlYWRvbmx5IGNsb3VkRnJvbnRMb2dnaW5nQnVja2V0PzogczMuQnVja2V0O1xuICAgICBwdWJsaWMgcmVhZG9ubHkgczNCdWNrZXRJbnRlcmZhY2U6IHMzLklCdWNrZXQ7XG4gICAgIHB1YmxpYyByZWFkb25seSBzM0J1Y2tldD86IHMzLkJ1Y2tldDtcbiAgICAgcHVibGljIHJlYWRvbmx5IHMzTG9nZ2luZ0J1Y2tldD86IHMzLkJ1Y2tldDtcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gICAgIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBDbG91ZEZyb250VG9TM1Byb3BzKSB7XG4gICAgICAgc3VwZXIoc2NvcGUsIGlkKTtcbiAgICAgICBkZWZhdWx0cy5DaGVja1Byb3BzKHByb3BzKTtcblxuICAgICAgIGlmICghcHJvcHMuZXhpc3RpbmdCdWNrZXRJbnRlcmZhY2UpIHtcbiAgICAgICAgIFt0aGlzLnMzQnVja2V0LCB0aGlzLnMzTG9nZ2luZ0J1Y2tldF0gPSBkZWZhdWx0cy5idWlsZFMzQnVja2V0KHRoaXMsIHtcbiAgICAgICAgICAgYnVja2V0UHJvcHM6IHByb3BzLmJ1Y2tldFByb3BzLFxuICAgICAgICAgICBsb2dnaW5nQnVja2V0UHJvcHM6IHByb3BzLmxvZ2dpbmdCdWNrZXRQcm9wc1xuICAgICAgICAgfSk7XG4gICAgICAgICB0aGlzLnMzQnVja2V0SW50ZXJmYWNlID0gdGhpcy5zM0J1Y2tldDtcbiAgICAgICB9IGVsc2Uge1xuICAgICAgICAgdGhpcy5zM0J1Y2tldEludGVyZmFjZSA9IHByb3BzLmV4aXN0aW5nQnVja2V0SW50ZXJmYWNlO1xuICAgICAgIH1cblxuICAgICAgIFt0aGlzLmNsb3VkRnJvbnRXZWJEaXN0cmlidXRpb24sIHRoaXMuY2xvdWRGcm9udEZ1bmN0aW9uLCB0aGlzLmNsb3VkRnJvbnRMb2dnaW5nQnVja2V0XSA9XG4gICAgICAgICAgIGRlZmF1bHRzLkNsb3VkRnJvbnREaXN0cmlidXRpb25Gb3JTMyh0aGlzLCB0aGlzLnMzQnVja2V0SW50ZXJmYWNlLFxuICAgICAgICAgICAgIHByb3BzLmNsb3VkRnJvbnREaXN0cmlidXRpb25Qcm9wcywgcHJvcHMuaW5zZXJ0SHR0cFNlY3VyaXR5SGVhZGVycywgcHJvcHMuY2xvdWRGcm9udExvZ2dpbmdCdWNrZXRQcm9wcyk7XG4gICAgIH1cbn1cbiJdfQ==
+CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "1.127.0" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWVBLHdGQUF3RjtBQUN4Rix3Q0FBMEM7QUFDMUMsMkRBQTJEO0FBc0IzRCxNQUFhLGNBQWUsU0FBUSxnQkFBUzs7Ozs7Ozs7O0lBUzNDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBMEI7UUFDbEUsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixRQUFRLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRTNCLElBQUksTUFBa0IsQ0FBQztRQUV2QixJQUFJLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFO1lBQzVCLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUU7Z0JBQ25FLFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVztnQkFDOUIsa0JBQWtCLEVBQUUsS0FBSyxDQUFDLGtCQUFrQjtnQkFDNUMsZUFBZSxFQUFFLEtBQUssQ0FBQyxlQUFlO2FBQ3ZDLENBQUMsQ0FBQztZQUNILE1BQU0sR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1NBQ3hCO2FBQU07WUFDTCxNQUFNLEdBQUcsS0FBSyxDQUFDLGlCQUFpQixDQUFDO1NBQ2xDO1FBRUQsSUFBSSxDQUFDLGlCQUFpQixHQUFHLE1BQU0sQ0FBQztRQUVoQyxDQUFDLElBQUksQ0FBQyx5QkFBeUIsRUFBRSxJQUFJLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLHVCQUF1QixDQUFDO1lBQ3JGLFFBQVEsQ0FBQywyQkFBMkIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUMvRCxLQUFLLENBQUMsMkJBQTJCLEVBQUUsS0FBSyxDQUFDLHlCQUF5QixFQUFFLEtBQUssQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDaEksQ0FBQzs7QUEvQkgsd0NBaUNDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IDIwMjEgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG5pbXBvcnQgKiBhcyBjbG91ZGZyb250IGZyb20gJ0Bhd3MtY2RrL2F3cy1jbG91ZGZyb250JztcbmltcG9ydCAqIGFzIHMzIGZyb20gJ0Bhd3MtY2RrL2F3cy1zMyc7XG4vLyBOb3RlOiBUbyBlbnN1cmUgQ0RLdjIgY29tcGF0aWJpbGl0eSwga2VlcCB0aGUgaW1wb3J0IHN0YXRlbWVudCBmb3IgQ29uc3RydWN0IHNlcGFyYXRlXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdAYXdzLWNkay9jb3JlJztcbmltcG9ydCAqIGFzIGRlZmF1bHRzIGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5cbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbmV4cG9ydCBpbnRlcmZhY2UgQ2xvdWRGcm9udFRvUzNQcm9wcyB7XG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBleGlzdGluZ0J1Y2tldE9iaj86IHMzLklCdWNrZXQsXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcmVhZG9ubHkgYnVja2V0UHJvcHM/OiBzMy5CdWNrZXRQcm9wcyxcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IGNsb3VkRnJvbnREaXN0cmlidXRpb25Qcm9wcz86IGNsb3VkZnJvbnQuRGlzdHJpYnV0aW9uUHJvcHMgfCBhbnksXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IGluc2VydEh0dHBTZWN1cml0eUhlYWRlcnM/OiBib29sZWFuO1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcmVhZG9ubHkgb3JpZ2luUGF0aD86IHN0cmluZyxcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IGxvZ2dpbmdCdWNrZXRQcm9wcz86IHMzLkJ1Y2tldFByb3BzXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IGNsb3VkRnJvbnRMb2dnaW5nQnVja2V0UHJvcHM/OiBzMy5CdWNrZXRQcm9wc1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBsb2dTM0FjY2Vzc0xvZ3M/OiBib29sZWFuO1xufVxuXG5leHBvcnQgY2xhc3MgQ2xvdWRGcm9udFRvUzMgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBwdWJsaWMgcmVhZG9ubHkgY2xvdWRGcm9udFdlYkRpc3RyaWJ1dGlvbjogY2xvdWRmcm9udC5EaXN0cmlidXRpb247XG4gIHB1YmxpYyByZWFkb25seSBjbG91ZEZyb250RnVuY3Rpb24/OiBjbG91ZGZyb250LkZ1bmN0aW9uO1xuICBwdWJsaWMgcmVhZG9ubHkgY2xvdWRGcm9udExvZ2dpbmdCdWNrZXQ/OiBzMy5CdWNrZXQ7XG4gIHB1YmxpYyByZWFkb25seSBzM0J1Y2tldEludGVyZmFjZTogczMuSUJ1Y2tldDtcbiAgcHVibGljIHJlYWRvbmx5IHMzQnVja2V0PzogczMuQnVja2V0O1xuICBwdWJsaWMgcmVhZG9ubHkgczNMb2dnaW5nQnVja2V0PzogczMuQnVja2V0O1xuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IENsb3VkRnJvbnRUb1MzUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIGRlZmF1bHRzLkNoZWNrUHJvcHMocHJvcHMpO1xuXG4gICAgbGV0IGJ1Y2tldDogczMuSUJ1Y2tldDtcblxuICAgIGlmICghcHJvcHMuZXhpc3RpbmdCdWNrZXRPYmopIHtcbiAgICAgIFt0aGlzLnMzQnVja2V0LCB0aGlzLnMzTG9nZ2luZ0J1Y2tldF0gPSBkZWZhdWx0cy5idWlsZFMzQnVja2V0KHRoaXMsIHtcbiAgICAgICAgYnVja2V0UHJvcHM6IHByb3BzLmJ1Y2tldFByb3BzLFxuICAgICAgICBsb2dnaW5nQnVja2V0UHJvcHM6IHByb3BzLmxvZ2dpbmdCdWNrZXRQcm9wcyxcbiAgICAgICAgbG9nUzNBY2Nlc3NMb2dzOiBwcm9wcy5sb2dTM0FjY2Vzc0xvZ3NcbiAgICAgIH0pO1xuICAgICAgYnVja2V0ID0gdGhpcy5zM0J1Y2tldDtcbiAgICB9IGVsc2Uge1xuICAgICAgYnVja2V0ID0gcHJvcHMuZXhpc3RpbmdCdWNrZXRPYmo7XG4gICAgfVxuXG4gICAgdGhpcy5zM0J1Y2tldEludGVyZmFjZSA9IGJ1Y2tldDtcblxuICAgIFt0aGlzLmNsb3VkRnJvbnRXZWJEaXN0cmlidXRpb24sIHRoaXMuY2xvdWRGcm9udEZ1bmN0aW9uLCB0aGlzLmNsb3VkRnJvbnRMb2dnaW5nQnVja2V0XSA9XG4gICAgICBkZWZhdWx0cy5DbG91ZEZyb250RGlzdHJpYnV0aW9uRm9yUzModGhpcywgdGhpcy5zM0J1Y2tldEludGVyZmFjZSxcbiAgICAgICAgcHJvcHMuY2xvdWRGcm9udERpc3RyaWJ1dGlvblByb3BzLCBwcm9wcy5pbnNlcnRIdHRwU2VjdXJpdHlIZWFkZXJzLCBwcm9wcy5vcmlnaW5QYXRoLCBwcm9wcy5jbG91ZEZyb250TG9nZ2luZ0J1Y2tldFByb3BzKTtcbiAgfVxuXG59XG4iXX0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-solutions-constructs/aws-cloudfront-s3",
-  "version": "1.126.0",
+  "version": "1.127.0",
   "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,8 +41,8 @@
         }
       },
       "dotnet": {
-        "namespace": "Amazon.Constructs.AWS.CloudfrontS3",
-        "packageId": "Amazon.Constructs.AWS.CloudfrontS3",
+        "namespace": "Amazon.SolutionsConstructs.AWS.CloudfrontS3",
+        "packageId": "Amazon.SolutionsConstructs.AWS.CloudfrontS3",
         "signAssembly": true,
         "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png"
       },
@@ -53,17 +53,17 @@
     }
   },
   "dependencies": {
-    "@aws-cdk/core": "1.126.0",
-    "@aws-cdk/aws-cloudfront": "1.126.0",
-    "@aws-cdk/aws-s3": "1.126.0",
-    "@aws-cdk/aws-lambda": "1.126.0",
-    "@aws-solutions-constructs/core": "1.126.0",
-    "@aws-cdk/aws-certificatemanager": "1.126.0",
-    "@aws-cdk/aws-cloudfront-origins": "1.126.0",
+    "@aws-cdk/core": "1.127.0",
+    "@aws-cdk/aws-cloudfront": "1.127.0",
+    "@aws-cdk/aws-s3": "1.127.0",
+    "@aws-cdk/aws-lambda": "1.127.0",
+    "@aws-solutions-constructs/core": "1.127.0",
+    "@aws-cdk/aws-certificatemanager": "1.127.0",
+    "@aws-cdk/aws-cloudfront-origins": "1.127.0",
     "constructs": "^3.2.0"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "1.126.0",
+    "@aws-cdk/assert": "1.127.0",
     "@types/jest": "^26.0.22",
     "@types/node": "^10.3.0"
   },
@@ -82,14 +82,14 @@
     ]
   },
   "peerDependencies": {
-    "@aws-cdk/core": "1.126.0",
-    "@aws-cdk/aws-cloudfront": "1.126.0",
-    "@aws-cdk/aws-s3": "1.126.0",
-    "@aws-solutions-constructs/core": "1.126.0",
+    "@aws-cdk/core": "1.127.0",
+    "@aws-cdk/aws-cloudfront": "1.127.0",
+    "@aws-cdk/aws-s3": "1.127.0",
+    "@aws-solutions-constructs/core": "1.127.0",
     "constructs": "^3.2.0",
-    "@aws-cdk/aws-lambda": "1.126.0",
-    "@aws-cdk/aws-certificatemanager": "1.126.0",
-    "@aws-cdk/aws-cloudfront-origins": "1.126.0"
+    "@aws-cdk/aws-lambda": "1.127.0",
+    "@aws-cdk/aws-certificatemanager": "1.127.0",
+    "@aws-cdk/aws-cloudfront-origins": "1.127.0"
   },
   "keywords": [
     "aws",

package/test/integ.custom-originPath.d.ts

@@ -0,0 +1,13 @@
+/**
+ *  Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ *  with the License. A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+ *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+ *  and limitations under the License.
+ */
+export {};

package/test/integ.custom-originPath.expected.json

@@ -0,0 +1,425 @@
+{
+  "Description": "Integration Test for originPath with aws-cloudfront-s3",
+  "Resources": {
+    "testcloudfronts3S3LoggingBucket90D239DD": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "AccessControl": "LogDeliveryWrite",
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        },
+        "PublicAccessBlockConfiguration": {
+          "BlockPublicAcls": true,
+          "BlockPublicPolicy": true,
+          "IgnorePublicAcls": true,
+          "RestrictPublicBuckets": true
+        },
+        "VersioningConfiguration": {
+          "Status": "Enabled"
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W35",
+              "reason": "This S3 bucket is used as the access logging bucket for another bucket"
+            }
+          ]
+        }
+      }
+    },
+    "testcloudfronts3S3LoggingBucketPolicy529D4CFF": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "testcloudfronts3S3LoggingBucket90D239DD"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "testcloudfronts3S3LoggingBucket90D239DD",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::GetAtt": [
+                    "testcloudfronts3S3LoggingBucket90D239DD",
+                    "Arn"
+                  ]
+                }
+              ],
+              "Sid": "HttpsOnly"
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      }
+    },
+    "testcloudfronts3S3BucketE0C5F76E": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        },
+        "LifecycleConfiguration": {
+          "Rules": [
+            {
+              "NoncurrentVersionTransitions": [
+                {
+                  "StorageClass": "GLACIER",
+                  "TransitionInDays": 90
+                }
+              ],
+              "Status": "Enabled"
+            }
+          ]
+        },
+        "LoggingConfiguration": {
+          "DestinationBucketName": {
+            "Ref": "testcloudfronts3S3LoggingBucket90D239DD"
+          }
+        },
+        "PublicAccessBlockConfiguration": {
+          "BlockPublicAcls": true,
+          "BlockPublicPolicy": true,
+          "IgnorePublicAcls": true,
+          "RestrictPublicBuckets": true
+        },
+        "VersioningConfiguration": {
+          "Status": "Enabled"
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "testcloudfronts3S3BucketPolicy250F1F61": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "testcloudfronts3S3BucketE0C5F76E"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "testcloudfronts3S3BucketE0C5F76E",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::GetAtt": [
+                    "testcloudfronts3S3BucketE0C5F76E",
+                    "Arn"
+                  ]
+                }
+              ],
+              "Sid": "HttpsOnly"
+            },
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Principal": {
+                "CanonicalUser": {
+                  "Fn::GetAtt": [
+                    "testcloudfronts3CloudFrontDistributionOrigin1S3Origin4695F058",
+                    "S3CanonicalUserId"
+                  ]
+                }
+              },
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    {
+                      "Fn::GetAtt": [
+                        "testcloudfronts3S3BucketE0C5F76E",
+                        "Arn"
+                      ]
+                    },
+                    "/*"
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "F16",
+              "reason": "Public website bucket policy requires a wildcard principal"
+            }
+          ]
+        }
+      }
+    },
+    "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": {
+      "Type": "AWS::CloudFront::Function",
+      "Properties": {
+        "Name": "SetHttpSecurityHeadersc824484dfea4176847245e871498ffd7e454223fe4",
+        "AutoPublish": true,
+        "FunctionCode": "function handler(event) { var response = event.response;       var headers = response.headers;       headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'};       headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"};       headers['x-content-type-options'] = { value: 'nosniff'};       headers['x-frame-options'] = {value: 'DENY'};       headers['x-xss-protection'] = {value: '1; mode=block'};       return response;     }",
+        "FunctionConfig": {
+          "Comment": "SetHttpSecurityHeadersc824484dfea4176847245e871498ffd7e454223fe4",
+          "Runtime": "cloudfront-js-1.0"
+        }
+      }
+    },
+    "testcloudfronts3CloudfrontLoggingBucket985C0FE8": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "AccessControl": "LogDeliveryWrite",
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        },
+        "PublicAccessBlockConfiguration": {
+          "BlockPublicAcls": true,
+          "BlockPublicPolicy": true,
+          "IgnorePublicAcls": true,
+          "RestrictPublicBuckets": true
+        },
+        "VersioningConfiguration": {
+          "Status": "Enabled"
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W35",
+              "reason": "This S3 bucket is used as the access logging bucket for CloudFront Distribution"
+            }
+          ]
+        }
+      }
+    },
+    "testcloudfronts3CloudfrontLoggingBucketPolicyDF55851B": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "testcloudfronts3CloudfrontLoggingBucket985C0FE8"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "testcloudfronts3CloudfrontLoggingBucket985C0FE8",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::GetAtt": [
+                    "testcloudfronts3CloudfrontLoggingBucket985C0FE8",
+                    "Arn"
+                  ]
+                }
+              ],
+              "Sid": "HttpsOnly"
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      }
+    },
+    "testcloudfronts3CloudFrontDistributionOrigin1S3Origin4695F058": {
+      "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity",
+      "Properties": {
+        "CloudFrontOriginAccessIdentityConfig": {
+          "Comment": "Identity for customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1B44CC042"
+        }
+      }
+    },
+    "testcloudfronts3CloudFrontDistribution0565DEE8": {
+      "Type": "AWS::CloudFront::Distribution",
+      "Properties": {
+        "DistributionConfig": {
+          "DefaultCacheBehavior": {
+            "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
+            "FunctionAssociations": [
+              {
+                "EventType": "viewer-response",
+                "FunctionARN": {
+                  "Fn::GetAtt": [
+                    "testcloudfronts3SetHttpSecurityHeaders6C5A1E69",
+                    "FunctionARN"
+                  ]
+                }
+              }
+            ],
+            "TargetOriginId": "customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1B44CC042",
+            "ViewerProtocolPolicy": "redirect-to-https"
+          },
+          "DefaultRootObject": "index.html",
+          "Enabled": true,
+          "HttpVersion": "http2",
+          "IPV6Enabled": true,
+          "Logging": {
+            "Bucket": {
+              "Fn::GetAtt": [
+                "testcloudfronts3CloudfrontLoggingBucket985C0FE8",
+                "RegionalDomainName"
+              ]
+            }
+          },
+          "Origins": [
+            {
+              "DomainName": {
+                "Fn::GetAtt": [
+                  "testcloudfronts3S3BucketE0C5F76E",
+                  "RegionalDomainName"
+                ]
+              },
+              "Id": "customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1B44CC042",
+              "OriginPath": "/testPath",
+              "S3OriginConfig": {
+                "OriginAccessIdentity": {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "origin-access-identity/cloudfront/",
+                      {
+                        "Ref": "testcloudfronts3CloudFrontDistributionOrigin1S3Origin4695F058"
+                      }
+                    ]
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      },
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W70",
+              "reason": "Since the distribution uses the CloudFront domain name, CloudFront automatically sets the security policy to TLSv1 regardless of the value of MinimumProtocolVersion"
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Type": "AWS::SSM::Parameter::Value<String>",
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store."
+    }
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5"
+                  ],
+                  {
+                    "Ref": "BootstrapVersion"
+                  }
+                ]
+              }
+            ]
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+        }
+      ]
+    }
+  }
+}

package/test/integ.custom-originPath.js

@@ -0,0 +1,28 @@
+"use strict";
+/**
+ *  Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ *  with the License. A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+ *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+ *  and limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+// Imports
+const core_1 = require("@aws-cdk/core");
+const lib_1 = require("../lib");
+const core_2 = require("@aws-solutions-constructs/core");
+// Setup
+const app = new core_1.App();
+const stack = new core_1.Stack(app, core_2.generateIntegStackName(__filename));
+stack.templateOptions.description = 'Integration Test for originPath with aws-cloudfront-s3';
+new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
+    originPath: '/testPath'
+});
+// Synth
+app.synth();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuY3VzdG9tLW9yaWdpblBhdGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnRlZy5jdXN0b20tb3JpZ2luUGF0aC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7O0FBRUgsVUFBVTtBQUNWLHdDQUEyQztBQUMzQyxnQ0FBd0M7QUFDeEMseURBQXdFO0FBRXhFLFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLFVBQUcsRUFBRSxDQUFDO0FBQ3RCLE1BQU0sS0FBSyxHQUFHLElBQUksWUFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLEtBQUssQ0FBQyxlQUFlLENBQUMsV0FBVyxHQUFHLHdEQUF3RCxDQUFDO0FBRTdGLElBQUksb0JBQWMsQ0FBQyxLQUFLLEVBQUUsb0JBQW9CLEVBQUU7SUFDOUMsVUFBVSxFQUFFLFdBQVc7Q0FDeEIsQ0FBQyxDQUFDO0FBRUgsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIxIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjayB9IGZyb20gXCJAYXdzLWNkay9jb3JlXCI7XG5pbXBvcnQgeyBDbG91ZEZyb250VG9TMyB9IGZyb20gXCIuLi9saWJcIjtcbmltcG9ydCB7IGdlbmVyYXRlSW50ZWdTdGFja05hbWUgfSBmcm9tICdAYXdzLXNvbHV0aW9ucy1jb25zdHJ1Y3RzL2NvcmUnO1xuXG4vLyBTZXR1cFxuY29uc3QgYXBwID0gbmV3IEFwcCgpO1xuY29uc3Qgc3RhY2sgPSBuZXcgU3RhY2soYXBwLCBnZW5lcmF0ZUludGVnU3RhY2tOYW1lKF9fZmlsZW5hbWUpKTtcbnN0YWNrLnRlbXBsYXRlT3B0aW9ucy5kZXNjcmlwdGlvbiA9ICdJbnRlZ3JhdGlvbiBUZXN0IGZvciBvcmlnaW5QYXRoIHdpdGggYXdzLWNsb3VkZnJvbnQtczMnO1xuXG5uZXcgQ2xvdWRGcm9udFRvUzMoc3RhY2ssICd0ZXN0LWNsb3VkZnJvbnQtczMnLCB7XG4gIG9yaWdpblBhdGg6ICcvdGVzdFBhdGgnXG59KTtcblxuLy8gU3ludGhcbmFwcC5zeW50aCgpOyJdfQ==

package/test/integ.existing-bucket.js

@@ -26,7 +26,7 @@ const stack = new core_1.Stack(app, core_3.generateIntegStackName(__filename));
 let mybucket;
 mybucket = defaults.CreateScrapBucket(stack, { removalPolicy: core_1.RemovalPolicy.DESTROY });
 const _construct = new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
-    existingBucketInterface: mybucket,
+    existingBucketObj: mybucket,
 });
 // Add Cache Policy
 const myCachePolicy = new cloudfront.CachePolicy(stack, 'myCachePolicy', {
@@ -41,4 +41,4 @@ _construct.cloudFrontWebDistribution.addBehavior('/images/*.jpg', new origins.S3
 });
 // Synth
 app.synth();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuZXhpc3RpbmctYnVja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcuZXhpc3RpbmctYnVja2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1Ysd0NBQTBEO0FBRTFELDJEQUEyRDtBQUMzRCxnQ0FBd0M7QUFDeEMsMkRBQTJEO0FBQzNELHNEQUFzRDtBQUN0RCx3Q0FBeUM7QUFDekMseURBQXdFO0FBRXhFLFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLFVBQUcsRUFBRSxDQUFDO0FBQ3RCLE1BQU0sS0FBSyxHQUFHLElBQUksWUFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBRWpFLElBQUksUUFBbUIsQ0FBQztBQUN4QixRQUFRLEdBQUcsUUFBUSxDQUFDLGlCQUFpQixDQUFDLEtBQUssRUFBRSxFQUFFLGFBQWEsRUFBRSxvQkFBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7QUFFdkYsTUFBTSxVQUFVLEdBQUcsSUFBSSxvQkFBYyxDQUFDLEtBQUssRUFBRSxvQkFBb0IsRUFBRTtJQUNqRSx1QkFBdUIsRUFBRSxRQUFRO0NBQ2xDLENBQUMsQ0FBQztBQUVILG1CQUFtQjtBQUNuQixNQUFNLGFBQWEsR0FBRyxJQUFJLFVBQVUsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRTtJQUN2RSxlQUFlLEVBQUUsVUFBVTtJQUMzQixVQUFVLEVBQUUsZUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDL0IsTUFBTSxFQUFFLGVBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQzNCLE1BQU0sRUFBRSxlQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztDQUM1QixDQUFDLENBQUM7QUFFSCxlQUFlO0FBQ2YsVUFBVSxDQUFDLHlCQUF5QixDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFO0lBQ2hHLFdBQVcsRUFBRSxhQUFhO0NBQzNCLENBQUMsQ0FBQztBQUVILFFBQVE7QUFDUixHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMSBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCB7IEFwcCwgU3RhY2ssIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiQGF3cy1jZGsvY29yZVwiO1xuaW1wb3J0ICogYXMgczMgZnJvbSBcIkBhd3MtY2RrL2F3cy1zM1wiO1xuaW1wb3J0ICogYXMgZGVmYXVsdHMgZnJvbSBcIkBhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZVwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvUzMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgKiBhcyBvcmlnaW5zIGZyb20gJ0Bhd3MtY2RrL2F3cy1jbG91ZGZyb250LW9yaWdpbnMnO1xuaW1wb3J0ICogYXMgY2xvdWRmcm9udCBmcm9tICdAYXdzLWNkay9hd3MtY2xvdWRmcm9udCc7XG5pbXBvcnQgeyBEdXJhdGlvbiB9IGZyb20gXCJAYXdzLWNkay9jb3JlXCI7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5cbmxldCBteWJ1Y2tldDogczMuQnVja2V0O1xubXlidWNrZXQgPSBkZWZhdWx0cy5DcmVhdGVTY3JhcEJ1Y2tldChzdGFjaywgeyByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1kgfSk7XG5cbmNvbnN0IF9jb25zdHJ1Y3QgPSBuZXcgQ2xvdWRGcm9udFRvUzMoc3RhY2ssICd0ZXN0LWNsb3VkZnJvbnQtczMnLCB7XG4gIGV4aXN0aW5nQnVja2V0SW50ZXJmYWNlOiBteWJ1Y2tldCxcbn0pO1xuXG4vLyBBZGQgQ2FjaGUgUG9saWN5XG5jb25zdCBteUNhY2hlUG9saWN5ID0gbmV3IGNsb3VkZnJvbnQuQ2FjaGVQb2xpY3koc3RhY2ssICdteUNhY2hlUG9saWN5Jywge1xuICBjYWNoZVBvbGljeU5hbWU6ICdNeVBvbGljeScsXG4gIGRlZmF1bHRUdGw6IER1cmF0aW9uLm1pbnV0ZXMoMCksXG4gIG1pblR0bDogRHVyYXRpb24ubWludXRlcygwKSxcbiAgbWF4VHRsOiBEdXJhdGlvbi5taW51dGVzKDApLFxufSk7XG5cbi8vIEFkZCBiZWhhdmlvclxuX2NvbnN0cnVjdC5jbG91ZEZyb250V2ViRGlzdHJpYnV0aW9uLmFkZEJlaGF2aW9yKCcvaW1hZ2VzLyouanBnJywgbmV3IG9yaWdpbnMuUzNPcmlnaW4obXlidWNrZXQpLCB7XG4gIGNhY2hlUG9saWN5OiBteUNhY2hlUG9saWN5XG59KTtcblxuLy8gU3ludGhcbmFwcC5zeW50aCgpO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcuZXhpc3RpbmctYnVja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcuZXhpc3RpbmctYnVja2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1Ysd0NBQTBEO0FBRTFELDJEQUEyRDtBQUMzRCxnQ0FBd0M7QUFDeEMsMkRBQTJEO0FBQzNELHNEQUFzRDtBQUN0RCx3Q0FBeUM7QUFDekMseURBQXdFO0FBRXhFLFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLFVBQUcsRUFBRSxDQUFDO0FBQ3RCLE1BQU0sS0FBSyxHQUFHLElBQUksWUFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBRWpFLElBQUksUUFBbUIsQ0FBQztBQUN4QixRQUFRLEdBQUcsUUFBUSxDQUFDLGlCQUFpQixDQUFDLEtBQUssRUFBRSxFQUFFLGFBQWEsRUFBRSxvQkFBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7QUFFdkYsTUFBTSxVQUFVLEdBQUcsSUFBSSxvQkFBYyxDQUFDLEtBQUssRUFBRSxvQkFBb0IsRUFBRTtJQUNqRSxpQkFBaUIsRUFBRSxRQUFRO0NBQzVCLENBQUMsQ0FBQztBQUVILG1CQUFtQjtBQUNuQixNQUFNLGFBQWEsR0FBRyxJQUFJLFVBQVUsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRTtJQUN2RSxlQUFlLEVBQUUsVUFBVTtJQUMzQixVQUFVLEVBQUUsZUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDL0IsTUFBTSxFQUFFLGVBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQzNCLE1BQU0sRUFBRSxlQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztDQUM1QixDQUFDLENBQUM7QUFFSCxlQUFlO0FBQ2YsVUFBVSxDQUFDLHlCQUF5QixDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFO0lBQ2hHLFdBQVcsRUFBRSxhQUFhO0NBQzNCLENBQUMsQ0FBQztBQUVILFFBQVE7QUFDUixHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMSBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCB7IEFwcCwgU3RhY2ssIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiQGF3cy1jZGsvY29yZVwiO1xuaW1wb3J0ICogYXMgczMgZnJvbSBcIkBhd3MtY2RrL2F3cy1zM1wiO1xuaW1wb3J0ICogYXMgZGVmYXVsdHMgZnJvbSBcIkBhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZVwiO1xuaW1wb3J0IHsgQ2xvdWRGcm9udFRvUzMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgKiBhcyBvcmlnaW5zIGZyb20gJ0Bhd3MtY2RrL2F3cy1jbG91ZGZyb250LW9yaWdpbnMnO1xuaW1wb3J0ICogYXMgY2xvdWRmcm9udCBmcm9tICdAYXdzLWNkay9hd3MtY2xvdWRmcm9udCc7XG5pbXBvcnQgeyBEdXJhdGlvbiB9IGZyb20gXCJAYXdzLWNkay9jb3JlXCI7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5cbmxldCBteWJ1Y2tldDogczMuQnVja2V0O1xubXlidWNrZXQgPSBkZWZhdWx0cy5DcmVhdGVTY3JhcEJ1Y2tldChzdGFjaywgeyByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1kgfSk7XG5cbmNvbnN0IF9jb25zdHJ1Y3QgPSBuZXcgQ2xvdWRGcm9udFRvUzMoc3RhY2ssICd0ZXN0LWNsb3VkZnJvbnQtczMnLCB7XG4gIGV4aXN0aW5nQnVja2V0T2JqOiBteWJ1Y2tldCxcbn0pO1xuXG4vLyBBZGQgQ2FjaGUgUG9saWN5XG5jb25zdCBteUNhY2hlUG9saWN5ID0gbmV3IGNsb3VkZnJvbnQuQ2FjaGVQb2xpY3koc3RhY2ssICdteUNhY2hlUG9saWN5Jywge1xuICBjYWNoZVBvbGljeU5hbWU6ICdNeVBvbGljeScsXG4gIGRlZmF1bHRUdGw6IER1cmF0aW9uLm1pbnV0ZXMoMCksXG4gIG1pblR0bDogRHVyYXRpb24ubWludXRlcygwKSxcbiAgbWF4VHRsOiBEdXJhdGlvbi5taW51dGVzKDApLFxufSk7XG5cbi8vIEFkZCBiZWhhdmlvclxuX2NvbnN0cnVjdC5jbG91ZEZyb250V2ViRGlzdHJpYnV0aW9uLmFkZEJlaGF2aW9yKCcvaW1hZ2VzLyouanBnJywgbmV3IG9yaWdpbnMuUzNPcmlnaW4obXlidWNrZXQpLCB7XG4gIGNhY2hlUG9saWN5OiBteUNhY2hlUG9saWN5XG59KTtcblxuLy8gU3ludGhcbmFwcC5zeW50aCgpO1xuIl19

package/test/integ.no-arguments.expected.json

@@ -1,90 +1,6 @@
 {
   "Description": "Integration Test for aws-cloudfront-s3",
   "Resources": {
-    "testcloudfronts3S3LoggingBucket90D239DD": {
-      "Type": "AWS::S3::Bucket",
-      "Properties": {
-        "AccessControl": "LogDeliveryWrite",
-        "BucketEncryption": {
-          "ServerSideEncryptionConfiguration": [
-            {
-              "ServerSideEncryptionByDefault": {
-                "SSEAlgorithm": "AES256"
-              }
-            }
-          ]
-        },
-        "PublicAccessBlockConfiguration": {
-          "BlockPublicAcls": true,
-          "BlockPublicPolicy": true,
-          "IgnorePublicAcls": true,
-          "RestrictPublicBuckets": true
-        },
-        "VersioningConfiguration": {
-          "Status": "Enabled"
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "cfn_nag": {
-          "rules_to_suppress": [
-            {
-              "id": "W35",
-              "reason": "This S3 bucket is used as the access logging bucket for another bucket"
-            }
-          ]
-        }
-      }
-    },
-    "testcloudfronts3S3LoggingBucketPolicy529D4CFF": {
-      "Type": "AWS::S3::BucketPolicy",
-      "Properties": {
-        "Bucket": {
-          "Ref": "testcloudfronts3S3LoggingBucket90D239DD"
-        },
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "*",
-              "Condition": {
-                "Bool": {
-                  "aws:SecureTransport": "false"
-                }
-              },
-              "Effect": "Deny",
-              "Principal": {
-                "AWS": "*"
-              },
-              "Resource": [
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "testcloudfronts3S3LoggingBucket90D239DD",
-                          "Arn"
-                        ]
-                      },
-                      "/*"
-                    ]
-                  ]
-                },
-                {
-                  "Fn::GetAtt": [
-                    "testcloudfronts3S3LoggingBucket90D239DD",
-                    "Arn"
-                  ]
-                }
-              ],
-              "Sid": "HttpsOnly"
-            }
-          ],
-          "Version": "2012-10-17"
-        }
-      }
-    },
     "testcloudfronts3S3BucketE0C5F76E": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
@@ -110,11 +26,6 @@
             }
           ]
         },
-        "LoggingConfiguration": {
-          "DestinationBucketName": {
-            "Ref": "testcloudfronts3S3LoggingBucket90D239DD"
-          }
-        },
         "PublicAccessBlockConfiguration": {
           "BlockPublicAcls": true,
           "BlockPublicPolicy": true,
@@ -126,7 +37,17 @@
         }
       },
       "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete"
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W35",
+              "reason": "This S3 bucket is created for unit/ integration testing purposes only."
+            }
+          ]
+        }
+      }
     },
     "testcloudfronts3S3BucketPolicy250F1F61": {
       "Type": "AWS::S3::BucketPolicy",

package/test/integ.no-arguments.js

@@ -16,15 +16,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@aws-cdk/core");
 const lib_1 = require("../lib");
 const core_2 = require("@aws-solutions-constructs/core");
+const defaults = require("@aws-solutions-constructs/core");
 // Setup
 const app = new core_1.App();
 const stack = new core_1.Stack(app, core_2.generateIntegStackName(__filename));
 stack.templateOptions.description = 'Integration Test for aws-cloudfront-s3';
-new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
+const construct = new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', {
     bucketProps: {
         removalPolicy: core_1.RemovalPolicy.DESTROY,
-    }
+    },
+    logS3AccessLogs: false
 });
+const s3Bucket = construct.s3Bucket;
+defaults.addCfnSuppressRules(s3Bucket, [
+    { id: 'W35',
+        reason: 'This S3 bucket is created for unit/ integration testing purposes only.' },
+]);
 // Synth
 app.synth();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubm8tYXJndW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcubm8tYXJndW1lbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1Ysd0NBQTBEO0FBQzFELGdDQUF3QztBQUN4Qyx5REFBd0U7QUFFeEUsUUFBUTtBQUNSLE1BQU0sR0FBRyxHQUFHLElBQUksVUFBRyxFQUFFLENBQUM7QUFDdEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxZQUFLLENBQUMsR0FBRyxFQUFFLDZCQUFzQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFDakUsS0FBSyxDQUFDLGVBQWUsQ0FBQyxXQUFXLEdBQUcsd0NBQXdDLENBQUM7QUFFN0UsSUFBSSxvQkFBYyxDQUFDLEtBQUssRUFBRSxvQkFBb0IsRUFBRTtJQUM5QyxXQUFXLEVBQUU7UUFDWCxhQUFhLEVBQUUsb0JBQWEsQ0FBQyxPQUFPO0tBQ3JDO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsUUFBUTtBQUNSLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIxIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0IHsgQXBwLCBTdGFjaywgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJAYXdzLWNkay9jb3JlXCI7XG5pbXBvcnQgeyBDbG91ZEZyb250VG9TMyB9IGZyb20gXCIuLi9saWJcIjtcbmltcG9ydCB7IGdlbmVyYXRlSW50ZWdTdGFja05hbWUgfSBmcm9tICdAYXdzLXNvbHV0aW9ucy1jb25zdHJ1Y3RzL2NvcmUnO1xuXG4vLyBTZXR1cFxuY29uc3QgYXBwID0gbmV3IEFwcCgpO1xuY29uc3Qgc3RhY2sgPSBuZXcgU3RhY2soYXBwLCBnZW5lcmF0ZUludGVnU3RhY2tOYW1lKF9fZmlsZW5hbWUpKTtcbnN0YWNrLnRlbXBsYXRlT3B0aW9ucy5kZXNjcmlwdGlvbiA9ICdJbnRlZ3JhdGlvbiBUZXN0IGZvciBhd3MtY2xvdWRmcm9udC1zMyc7XG5cbm5ldyBDbG91ZEZyb250VG9TMyhzdGFjaywgJ3Rlc3QtY2xvdWRmcm9udC1zMycsIHtcbiAgYnVja2V0UHJvcHM6IHtcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gIH1cbn0pO1xuXG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubm8tYXJndW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcubm8tYXJndW1lbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1Ysd0NBQTBEO0FBQzFELGdDQUF3QztBQUN4Qyx5REFBd0U7QUFFeEUsMkRBQTJEO0FBRTNELFFBQVE7QUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLFVBQUcsRUFBRSxDQUFDO0FBQ3RCLE1BQU0sS0FBSyxHQUFHLElBQUksWUFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLEtBQUssQ0FBQyxlQUFlLENBQUMsV0FBVyxHQUFHLHdDQUF3QyxDQUFDO0FBRTdFLE1BQU0sU0FBUyxHQUFHLElBQUksb0JBQWMsQ0FBQyxLQUFLLEVBQUUsb0JBQW9CLEVBQUU7SUFDaEUsV0FBVyxFQUFFO1FBQ1gsYUFBYSxFQUFFLG9CQUFhLENBQUMsT0FBTztLQUNyQztJQUNELGVBQWUsRUFBRSxLQUFLO0NBQ3ZCLENBQUMsQ0FBQztBQUVILE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxRQUFxQixDQUFDO0FBRWpELFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUU7SUFDckMsRUFBRSxFQUFFLEVBQUUsS0FBSztRQUNULE1BQU0sRUFBRSx3RUFBd0UsRUFBRTtDQUNyRixDQUFDLENBQUM7QUFFSCxRQUFRO0FBQ1IsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IDIwMjEgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG4vLyBJbXBvcnRzXG5pbXBvcnQgeyBBcHAsIFN0YWNrLCBSZW1vdmFsUG9saWN5IH0gZnJvbSBcIkBhd3MtY2RrL2NvcmVcIjtcbmltcG9ydCB7IENsb3VkRnJvbnRUb1MzIH0gZnJvbSBcIi4uL2xpYlwiO1xuaW1wb3J0IHsgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZSB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5pbXBvcnQgKiBhcyBzMyBmcm9tIFwiQGF3cy1jZGsvYXdzLXMzXCI7XG5pbXBvcnQgKiBhcyBkZWZhdWx0cyBmcm9tICdAYXdzLXNvbHV0aW9ucy1jb25zdHJ1Y3RzL2NvcmUnO1xuXG4vLyBTZXR1cFxuY29uc3QgYXBwID0gbmV3IEFwcCgpO1xuY29uc3Qgc3RhY2sgPSBuZXcgU3RhY2soYXBwLCBnZW5lcmF0ZUludGVnU3RhY2tOYW1lKF9fZmlsZW5hbWUpKTtcbnN0YWNrLnRlbXBsYXRlT3B0aW9ucy5kZXNjcmlwdGlvbiA9ICdJbnRlZ3JhdGlvbiBUZXN0IGZvciBhd3MtY2xvdWRmcm9udC1zMyc7XG5cbmNvbnN0IGNvbnN0cnVjdCA9IG5ldyBDbG91ZEZyb250VG9TMyhzdGFjaywgJ3Rlc3QtY2xvdWRmcm9udC1zMycsIHtcbiAgYnVja2V0UHJvcHM6IHtcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gIH0sXG4gIGxvZ1MzQWNjZXNzTG9nczogZmFsc2Vcbn0pO1xuXG5jb25zdCBzM0J1Y2tldCA9IGNvbnN0cnVjdC5zM0J1Y2tldCBhcyBzMy5CdWNrZXQ7XG5cbmRlZmF1bHRzLmFkZENmblN1cHByZXNzUnVsZXMoczNCdWNrZXQsIFtcbiAgeyBpZDogJ1czNScsXG4gICAgcmVhc29uOiAnVGhpcyBTMyBidWNrZXQgaXMgY3JlYXRlZCBmb3IgdW5pdC8gaW50ZWdyYXRpb24gdGVzdGluZyBwdXJwb3NlcyBvbmx5LicgfSxcbl0pO1xuXG4vLyBTeW50aFxuYXBwLnN5bnRoKCk7XG4iXX0=

package/test/test.cloudfront-s3.test.js

@@ -80,7 +80,7 @@ test('check existing bucket', () => {
         bucketName: 'my-bucket'
     });
     const props = {
-        existingBucketInterface: existingBucket
+        existingBucketObj: existingBucket
     };
     new lib_1.CloudFrontToS3(stack, 'test-cloudfront-s3', props);
     expect(stack).toHaveResource("AWS::S3::Bucket", {
@@ -124,7 +124,7 @@ test("Test bad call with existingBucket and bucketProps", () => {
     const app = () => {
         // Helper declaration
         new lib_1.CloudFrontToS3(stack, "bad-s3-args", {
-            existingBucketInterface: testBucket,
+            existingBucketObj: testBucket,
             bucketProps: {
                 removalPolicy: core_1.RemovalPolicy.DESTROY
             },
@@ -133,11 +133,11 @@ test("Test bad call with existingBucket and bucketProps", () => {
     // Assertion
     expect(app).toThrowError();
 });
-test("Test existingBucketInterface", () => {
+test("Test existingBucketObj", () => {
     // Stack
     const stack = new cdk.Stack();
     const construct = new lib_1.CloudFrontToS3(stack, "existingIBucket", {
-        existingBucketInterface: s3.Bucket.fromBucketName(stack, 'mybucket', 'mybucket')
+        existingBucketObj: s3.Bucket.fromBucketName(stack, 'mybucket', 'mybucket')
     });
     // Assertion
     expect(construct.cloudFrontWebDistribution !== null);
@@ -276,4 +276,49 @@ test('Cloudfront logging bucket error when providing existing log bucket and log
     };
     expect(app).toThrowError();
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.cloudfront-s3.test.js","sourceRoot":"","sources":["test.cloudfront-s3.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2021 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 { ResourcePart } from '@aws-cdk/assert';\nimport '@aws-cdk/assert/jest';\nimport * as s3 from '@aws-cdk/aws-s3';\nimport * as cdk from \"@aws-cdk/core\";\nimport { RemovalPolicy } from '@aws-cdk/core';\nimport { CloudFrontToS3, CloudFrontToS3Props } from \"../lib\";\nimport * as acm from '@aws-cdk/aws-certificatemanager';\n\nfunction deploy(stack: cdk.Stack, props?: CloudFrontToS3Props) {\n  return new CloudFrontToS3(stack, 'test-cloudfront-s3', {\n    bucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n    },\n    ...props\n  });\n}\n\ntest('check s3Bucket default encryption', () => {\n  const stack = new cdk.Stack();\n  deploy(stack);\n  expect(stack).toHaveResource('AWS::S3::Bucket', {\n    BucketEncryption: {\n      ServerSideEncryptionConfiguration: [{\n        ServerSideEncryptionByDefault : {\n          SSEAlgorithm: \"AES256\"\n        }\n      }]\n    }\n  });\n});\n\ntest('check s3Bucket public access block configuration', () => {\n  const stack = new cdk.Stack();\n  deploy(stack);\n  expect(stack).toHaveResource('AWS::S3::Bucket', {\n    PublicAccessBlockConfiguration: {\n      BlockPublicAcls: true,\n      BlockPublicPolicy: true,\n      IgnorePublicAcls: true,\n      RestrictPublicBuckets: true\n    }\n  });\n});\n\ntest('test s3Bucket override publicAccessBlockConfiguration', () => {\n  const stack = new cdk.Stack();\n\n  const props: CloudFrontToS3Props = {\n    bucketProps: {\n      blockPublicAccess: {\n        blockPublicAcls: false,\n        blockPublicPolicy: true,\n        ignorePublicAcls: false,\n        restrictPublicBuckets: true\n      }\n    }\n  };\n\n  new CloudFrontToS3(stack, 'test-cloudfront-s3', props);\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    PublicAccessBlockConfiguration: {\n      BlockPublicAcls: false,\n      BlockPublicPolicy: true,\n      IgnorePublicAcls: false,\n      RestrictPublicBuckets: true\n    },\n  });\n});\n\ntest('check existing bucket', () => {\n  const stack = new cdk.Stack();\n\n  const existingBucket = new s3.Bucket(stack, 'my-bucket', {\n    bucketName: 'my-bucket'\n  });\n\n  const props: CloudFrontToS3Props = {\n    existingBucketInterface: existingBucket\n  };\n\n  new CloudFrontToS3(stack, 'test-cloudfront-s3', props);\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    BucketName: \"my-bucket\"\n  });\n\n  expect(stack).toHaveResource(\"AWS::S3::BucketPolicy\", {\n    Metadata: {\n      cfn_nag: {\n        rules_to_suppress: [\n          {\n            id: \"F16\",\n            reason: \"Public website bucket policy requires a wildcard principal\"\n          }\n        ]\n      }\n    }\n  }, ResourcePart.CompleteDefinition);\n});\n\ntest('check exception for Missing existingObj from props for deploy = false', () => {\n  const stack = new cdk.Stack();\n\n  try {\n    new CloudFrontToS3(stack, 'test-cloudfront-s3', {});\n  } catch (e) {\n    expect(e).toBeInstanceOf(Error);\n  }\n});\n\ntest('check properties', () => {\n  const stack = new cdk.Stack();\n\n  const construct: CloudFrontToS3 = deploy(stack);\n\n  expect(construct.cloudFrontWebDistribution !== null);\n  expect(construct.s3Bucket  !== null);\n});\n\n// --------------------------------------------------------------\n// Test bad call with existingBucket and bucketProps\n// --------------------------------------------------------------\ntest(\"Test bad call with existingBucket and bucketProps\", () => {\n  // Stack\n  const stack = new cdk.Stack();\n\n  const testBucket = new s3.Bucket(stack, 'test-bucket', {});\n\n  const app = () => {\n    // Helper declaration\n    new CloudFrontToS3(stack, \"bad-s3-args\", {\n      existingBucketInterface: testBucket,\n      bucketProps: {\n        removalPolicy: RemovalPolicy.DESTROY\n      },\n    });\n  };\n  // Assertion\n  expect(app).toThrowError();\n});\n\ntest(\"Test existingBucketInterface\", () => {\n  // Stack\n  const stack = new cdk.Stack();\n  const construct: CloudFrontToS3 = new CloudFrontToS3(stack, \"existingIBucket\", {\n    existingBucketInterface: s3.Bucket.fromBucketName(stack, 'mybucket', 'mybucket')\n  });\n  // Assertion\n  expect(construct.cloudFrontWebDistribution !== null);\n  expect(stack).toHaveResourceLike(\"AWS::CloudFront::Distribution\", {\n    DistributionConfig: {\n      Origins: [\n        {\n          DomainName: {\n            \"Fn::Join\": [\n              \"\",\n              [\n                \"mybucket.s3.\",\n                {\n                  Ref: \"AWS::Region\"\n                },\n                \".\",\n                {\n                  Ref: \"AWS::URLSuffix\"\n                }\n              ]\n            ]\n          },\n          Id: \"existingIBucketCloudFrontDistributionOrigin1D5849125\",\n          S3OriginConfig: {\n            OriginAccessIdentity: {\n              \"Fn::Join\": [\n                \"\",\n                [\n                  \"origin-access-identity/cloudfront/\",\n                  {\n                    Ref: \"existingIBucketCloudFrontDistributionOrigin1S3OriginDDDB1606\"\n                  }\n                ]\n              ]\n            }\n          }\n        }\n      ]\n    }\n  });\n});\n\ntest('test cloudfront disable cloudfront logging', () => {\n  const stack = new cdk.Stack();\n\n  const construct = deploy(stack, {cloudFrontDistributionProps: {enableLogging: false}} );\n\n  expect(construct.cloudFrontLoggingBucket === undefined);\n});\n\ntest('test cloudfront with custom domain names', () => {\n  const stack = new cdk.Stack();\n\n  const certificate = acm.Certificate.fromCertificateArn(stack, 'Cert', 'arn:aws:acm:us-east-1:123456789012:certificate/11112222-3333-1234-1234-123456789012');\n\n  const props: CloudFrontToS3Props = {\n    cloudFrontDistributionProps: {\n      domainNames: ['mydomains'],\n      certificate\n    }\n  };\n\n  new CloudFrontToS3(stack, 'test-cloudfront-s3', props);\n\n  expect(stack).toHaveResourceLike(\"AWS::CloudFront::Distribution\", {\n    DistributionConfig: {\n      Aliases: [\n        \"mydomains\"\n      ]\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// s3 bucket with bucket, loggingBucket, and auto delete objects\n// --------------------------------------------------------------\ntest('s3 bucket with bucket, loggingBucket, and auto delete objects', () => {\n  const stack = new cdk.Stack();\n\n  new CloudFrontToS3(stack, 'cloudfront-s3', {\n    bucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n    },\n    loggingBucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      autoDeleteObjects: true\n    }\n  });\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    AccessControl: \"LogDeliveryWrite\"\n  });\n\n  expect(stack).toHaveResource(\"Custom::S3AutoDeleteObjects\", {\n    ServiceToken: {\n      \"Fn::GetAtt\": [\n        \"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F\",\n        \"Arn\"\n      ]\n    },\n    BucketName: {\n      Ref: \"cloudfronts3S3LoggingBucket52EEB708\"\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// Cloudfront logging bucket with destroy removal policy and auto delete objects\n// --------------------------------------------------------------\ntest('Cloudfront logging bucket with destroy removal policy and auto delete objects', () => {\n  const stack = new cdk.Stack();\n\n  new CloudFrontToS3(stack, 'cloudfront-s3', {\n    cloudFrontLoggingBucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      autoDeleteObjects: true\n    }\n  });\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    AccessControl: \"LogDeliveryWrite\"\n  });\n\n  expect(stack).toHaveResource(\"Custom::S3AutoDeleteObjects\", {\n    ServiceToken: {\n      \"Fn::GetAtt\": [\n        \"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F\",\n        \"Arn\"\n      ]\n    },\n    BucketName: {\n      Ref: \"cloudfronts3CloudfrontLoggingBucket5B845143\"\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// Cloudfront logging bucket error providing existing log bucket and logBucketProps\n// --------------------------------------------------------------\ntest('Cloudfront logging bucket error when providing existing log bucket and logBucketProps', () => {\n  const stack = new cdk.Stack();\n  const logBucket = new s3.Bucket(stack, 'cloudfront-log-bucket', {});\n\n  const app = () => { new CloudFrontToS3(stack, 'cloudfront-s3', {\n    cloudFrontDistributionProps: {\n      logBucket\n    },\n    cloudFrontLoggingBucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      autoDeleteObjects: true\n    }\n  });\n  };\n\n  expect(app).toThrowError();\n});"]}
+// --------------------------------------------------------------
+// s3 bucket with one content bucket and no logging bucket
+// --------------------------------------------------------------
+test('s3 bucket with one content bucket and no logging bucket', () => {
+    const stack = new cdk.Stack();
+    const construct = new lib_1.CloudFrontToS3(stack, 'cloudfront-s3', {
+        bucketProps: {
+            removalPolicy: cdk.RemovalPolicy.DESTROY,
+        },
+        logS3AccessLogs: false
+    });
+    expect(stack).toCountResources("AWS::S3::Bucket", 2);
+    expect(construct.s3LoggingBucket).toEqual(undefined);
+});
+// --------------------------------------------------
+// CloudFront origin path
+// --------------------------------------------------
+test('CloudFront origin path present when provided', () => {
+    const stack = new cdk.Stack();
+    new lib_1.CloudFrontToS3(stack, 'cloudfront-s3', {
+        originPath: '/testPath'
+    });
+    expect(stack).toHaveResourceLike("AWS::CloudFront::Distribution", {
+        DistributionConfig: {
+            Origins: [
+                {
+                    OriginPath: "/testPath",
+                }
+            ]
+        }
+    });
+});
+test('CloudFront origin path should not be present if not provided', () => {
+    const stack = new cdk.Stack();
+    new lib_1.CloudFrontToS3(stack, 'cloudfront-s3', {});
+    expect(stack).not.toHaveResourceLike("AWS::CloudFront::Distribution", {
+        DistributionConfig: {
+            Origins: [
+                {
+                    OriginPath: "/testPath",
+                }
+            ]
+        }
+    });
+});
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.cloudfront-s3.test.js","sourceRoot":"","sources":["test.cloudfront-s3.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2021 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 { ResourcePart } from '@aws-cdk/assert';\nimport '@aws-cdk/assert/jest';\nimport * as s3 from '@aws-cdk/aws-s3';\nimport * as cdk from \"@aws-cdk/core\";\nimport { RemovalPolicy } from '@aws-cdk/core';\nimport { CloudFrontToS3, CloudFrontToS3Props } from \"../lib\";\nimport * as acm from '@aws-cdk/aws-certificatemanager';\n\nfunction deploy(stack: cdk.Stack, props?: CloudFrontToS3Props) {\n  return new CloudFrontToS3(stack, 'test-cloudfront-s3', {\n    bucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n    },\n    ...props\n  });\n}\n\ntest('check s3Bucket default encryption', () => {\n  const stack = new cdk.Stack();\n  deploy(stack);\n  expect(stack).toHaveResource('AWS::S3::Bucket', {\n    BucketEncryption: {\n      ServerSideEncryptionConfiguration: [{\n        ServerSideEncryptionByDefault: {\n          SSEAlgorithm: \"AES256\"\n        }\n      }]\n    }\n  });\n});\n\ntest('check s3Bucket public access block configuration', () => {\n  const stack = new cdk.Stack();\n  deploy(stack);\n  expect(stack).toHaveResource('AWS::S3::Bucket', {\n    PublicAccessBlockConfiguration: {\n      BlockPublicAcls: true,\n      BlockPublicPolicy: true,\n      IgnorePublicAcls: true,\n      RestrictPublicBuckets: true\n    }\n  });\n});\n\ntest('test s3Bucket override publicAccessBlockConfiguration', () => {\n  const stack = new cdk.Stack();\n\n  const props: CloudFrontToS3Props = {\n    bucketProps: {\n      blockPublicAccess: {\n        blockPublicAcls: false,\n        blockPublicPolicy: true,\n        ignorePublicAcls: false,\n        restrictPublicBuckets: true\n      }\n    }\n  };\n\n  new CloudFrontToS3(stack, 'test-cloudfront-s3', props);\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    PublicAccessBlockConfiguration: {\n      BlockPublicAcls: false,\n      BlockPublicPolicy: true,\n      IgnorePublicAcls: false,\n      RestrictPublicBuckets: true\n    },\n  });\n});\n\ntest('check existing bucket', () => {\n  const stack = new cdk.Stack();\n\n  const existingBucket = new s3.Bucket(stack, 'my-bucket', {\n    bucketName: 'my-bucket'\n  });\n\n  const props: CloudFrontToS3Props = {\n    existingBucketObj: existingBucket\n  };\n\n  new CloudFrontToS3(stack, 'test-cloudfront-s3', props);\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    BucketName: \"my-bucket\"\n  });\n\n  expect(stack).toHaveResource(\"AWS::S3::BucketPolicy\", {\n    Metadata: {\n      cfn_nag: {\n        rules_to_suppress: [\n          {\n            id: \"F16\",\n            reason: \"Public website bucket policy requires a wildcard principal\"\n          }\n        ]\n      }\n    }\n  }, ResourcePart.CompleteDefinition);\n});\n\ntest('check exception for Missing existingObj from props for deploy = false', () => {\n  const stack = new cdk.Stack();\n\n  try {\n    new CloudFrontToS3(stack, 'test-cloudfront-s3', {});\n  } catch (e) {\n    expect(e).toBeInstanceOf(Error);\n  }\n});\n\ntest('check properties', () => {\n  const stack = new cdk.Stack();\n\n  const construct: CloudFrontToS3 = deploy(stack);\n\n  expect(construct.cloudFrontWebDistribution !== null);\n  expect(construct.s3Bucket !== null);\n});\n\n// --------------------------------------------------------------\n// Test bad call with existingBucket and bucketProps\n// --------------------------------------------------------------\ntest(\"Test bad call with existingBucket and bucketProps\", () => {\n  // Stack\n  const stack = new cdk.Stack();\n\n  const testBucket = new s3.Bucket(stack, 'test-bucket', {});\n\n  const app = () => {\n    // Helper declaration\n    new CloudFrontToS3(stack, \"bad-s3-args\", {\n      existingBucketObj: testBucket,\n      bucketProps: {\n        removalPolicy: RemovalPolicy.DESTROY\n      },\n    });\n  };\n  // Assertion\n  expect(app).toThrowError();\n});\n\ntest(\"Test existingBucketObj\", () => {\n  // Stack\n  const stack = new cdk.Stack();\n  const construct: CloudFrontToS3 = new CloudFrontToS3(stack, \"existingIBucket\", {\n    existingBucketObj: s3.Bucket.fromBucketName(stack, 'mybucket', 'mybucket')\n  });\n  // Assertion\n  expect(construct.cloudFrontWebDistribution !== null);\n  expect(stack).toHaveResourceLike(\"AWS::CloudFront::Distribution\", {\n    DistributionConfig: {\n      Origins: [\n        {\n          DomainName: {\n            \"Fn::Join\": [\n              \"\",\n              [\n                \"mybucket.s3.\",\n                {\n                  Ref: \"AWS::Region\"\n                },\n                \".\",\n                {\n                  Ref: \"AWS::URLSuffix\"\n                }\n              ]\n            ]\n          },\n          Id: \"existingIBucketCloudFrontDistributionOrigin1D5849125\",\n          S3OriginConfig: {\n            OriginAccessIdentity: {\n              \"Fn::Join\": [\n                \"\",\n                [\n                  \"origin-access-identity/cloudfront/\",\n                  {\n                    Ref: \"existingIBucketCloudFrontDistributionOrigin1S3OriginDDDB1606\"\n                  }\n                ]\n              ]\n            }\n          }\n        }\n      ]\n    }\n  });\n});\n\ntest('test cloudfront disable cloudfront logging', () => {\n  const stack = new cdk.Stack();\n\n  const construct = deploy(stack, { cloudFrontDistributionProps: { enableLogging: false } });\n\n  expect(construct.cloudFrontLoggingBucket === undefined);\n});\n\ntest('test cloudfront with custom domain names', () => {\n  const stack = new cdk.Stack();\n\n  const certificate = acm.Certificate.fromCertificateArn(stack, 'Cert', 'arn:aws:acm:us-east-1:123456789012:certificate/11112222-3333-1234-1234-123456789012');\n\n  const props: CloudFrontToS3Props = {\n    cloudFrontDistributionProps: {\n      domainNames: ['mydomains'],\n      certificate\n    }\n  };\n\n  new CloudFrontToS3(stack, 'test-cloudfront-s3', props);\n\n  expect(stack).toHaveResourceLike(\"AWS::CloudFront::Distribution\", {\n    DistributionConfig: {\n      Aliases: [\n        \"mydomains\"\n      ]\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// s3 bucket with bucket, loggingBucket, and auto delete objects\n// --------------------------------------------------------------\ntest('s3 bucket with bucket, loggingBucket, and auto delete objects', () => {\n  const stack = new cdk.Stack();\n\n  new CloudFrontToS3(stack, 'cloudfront-s3', {\n    bucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n    },\n    loggingBucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      autoDeleteObjects: true\n    }\n  });\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    AccessControl: \"LogDeliveryWrite\"\n  });\n\n  expect(stack).toHaveResource(\"Custom::S3AutoDeleteObjects\", {\n    ServiceToken: {\n      \"Fn::GetAtt\": [\n        \"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F\",\n        \"Arn\"\n      ]\n    },\n    BucketName: {\n      Ref: \"cloudfronts3S3LoggingBucket52EEB708\"\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// Cloudfront logging bucket with destroy removal policy and auto delete objects\n// --------------------------------------------------------------\ntest('Cloudfront logging bucket with destroy removal policy and auto delete objects', () => {\n  const stack = new cdk.Stack();\n\n  new CloudFrontToS3(stack, 'cloudfront-s3', {\n    cloudFrontLoggingBucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      autoDeleteObjects: true\n    }\n  });\n\n  expect(stack).toHaveResource(\"AWS::S3::Bucket\", {\n    AccessControl: \"LogDeliveryWrite\"\n  });\n\n  expect(stack).toHaveResource(\"Custom::S3AutoDeleteObjects\", {\n    ServiceToken: {\n      \"Fn::GetAtt\": [\n        \"CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F\",\n        \"Arn\"\n      ]\n    },\n    BucketName: {\n      Ref: \"cloudfronts3CloudfrontLoggingBucket5B845143\"\n    }\n  });\n});\n\n// --------------------------------------------------------------\n// Cloudfront logging bucket error providing existing log bucket and logBucketProps\n// --------------------------------------------------------------\ntest('Cloudfront logging bucket error when providing existing log bucket and logBucketProps', () => {\n  const stack = new cdk.Stack();\n  const logBucket = new s3.Bucket(stack, 'cloudfront-log-bucket', {});\n\n  const app = () => {\n    new CloudFrontToS3(stack, 'cloudfront-s3', {\n      cloudFrontDistributionProps: {\n        logBucket\n      },\n      cloudFrontLoggingBucketProps: {\n        removalPolicy: cdk.RemovalPolicy.DESTROY,\n        autoDeleteObjects: true\n      }\n    });\n  };\n\n  expect(app).toThrowError();\n});\n\n// --------------------------------------------------------------\n// s3 bucket with one content bucket and no logging bucket\n// --------------------------------------------------------------\ntest('s3 bucket with one content bucket and no logging bucket', () => {\n  const stack = new cdk.Stack();\n\n  const construct = new CloudFrontToS3(stack, 'cloudfront-s3', {\n    bucketProps: {\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n    },\n    logS3AccessLogs: false\n  });\n\n  expect(stack).toCountResources(\"AWS::S3::Bucket\", 2);\n  expect(construct.s3LoggingBucket).toEqual(undefined);\n});\n\n// --------------------------------------------------\n// CloudFront origin path\n// --------------------------------------------------\ntest('CloudFront origin path present when provided', () => {\n  const stack = new cdk.Stack();\n\n  new CloudFrontToS3(stack, 'cloudfront-s3', {\n    originPath: '/testPath'\n  });\n\n  expect(stack).toHaveResourceLike(\"AWS::CloudFront::Distribution\", {\n    DistributionConfig:\n    {\n      Origins: [\n        {\n          OriginPath: \"/testPath\",\n        }\n      ]\n    }\n  });\n});\n\ntest('CloudFront origin path should not be present if not provided', () => {\n  const stack = new cdk.Stack();\n\n  new CloudFrontToS3(stack, 'cloudfront-s3', {});\n\n  expect(stack).not.toHaveResourceLike(\"AWS::CloudFront::Distribution\", {\n    DistributionConfig:\n    {\n      Origins: [\n        {\n          OriginPath: \"/testPath\",\n        }\n      ]\n    }\n  });\n});"]}