Added cloudFrontLoggingBucketProps to cloudfront-s3

awslabs · Oct 13, 2021 · 8e5097a · 8e5097a
1 parent ffd8d17
commit 8e5097a
Show file tree

Hide file tree

Showing 7 changed files with 526 additions and 6 deletions.
diff --git a/...ws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts b/...ws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts
@@ -176,7 +176,7 @@ test('Cloudfront logging bucket with destroy removal policy and auto delete obje
 
   const [_api] = defaults.RegionalLambdaRestApi(stack, func);
 
-  new CloudFrontToApiGateway(stack, 'cloudfront-s3', {
+  new CloudFrontToApiGateway(stack, 'cloudfront-apigateway', {
     existingApiGatewayObj: _api,
     cloudFrontLoggingBucketProps: {
       removalPolicy: cdk.RemovalPolicy.DESTROY,
@@ -196,7 +196,7 @@ test('Cloudfront logging bucket with destroy removal policy and auto delete obje
       ]
     },
     BucketName: {
-      Ref: "cloudfronts3CloudfrontLoggingBucket5B845143"
+      Ref: "cloudfrontapigatewayCloudfrontLoggingBucket5948F496"
     }
   });
 });
@@ -219,7 +219,7 @@ test('Cloudfront logging bucket error when providing existing log bucket and log
 
   const logBucket = new s3.Bucket(stack, 'cloudfront-log-bucket', {});
 
-  const app = () => { new CloudFrontToApiGateway(stack, 'cloudfront-s3', {
+  const app = () => { new CloudFrontToApiGateway(stack, 'cloudfront-apigateway', {
     existingApiGatewayObj: _api,
     cloudFrontDistributionProps: {
       logBucket

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/README.md b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/README.md
@@ -54,6 +54,7 @@ _Parameters_
 |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|
 |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.|
 
 ## Pattern Properties
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts
@@ -52,6 +52,12 @@ export interface CloudFrontToS3Props {
     * @default - Default props are used
     */
     readonly loggingBucketProps?: s3.BucketProps
+    /**
+     * Optional user provided props to override the default props for the CloudFront Logging Bucket.
+     *
+     * @default - Default props are used
+     */
+    readonly cloudFrontLoggingBucketProps?: s3.BucketProps
  }
 
 export class CloudFrontToS3 extends Construct {
@@ -86,6 +92,6 @@ export class CloudFrontToS3 extends Construct {
 
        [this.cloudFrontWebDistribution, this.cloudFrontFunction, this.cloudFrontLoggingBucket] =
            defaults.CloudFrontDistributionForS3(this, this.s3BucketInterface,
-             props.cloudFrontDistributionProps, props.insertHttpSecurityHeaders);
+             props.cloudFrontDistributionProps, props.insertHttpSecurityHeaders, props.cloudFrontLoggingBucketProps);
      }
 }