diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json index b1b9a934c..fad7dfc3f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json @@ -580,7 +580,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json index 4006ac631..f4b367cb5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json @@ -538,7 +538,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-cmk-provided-as-bucket-prop.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-cmk-provided-as-bucket-prop.expected.json index 3e1959e94..645fe55b7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-cmk-provided-as-bucket-prop.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-cmk-provided-as-bucket-prop.expected.json @@ -580,7 +580,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json index 89d7ec9ce..8288d263c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json @@ -849,7 +849,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json index 493da6600..b1785fc58 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json @@ -818,7 +818,9 @@ ] }, "OriginPath": "/testPath", - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json index 27ac41fde..635cb5d68 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json @@ -568,7 +568,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBuckets.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBuckets.expected.json index 2c9f327e8..b662efbfe 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBuckets.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBuckets.expected.json @@ -855,7 +855,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.expected.json index 5286672a9..128ec6b9d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.expected.json @@ -904,7 +904,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } }, { "DomainName": { diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json index c5944c813..350904084 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json @@ -827,7 +827,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.expected.json index b6829049b..9be450936 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.expected.json @@ -794,7 +794,9 @@ "Id" ] }, - "S3OriginConfig": {} + "S3OriginConfig": { + "OriginAccessIdentity": "" + } } ] } diff --git a/source/patterns/@aws-solutions-constructs/core/lib/s3-oac-origin.ts b/source/patterns/@aws-solutions-constructs/core/lib/s3-oac-origin.ts index c75a78767..372deb0fd 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/s3-oac-origin.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/s3-oac-origin.ts @@ -83,6 +83,6 @@ class S3OacBucketOrigin extends cloudfront.OriginBase { } protected renderS3OriginConfig(): cloudfront.CfnDistribution.S3OriginConfigProperty | undefined { - return { }; + return { originAccessIdentity: '' }; } }