@aws-solutions-constructs/aws-cloudfront-oai-s3 2.79.0 → 2.80.0

package/.jsii

@@ -8,9 +8,9 @@
     "url": "https://aws.amazon.com"
   },
   "dependencies": {
-    "@aws-solutions-constructs/core": "2.79.0",
-    "@aws-solutions-constructs/resources": "2.79.0",
-    "aws-cdk-lib": "^2.177.0",
+    "@aws-solutions-constructs/core": "2.80.0",
+    "@aws-solutions-constructs/resources": "2.80.0",
+    "aws-cdk-lib": "^2.179.0",
     "constructs": "^10.0.0"
   },
   "dependencyClosure": {
@@ -40,32 +40,6 @@
         }
       }
     },
-    "@aws-cdk/asset-kubectl-v20": {
-      "targets": {
-        "dotnet": {
-          "namespace": "Amazon.CDK.Asset.KubectlV20",
-          "packageId": "Amazon.CDK.Asset.KubectlV20"
-        },
-        "go": {
-          "moduleName": "github.com/cdklabs/awscdk-asset-kubectl-go",
-          "packageName": "kubectlv20"
-        },
-        "java": {
-          "maven": {
-            "artifactId": "cdk-asset-kubectl-v20",
-            "groupId": "software.amazon.awscdk"
-          },
-          "package": "software.amazon.awscdk.cdk.asset.kubectl.v20"
-        },
-        "js": {
-          "npm": "@aws-cdk/asset-kubectl-v20"
-        },
-        "python": {
-          "distName": "aws-cdk.asset-kubectl-v20",
-          "module": "aws_cdk.asset_kubectl_v20"
-        }
-      }
-    },
     "@aws-cdk/asset-node-proxy-agent-v6": {
       "targets": {
         "dotnet": {
@@ -3866,19 +3840,6 @@
             }
           }
         },
-        "aws-cdk-lib.lambda_layer_kubectl": {
-          "targets": {
-            "dotnet": {
-              "namespace": "Amazon.CDK.LambdaLayer.Kubectl"
-            },
-            "java": {
-              "package": "software.amazon.awscdk.lambdalayer.kubectl"
-            },
-            "python": {
-              "module": "aws_cdk.lambda_layer_kubectl"
-            }
-          }
-        },
         "aws-cdk-lib.lambda_layer_node_proxy_agent": {
           "targets": {
             "dotnet": {
@@ -4005,7 +3966,7 @@
   },
   "name": "@aws-solutions-constructs/aws-cloudfront-oai-s3",
   "readme": {
-    "markdown": "# aws-cloudfront-oai-s3 module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language**     | **Package**        |\n|:-------------|-----------------|\n|![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_cloudfront_oai_s3`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-cloudfront-oai-s3`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfrontoais3`|\n\n## Overview\nThis AWS Solutions Construct provisions an Amazon CloudFront Distribution that serves objects from an AWS S3 Bucket via an Origin Access Identity (OAI).\n\nIMPORTANT: The recommended architecture for this pattern is to use an Origin Access Control, which is available in aws-cloudfront-s3. This construct is provided to support China regions where Origin Access Controls are not available.\n\nHere is a minimal deployable pattern definition:\n\nTypescript\n``` typescript\nimport { Construct } from 'constructs';\nimport { Stack, StackProps } from 'aws-cdk-lib';\nimport { CloudFrontToOaiToS3 } from '@aws-solutions-constructs/aws-cloudfront-oai-s3';\n\nnew CloudFrontToOaiToS3(this, 'test-cloudfront-oai-s3', {});\n```\n\nPython\n``` python\nfrom aws_solutions_constructs.aws_cloudfront_oai_s3 import CloudFrontToOaiToS3\nfrom aws_cdk import Stack\nfrom constructs import Construct\n\nCloudFrontToOaiToS3(self, 'test-cloudfront-oai-s3')\n```\n\nJava\n``` java\nimport software.constructs.Construct;\n\nimport software.amazon.awscdk.Stack;\nimport software.amazon.awscdk.StackProps;\nimport software.amazon.awsconstructs.services.cloudfrontoais3.*;\n\nnew CloudFrontToOaiToS3(this, \"test-cloudfront-oai-s3\", new CloudFrontToOaiToS3Props.Builder()\n  .build());\n```\n\n## Pattern Construct Props\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|\n|insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|\n|responseHeadersPolicyProps?   | [`cloudfront.ResponseHeadersPolicyProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.ResponseHeadersPolicyProps.html) | Optional user provided configuration that cloudfront applies to all http responses.|\n|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront_origins.S3OriginProps.html#originpath) that CloudFront appends to the origin domain name when CloudFront requests content from the origin. The string should start with a `/`, for example: `/production`. Default value is `'/'`|\n|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Existing instance of S3 content bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |\n|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the S3 content bucket. Note - to log S3 access for this bucket to an existing S3 bucket, put the existing log bucket in bucketProps: `serverAccessLogsBucket`|\n|logS3AccessLogs?| boolean|Whether to turn on Access Logging for the S3 bucket. Creates an S3 bucket with associated storage costs for the logs. Enabling Access Logging is a best practice. default - true|\n|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|\n|cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket. Note: to use an existing bucketto  hold CloudFront logs, pass the existing log bucket in |\n|logCloudFrontAccessLog|`boolean`|Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this while providing info about the log bucket will cause an error. Default = true |\n|cloudFrontLoggingBucketAccessLogBucketProps|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket. Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error. To provide an existing bucket to accept these logs, pass the existing bucket in `cloudFrontLoggingBucketProps::serverAccessLogBucket`|\n\n## Pattern Properties\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontWebDistribution|[`cloudfront.Distribution`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html)|Returns an instance of cloudfront.Distribution created by the construct.|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the construct.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct.|\n|s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct. IMPORTANT: If `existingBucketObj` was provided in Pattern Construct Props, this property will be `undefined`|\n|s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|\n|cloudFrontLoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket created by the construct to hold CloudFront logs. Only populated if the construct creates the bucket (not if an existing bucket is passed in via DistributionProps)|\n|cloudFrontLoggingBucketAccessLogBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket containing the S3 access logs for the CloudFront log bucket. Only populated if the construct creates the bucket (not if the bucket is passed in via `cloudFrontLoggingBucketProps::serverAccessLogBucket`|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon CloudFront\n* Configure Access logging for CloudFront Distribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront Distribution\n* CloudFront originPath set to `'/'`\n* Create an Origin Access Identity to access S3 bucket\n\n### Amazon S3 Bucket\n* Configure Access logging for S3 Bucket\n* Enable server-side encryption for S3 Bucket using AWS managed KMS Key\n* Enforce encryption of data in transit\n* Turn on the versioning for S3 Bucket\n* Block public access for S3 Bucket\n* Retain the S3 Bucket when deleting the CloudFormation stack\n* Applies Lifecycle rule to move noncurrent object versions to Glacier storage after 90 days\n\n## Architecture\n![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
+    "markdown": "# aws-cloudfront-oai-s3 module\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)\n\n---\n<!--END STABILITY BANNER-->\n\n| **Reference Documentation**:| <span style=\"font-weight: normal\">https://docs.aws.amazon.com/solutions/latest/constructs/</span>|\n|:-------------|:-------------|\n<div style=\"height:8px\"></div>\n\n| **Language**     | **Package**        |\n|:-------------|-----------------|\n|![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_cloudfront_oai_s3`|\n|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-cloudfront-oai-s3`|\n|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.cloudfrontoais3`|\n\n## Overview\nThis AWS Solutions Construct provisions an Amazon CloudFront Distribution that serves objects from an AWS S3 Bucket via an Origin Access Identity (OAI).\n\nIMPORTANT: The recommended architecture for this pattern is to use an Origin Access Control, which is available in aws-cloudfront-s3. This construct is provided to support China regions where Origin Access Controls are not available.\n\nHere is a minimal deployable pattern definition:\n\nTypescript\n``` typescript\nimport { Construct } from 'constructs';\nimport { Stack, StackProps } from 'aws-cdk-lib';\nimport { CloudFrontToOaiToS3 } from '@aws-solutions-constructs/aws-cloudfront-oai-s3';\n\nnew CloudFrontToOaiToS3(this, 'test-cloudfront-oai-s3', {});\n```\n\nPython\n``` python\nfrom aws_solutions_constructs.aws_cloudfront_oai_s3 import CloudFrontToOaiToS3\nfrom aws_cdk import Stack\nfrom constructs import Construct\n\nCloudFrontToOaiToS3(self, 'test-cloudfront-oai-s3')\n```\n\nJava\n``` java\nimport software.constructs.Construct;\n\nimport software.amazon.awscdk.Stack;\nimport software.amazon.awscdk.StackProps;\nimport software.amazon.awsconstructs.services.cloudfrontoais3.*;\n\nnew CloudFrontToOaiToS3(this, \"test-cloudfront-oai-s3\", new CloudFrontToOaiToS3Props.Builder()\n  .build());\n```\n\n## Pattern Construct Props\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontDistributionProps?|[`cloudfront.DistributionProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.DistributionProps.html)|Optional user provided props to override the default props for CloudFront Distribution|\n|insertHttpSecurityHeaders?|`boolean`|Optional user provided props to turn on/off the automatic injection of best practice HTTP security headers in all responses from CloudFront|\n|responseHeadersPolicyProps?   | [`cloudfront.ResponseHeadersPolicyProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.ResponseHeadersPolicyProps.html) | Optional user provided configuration that cloudfront applies to all http responses.|\n|originPath?|`string`|Optional user provided props to provide an[originPath](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront_origins.S3OriginProps.html#originpath) that CloudFront appends to the origin domain name when CloudFront requests content from the origin. The string should start with a `/`, for example: `/production`. Default value is `'/'`|\n|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Existing instance of S3 content bucket object or interface. If this is provided, then also providing bucketProps will cause an error. |\n|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the S3 content bucket. Note - to log S3 access for this bucket to an existing S3 bucket, put the existing log bucket in bucketProps: `serverAccessLogsBucket`|\n|logS3AccessLogs?| boolean|Whether to turn on Access Logging for the S3 bucket. Creates an S3 bucket with associated storage costs for the logs. Enabling Access Logging is a best practice. default - true|\n|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|\n|cloudFrontLoggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Logging Bucket. Note: to use an existing bucketto  hold CloudFront logs, pass the existing log bucket in |\n|logCloudFrontAccessLog|`boolean`|Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this while providing info about the log bucket will cause an error. Default = true |\n|cloudFrontLoggingBucketAccessLogBucketProps|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket. Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error. To provide an existing bucket to accept these logs, pass the existing bucket in `cloudFrontLoggingBucketProps::serverAccessLogBucket`|\n\n## Pattern Properties\n\n| **Name**     | **Type**        | **Description** |\n|:-------------|:----------------|-----------------|\n|cloudFrontWebDistribution|[`cloudfront.Distribution`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Distribution.html)|Returns an instance of cloudfront.Distribution created by the construct.|\n|cloudFrontFunction?|[`cloudfront.Function`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.Function.html)|Returns an instance of the Cloudfront function created by the construct.|\n|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct.|\n|s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct. IMPORTANT: If `existingBucketObj` was provided in Pattern Construct Props, this property will be `undefined`|\n|s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|\n|cloudFrontLoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket created by the construct to hold CloudFront logs. Only populated if the construct creates the bucket (not if an existing bucket is passed in via DistributionProps)|\n|cloudFrontLoggingBucketAccessLogBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket containing the S3 access logs for the CloudFront log bucket. Only populated if the construct creates the bucket (not if the bucket is passed in via `cloudFrontLoggingBucketProps::serverAccessLogBucket`|\n|originaAccessIdentity?|[`cloudfront.OriginAccessIdentity`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.OriginAccessIdentity.html)| The Origina Access Identity created to connect the CloudFront distribution to the S3 bucket (only suitable for use in regions without OAC, such as China)|\n\n## Default settings\n\nOut of the box implementation of the Construct without any override will set the following defaults:\n\n### Amazon CloudFront\n* Configure Access logging for CloudFront Distribution\n* Enable automatic injection of best practice HTTP security headers in all responses from CloudFront Distribution\n* CloudFront originPath set to `'/'`\n* Create an Origin Access Identity to access S3 bucket\n\n### Amazon S3 Bucket\n* Configure Access logging for S3 Bucket\n* Enable server-side encryption for S3 Bucket using AWS managed KMS Key\n* Enforce encryption of data in transit\n* Turn on the versioning for S3 Bucket\n* Block public access for S3 Bucket\n* Retain the S3 Bucket when deleting the CloudFormation stack\n* Applies Lifecycle rule to move noncurrent object versions to Glacier storage after 90 days\n\n## Architecture\n![Architecture Diagram](architecture.png)\n\n***\n&copy; Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n"
   },
   "repository": {
     "directory": "source/patterns/@aws-solutions-constructs/aws-cloudfront-oai-s3",
@@ -4100,6 +4061,17 @@
             "fqn": "aws-cdk-lib.aws_cloudfront.Distribution"
           }
         },
+        {
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 132
+          },
+          "name": "originAccessIdentity",
+          "type": {
+            "fqn": "aws-cdk-lib.aws_cloudfront.OriginAccessIdentity"
+          }
+        },
         {
           "immutable": true,
           "locationInModule": {
@@ -4147,18 +4119,6 @@
             "fqn": "aws-cdk-lib.aws_s3.Bucket"
           }
         },
-        {
-          "immutable": true,
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 132
-          },
-          "name": "originAccessControl",
-          "optional": true,
-          "type": {
-            "fqn": "aws-cdk-lib.aws_cloudfront.CfnOriginAccessControl"
-          }
-        },
         {
           "immutable": true,
           "locationInModule": {
@@ -4398,6 +4358,6 @@
       "symbolId": "lib/index:CloudFrontToOaiToS3Props"
     }
   },
-  "version": "2.79.0",
-  "fingerprint": "Kx7ftm8M7ok1fiJysFdK9upCltfS6zAE5gvKzcPH89Y="
+  "version": "2.80.0",
+  "fingerprint": "QcmtifVYRobfpmha0kHILlTRUMJGc+ikuUohPOwF5lw="
 }

package/README.md

@@ -82,6 +82,7 @@ new CloudFrontToOaiToS3(this, "test-cloudfront-oai-s3", new CloudFrontToOaiToS3P
 |s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.|
 |cloudFrontLoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket created by the construct to hold CloudFront logs. Only populated if the construct creates the bucket (not if an existing bucket is passed in via DistributionProps)|
 |cloudFrontLoggingBucketAccessLogBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|The S3 bucket containing the S3 access logs for the CloudFront log bucket. Only populated if the construct creates the bucket (not if the bucket is passed in via `cloudFrontLoggingBucketProps::serverAccessLogBucket`|
+|originaAccessIdentity?|[`cloudfront.OriginAccessIdentity`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront.OriginAccessIdentity.html)| The Origina Access Identity created to connect the CloudFront distribution to the S3 bucket (only suitable for use in regions without OAC, such as China)|
 
 ## Default settings
 

package/lib/index.d.ts

@@ -104,7 +104,7 @@ export declare class CloudFrontToOaiToS3 extends Construct {
     readonly s3BucketInterface: s3.IBucket;
     readonly s3Bucket?: s3.Bucket;
     readonly s3LoggingBucket?: s3.Bucket;
-    readonly originAccessControl?: cloudfront.CfnOriginAccessControl;
+    readonly originAccessIdentity: cloudfront.OriginAccessIdentity;
     /**
      * @summary Constructs a new instance of the CloudFrontToOaiToS3 class.
      * @param {Construct} scope - represents the scope for all the resources.

package/lib/index.js

@@ -74,6 +74,7 @@ class CloudFrontToOaiToS3 extends constructs_1.Construct {
         this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;
         this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;
         this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;
+        this.originAccessIdentity = cloudFrontDistributionForS3Response.originAccessIdentity;
         // Grant CloudFront permission to get the objects from the s3 bucket origin
         originBucket.addToResourcePolicy(new iam.PolicyStatement({
             effect: iam.Effect.ALLOW,
@@ -102,5 +103,5 @@ class CloudFrontToOaiToS3 extends constructs_1.Construct {
 }
 exports.CloudFrontToOaiToS3 = CloudFrontToOaiToS3;
 _a = JSII_RTTI_SYMBOL_1;
-CloudFrontToOaiToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-oai-s3.CloudFrontToOaiToS3", version: "2.79.0" };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport { Aws } from 'aws-cdk-lib';\nimport * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport * as defaults from '@aws-solutions-constructs/core';\n// import * as resources from '@aws-solutions-constructs/resources';\n// import * as kms from 'aws-cdk-lib/aws-kms';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\n\n/**\n * @summary The properties for the CloudFrontToOaiToS3 Construct\n */\nexport interface CloudFrontToOaiToS3Props {\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  /**\n   * Optional user provided props to turn on/off the automatic injection of best practice HTTP\n   * security headers in all responses from cloudfront.\n   * Turning this on will inject default headers and is mutually exclusive with passing custom security headers\n   * via the responseHeadersPolicyProps parameter.\n   *\n   * @default - true\n   */\n  readonly insertHttpSecurityHeaders?: boolean;\n  /**\n   * Optional user provided configuration that cloudfront applies to all http responses.\n   * Can be used to pass a custom ResponseSecurityHeadersBehavior, ResponseCustomHeadersBehavior or\n   * ResponseHeadersCorsBehavior to the cloudfront distribution.\n   *\n   * Passing a custom ResponseSecurityHeadersBehavior is mutually exclusive with turning on the default security headers\n   * via `insertHttpSecurityHeaders` prop. Will throw an error if both `insertHttpSecurityHeaders` is set to `true`\n   * and ResponseSecurityHeadersBehavior is passed.\n   *\n   * @default - undefined\n   */\n  readonly responseHeadersPolicyProps?: cloudfront.ResponseHeadersPolicyProps\n  /**\n   * Optional user provided props to provide an originPath that CloudFront appends to the\n   * origin domain name when CloudFront requests content from the origin.\n   * The string should start with a `/`, for example `/production`.\n   * @default = '/'\n   */\n  readonly originPath?: string,\n\n  // =====================\n  // S3 Content Bucket\n  // =====================\n  /**\n   * Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingBucketObj?: s3.IBucket,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\n\n  // =====================\n  // S3 Content Bucket Access Logs Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the S3 Content bucket\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Log Bucket\n  // =====================\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Logs Bucket Access Log Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this\n   * while providing info about the log bucket will cause an error.\n   *\n   * @default - true\n   */\n  readonly logCloudFrontAccessLog?: boolean,\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket.\n   * Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketAccessLogBucketProps?: s3.BucketProps,\n}\n\nexport class CloudFrontToOaiToS3 extends Construct {\n  public readonly cloudFrontWebDistribution: cloudfront.Distribution;\n  public readonly cloudFrontFunction?: cloudfront.Function;\n  public readonly cloudFrontLoggingBucket?: s3.Bucket;\n  public readonly cloudFrontLoggingBucketAccessLogBucket?: s3.Bucket;\n  public readonly s3BucketInterface: s3.IBucket;\n  public readonly s3Bucket?: s3.Bucket;\n  public readonly s3LoggingBucket?: s3.Bucket;\n  public readonly originAccessControl?: cloudfront.CfnOriginAccessControl;\n\n  /**\n   * @summary Constructs a new instance of the CloudFrontToOaiToS3 class.\n   * @param {Construct} scope - represents the scope for all the resources.\n   * @param {string} id - this is a a scope-unique id.\n   * @param {CloudFrontToOaiToS3Props} props - user provided props for the construct\n   * @since 0.8.0\n   * @access public\n   */\n  constructor(scope: Construct, id: string, props: CloudFrontToOaiToS3Props) {\n    super(scope, id);\n\n    defaults.printWarning(`This construct deploys a Cloudfront/S3 pattern connected with an Origin Access Identity,\n      the recommended architecture is to use an Origin Access Connector (provided in aws-cloudfront-oai-s3). This construct\n      is provided only for use in China regions, where OACs are not available.`);\n\n    // All our tests are based upon this behavior being on, so we're setting\n    // context here rather than assuming the client will set it\n    this.node.setContext(\"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy\", true);\n\n    defaults.CheckS3Props(props);\n    defaults.CheckCloudFrontProps(props);\n    defaults.CheckCloudfrontS3Props(props);\n    this.checkForKmsKey(props);\n\n    let originBucket: s3.IBucket;\n\n    if (!props.existingBucketObj) {\n      const buildS3BucketResponse = defaults.buildS3Bucket(this, {\n        bucketProps: props.bucketProps,\n        loggingBucketProps: props.loggingBucketProps,\n        logS3AccessLogs: props.logS3AccessLogs\n      });\n      this.s3Bucket = buildS3BucketResponse.bucket;\n      this.s3LoggingBucket = buildS3BucketResponse.loggingBucket;\n      originBucket = this.s3Bucket;\n    } else {\n      originBucket = props.existingBucketObj;\n    }\n\n    this.s3BucketInterface = originBucket;\n\n    // Define the CloudFront Distribution\n    const cloudFrontOaiDistributionForS3Props: defaults.CreateCloudFrontOaiDistributionForS3Props = {\n      originPath: props.originPath,\n      sourceBucket: this.s3BucketInterface,\n      cloudFrontDistributionProps: props.cloudFrontDistributionProps,\n      httpSecurityHeaders: props.insertHttpSecurityHeaders,\n      cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,\n      responseHeadersPolicyProps: props.responseHeadersPolicyProps,\n      cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps,\n      logCloudFrontAccessLog: props.logCloudFrontAccessLog\n    };\n    const cloudFrontDistributionForS3Response = defaults.createCloudFrontOaiDistributionForS3(this, cloudFrontOaiDistributionForS3Props);\n    this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;\n    this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;\n    this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;\n    this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;\n\n    // Grant CloudFront permission to get the objects from the s3 bucket origin\n    originBucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: ['s3:GetObject'],\n        principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],\n        resources: [originBucket.arnForObjects('*')],\n        conditions: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:${Aws.PARTITION}:cloudfront::${Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`\n          }\n        }\n      })\n    );\n\n  }\n\n  private checkForKmsKey(props: CloudFrontToOaiToS3Props) {\n    let errorMessages = '';\n    let errorFound = false;\n\n    if ((props.bucketProps && props.bucketProps.encryptionKey) ||\n      (props.existingBucketObj && props.existingBucketObj.encryptionKey)) {\n      errorMessages += 'Error - buckets cannot use CMKs with OAIs\\n';\n      errorFound = true;\n    }\n\n    if (errorFound) {\n      throw new Error(errorMessages);\n    }\n  }\n}"]}
+CloudFrontToOaiToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-oai-s3.CloudFrontToOaiToS3", version: "2.80.0" };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport { Aws } from 'aws-cdk-lib';\nimport * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport * as defaults from '@aws-solutions-constructs/core';\n// import * as resources from '@aws-solutions-constructs/resources';\n// import * as kms from 'aws-cdk-lib/aws-kms';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\n\n/**\n * @summary The properties for the CloudFrontToOaiToS3 Construct\n */\nexport interface CloudFrontToOaiToS3Props {\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  /**\n   * Optional user provided props to turn on/off the automatic injection of best practice HTTP\n   * security headers in all responses from cloudfront.\n   * Turning this on will inject default headers and is mutually exclusive with passing custom security headers\n   * via the responseHeadersPolicyProps parameter.\n   *\n   * @default - true\n   */\n  readonly insertHttpSecurityHeaders?: boolean;\n  /**\n   * Optional user provided configuration that cloudfront applies to all http responses.\n   * Can be used to pass a custom ResponseSecurityHeadersBehavior, ResponseCustomHeadersBehavior or\n   * ResponseHeadersCorsBehavior to the cloudfront distribution.\n   *\n   * Passing a custom ResponseSecurityHeadersBehavior is mutually exclusive with turning on the default security headers\n   * via `insertHttpSecurityHeaders` prop. Will throw an error if both `insertHttpSecurityHeaders` is set to `true`\n   * and ResponseSecurityHeadersBehavior is passed.\n   *\n   * @default - undefined\n   */\n  readonly responseHeadersPolicyProps?: cloudfront.ResponseHeadersPolicyProps\n  /**\n   * Optional user provided props to provide an originPath that CloudFront appends to the\n   * origin domain name when CloudFront requests content from the origin.\n   * The string should start with a `/`, for example `/production`.\n   * @default = '/'\n   */\n  readonly originPath?: string,\n\n  // =====================\n  // S3 Content Bucket\n  // =====================\n  /**\n   * Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingBucketObj?: s3.IBucket,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\n\n  // =====================\n  // S3 Content Bucket Access Logs Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the S3 Content bucket\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Log Bucket\n  // =====================\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Logs Bucket Access Log Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this\n   * while providing info about the log bucket will cause an error.\n   *\n   * @default - true\n   */\n  readonly logCloudFrontAccessLog?: boolean,\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket.\n   * Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketAccessLogBucketProps?: s3.BucketProps,\n}\n\nexport class CloudFrontToOaiToS3 extends Construct {\n  public readonly cloudFrontWebDistribution: cloudfront.Distribution;\n  public readonly cloudFrontFunction?: cloudfront.Function;\n  public readonly cloudFrontLoggingBucket?: s3.Bucket;\n  public readonly cloudFrontLoggingBucketAccessLogBucket?: s3.Bucket;\n  public readonly s3BucketInterface: s3.IBucket;\n  public readonly s3Bucket?: s3.Bucket;\n  public readonly s3LoggingBucket?: s3.Bucket;\n  public readonly originAccessIdentity: cloudfront.OriginAccessIdentity;\n\n  /**\n   * @summary Constructs a new instance of the CloudFrontToOaiToS3 class.\n   * @param {Construct} scope - represents the scope for all the resources.\n   * @param {string} id - this is a a scope-unique id.\n   * @param {CloudFrontToOaiToS3Props} props - user provided props for the construct\n   * @since 0.8.0\n   * @access public\n   */\n  constructor(scope: Construct, id: string, props: CloudFrontToOaiToS3Props) {\n    super(scope, id);\n\n    defaults.printWarning(`This construct deploys a Cloudfront/S3 pattern connected with an Origin Access Identity,\n      the recommended architecture is to use an Origin Access Connector (provided in aws-cloudfront-oai-s3). This construct\n      is provided only for use in China regions, where OACs are not available.`);\n\n    // All our tests are based upon this behavior being on, so we're setting\n    // context here rather than assuming the client will set it\n    this.node.setContext(\"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy\", true);\n\n    defaults.CheckS3Props(props);\n    defaults.CheckCloudFrontProps(props);\n    defaults.CheckCloudfrontS3Props(props);\n    this.checkForKmsKey(props);\n\n    let originBucket: s3.IBucket;\n\n    if (!props.existingBucketObj) {\n      const buildS3BucketResponse = defaults.buildS3Bucket(this, {\n        bucketProps: props.bucketProps,\n        loggingBucketProps: props.loggingBucketProps,\n        logS3AccessLogs: props.logS3AccessLogs\n      });\n      this.s3Bucket = buildS3BucketResponse.bucket;\n      this.s3LoggingBucket = buildS3BucketResponse.loggingBucket;\n      originBucket = this.s3Bucket;\n    } else {\n      originBucket = props.existingBucketObj;\n    }\n\n    this.s3BucketInterface = originBucket;\n\n    // Define the CloudFront Distribution\n    const cloudFrontOaiDistributionForS3Props: defaults.CreateCloudFrontOaiDistributionForS3Props = {\n      originPath: props.originPath,\n      sourceBucket: this.s3BucketInterface,\n      cloudFrontDistributionProps: props.cloudFrontDistributionProps,\n      httpSecurityHeaders: props.insertHttpSecurityHeaders,\n      cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,\n      responseHeadersPolicyProps: props.responseHeadersPolicyProps,\n      cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps,\n      logCloudFrontAccessLog: props.logCloudFrontAccessLog\n    };\n    const cloudFrontDistributionForS3Response = defaults.createCloudFrontOaiDistributionForS3(this, cloudFrontOaiDistributionForS3Props);\n    this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;\n    this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;\n    this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;\n    this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;\n    this.originAccessIdentity = cloudFrontDistributionForS3Response.originAccessIdentity;\n\n    // Grant CloudFront permission to get the objects from the s3 bucket origin\n    originBucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: ['s3:GetObject'],\n        principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],\n        resources: [originBucket.arnForObjects('*')],\n        conditions: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:${Aws.PARTITION}:cloudfront::${Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`\n          }\n        }\n      })\n    );\n\n  }\n\n  private checkForKmsKey(props: CloudFrontToOaiToS3Props) {\n    let errorMessages = '';\n    let errorFound = false;\n\n    if ((props.bucketProps && props.bucketProps.encryptionKey) ||\n      (props.existingBucketObj && props.existingBucketObj.encryptionKey)) {\n      errorMessages += 'Error - buckets cannot use CMKs with OAIs\\n';\n      errorFound = true;\n    }\n\n    if (errorFound) {\n      throw new Error(errorMessages);\n    }\n  }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-solutions-constructs/aws-cloudfront-oai-s3",
-  "version": "2.79.0",
+  "version": "2.80.0",
   "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -54,15 +54,15 @@
     }
   },
   "dependencies": {
-    "@aws-solutions-constructs/core": "2.79.0",
-    "@aws-solutions-constructs/resources": "2.79.0",
+    "@aws-solutions-constructs/core": "2.80.0",
+    "@aws-solutions-constructs/resources": "2.80.0",
     "constructs": "^10.0.0"
   },
   "devDependencies": {
-    "@aws-cdk/integ-tests-alpha": "2.177.0-alpha.0",
+    "@aws-cdk/integ-tests-alpha": "2.179.0-alpha.0",
     "@types/node": "^10.3.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "2.177.0"
+    "aws-cdk-lib": "2.179.0"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -79,10 +79,10 @@
     ]
   },
   "peerDependencies": {
-    "@aws-solutions-constructs/core": "2.79.0",
-    "@aws-solutions-constructs/resources": "2.79.0",
+    "@aws-solutions-constructs/core": "2.80.0",
+    "@aws-solutions-constructs/resources": "2.80.0",
     "constructs": "^10.0.0",
-    "aws-cdk-lib": "^2.177.0"
+    "aws-cdk-lib": "^2.179.0"
   },
   "keywords": [
     "aws",

package/test/integ.cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.assets.json

@@ -14,7 +14,7 @@
         }
       }
     },
-    "273b549d5f2d60c470693f400d06f286190b06247ddd3868a46a3ff76654c6b8": {
+    "b7eaa812427a23bb2091fd6491f2c3385ad2394c1d10b7615f38bd75496cd3a0": {
       "source": {
         "path": "cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.template.json",
         "packaging": "file"
@@ -22,7 +22,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "273b549d5f2d60c470693f400d06f286190b06247ddd3868a46a3ff76654c6b8.json",
+          "objectKey": "b7eaa812427a23bb2091fd6491f2c3385ad2394c1d10b7615f38bd75496cd3a0.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

package/test/integ.cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.template.json

@@ -403,7 +403,7 @@
        "Principal": {
         "CanonicalUser": {
          "Fn::GetAtt": [
-          "testcloudfrontoais3managedkeyCloudFrontDistributionOrigin1S3OriginFC894C0D",
+          "testcloudfrontoais3managedkeyconstructsGeneratedOai89C0D4F8",
           "S3CanonicalUserId"
          ]
         }
@@ -832,11 +832,11 @@
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
   },
-  "testcloudfrontoais3managedkeyCloudFrontDistributionOrigin1S3OriginFC894C0D": {
+  "testcloudfrontoais3managedkeyconstructsGeneratedOai89C0D4F8": {
    "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity",
    "Properties": {
     "CloudFrontOriginAccessIdentityConfig": {
-     "Comment": "Identity for cftoais3bucketencryptedwithmanagedkeyprovidedasexistingbuckettestcloudfrontoais3managedkeyCloudFrontDistributionOri"
+     "Comment": "Allows CloudFront to reach the bucket"
     }
    }
   },
@@ -878,7 +878,7 @@
           [
            "origin-access-identity/cloudfront/",
            {
-            "Ref": "testcloudfrontoais3managedkeyCloudFrontDistributionOrigin1S3OriginFC894C0D"
+            "Ref": "testcloudfrontoais3managedkeyconstructsGeneratedOai89C0D4F8"
            }
           ]
          ]
@@ -948,10 +948,10 @@
     "value": "nodejs20.x"
    },
    "cn-north-1": {
-    "value": "nodejs18.x"
+    "value": "nodejs20.x"
    },
    "cn-northwest-1": {
-    "value": "nodejs18.x"
+    "value": "nodejs20.x"
    },
    "eu-central-1": {
     "value": "nodejs20.x"
@@ -1002,10 +1002,10 @@
     "value": "nodejs20.x"
    },
    "us-gov-east-1": {
-    "value": "nodejs18.x"
+    "value": "nodejs20.x"
    },
    "us-gov-west-1": {
-    "value": "nodejs18.x"
+    "value": "nodejs20.x"
    },
    "us-iso-east-1": {
     "value": "nodejs18.x"

package/test/integ.cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/manifest.json

@@ -66,7 +66,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/273b549d5f2d60c470693f400d06f286190b06247ddd3868a46a3ff76654c6b8.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b7eaa812427a23bb2091fd6491f2c3385ad2394c1d10b7615f38bd75496cd3a0.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -82,18 +82,45 @@
         "cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket.assets"
       ],
       "metadata": {
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3LoggingBucket": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "encryption": "S3_MANAGED",
+              "versioned": true,
+              "blockPublicAccess": "*",
+              "removalPolicy": "destroy",
+              "enforceSSL": true,
+              "autoDeleteObjects": true
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3LoggingBucket/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "existings3bucketencryptedwiths3managedkeyS3LoggingBucketF861F6B7"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3LoggingBucket/Policy": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "bucket": "*"
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3LoggingBucket/Policy/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "existings3bucketencryptedwiths3managedkeyS3LoggingBucketPolicy4358229C"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3LoggingBucket/AutoDeleteObjectsCustomResource": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": "*"
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3LoggingBucket/AutoDeleteObjectsCustomResource/Default": [
           {
             "type": "aws:cdk:logicalId",
@@ -124,64 +151,193 @@
             "data": "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3Bucket": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "encryption": "S3_MANAGED",
+              "versioned": true,
+              "blockPublicAccess": "*",
+              "removalPolicy": "destroy",
+              "enforceSSL": true,
+              "lifecycleRules": [
+                {
+                  "noncurrentVersionTransitions": [
+                    {
+                      "storageClass": "*"
+                    }
+                  ]
+                }
+              ],
+              "serverAccessLogsBucket": "*",
+              "autoDeleteObjects": true
+            }
+          },
+          {
+            "type": "aws:cdk:analytics:method",
+            "data": {
+              "addLifecycleRule": [
+                {
+                  "noncurrentVersionTransitions": [
+                    {
+                      "storageClass": "*"
+                    }
+                  ]
+                },
+                "*",
+                "*"
+              ]
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3Bucket/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "existings3bucketencryptedwiths3managedkeyS3BucketA8C4BE9A"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3Bucket/Policy": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "bucket": "*"
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3Bucket/Policy/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "existings3bucketencryptedwiths3managedkeyS3BucketPolicyFDA85248"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3Bucket/AutoDeleteObjectsCustomResource": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": "*"
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/existing-s3-bucket-encrypted-with-s3-managed-keyS3Bucket/AutoDeleteObjectsCustomResource/Default": [
           {
             "type": "aws:cdk:logicalId",
             "data": "existings3bucketencryptedwiths3managedkeyS3BucketAutoDeleteObjectsCustomResourceE3B1946C"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucketAccessLog": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "encryption": "S3_MANAGED",
+              "versioned": true,
+              "blockPublicAccess": "*",
+              "removalPolicy": "destroy",
+              "enforceSSL": true,
+              "autoDeleteObjects": true
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucketAccessLog/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "testcloudfrontoais3managedkeyCloudfrontLoggingBucketAccessLog2E3935E9"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucketAccessLog/Policy": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "bucket": "*"
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucketAccessLog/Policy/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "testcloudfrontoais3managedkeyCloudfrontLoggingBucketAccessLogPolicy6FCD1E7F"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucketAccessLog/AutoDeleteObjectsCustomResource": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": "*"
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucketAccessLog/AutoDeleteObjectsCustomResource/Default": [
           {
             "type": "aws:cdk:logicalId",
             "data": "testcloudfrontoais3managedkeyCloudfrontLoggingBucketAccessLogAutoDeleteObjectsCustomResource8CDCC9A1"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucket": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "encryption": "S3_MANAGED",
+              "versioned": true,
+              "blockPublicAccess": "*",
+              "removalPolicy": "destroy",
+              "enforceSSL": true,
+              "autoDeleteObjects": true,
+              "objectOwnership": "ObjectWriter",
+              "serverAccessLogsBucket": "*"
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucket/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "testcloudfrontoais3managedkeyCloudfrontLoggingBucketE6FDAA72"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucket/Policy": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "bucket": "*"
+            }
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucket/Policy/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "testcloudfrontoais3managedkeyCloudfrontLoggingBucketPolicyA31F4F70"
           }
         ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucket/AutoDeleteObjectsCustomResource": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": "*"
+          }
+        ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudfrontLoggingBucket/AutoDeleteObjectsCustomResource/Default": [
           {
             "type": "aws:cdk:logicalId",
             "data": "testcloudfrontoais3managedkeyCloudfrontLoggingBucketAutoDeleteObjectsCustomResourceD8646547"
           }
         ],
-        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudFrontDistribution/Origin1/S3Origin/Resource": [
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/constructsGeneratedOai": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": "*"
+          }
+        ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/constructsGeneratedOai/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "testcloudfrontoais3managedkeyCloudFrontDistributionOrigin1S3OriginFC894C0D"
+            "data": "testcloudfrontoais3managedkeyconstructsGeneratedOai89C0D4F8"
+          }
+        ],
+        "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudFrontDistribution": [
+          {
+            "type": "aws:cdk:analytics:construct",
+            "data": {
+              "defaultBehavior": {
+                "origin": "*",
+                "viewerProtocolPolicy": "redirect-to-https"
+              },
+              "enableLogging": true,
+              "logBucket": "*",
+              "defaultRootObject": "*"
+            }
           }
         ],
         "/cftoais3-bucket-encrypted-with-managed-key-provided-as-existingbucket/test-cloudfront-oai-s3-managed-key/CloudFrontDistribution/Resource": [