Insert explicitly empty originAccessIdentity to remove CFN role requi…

…rement (#1053)
awslabs · Jan 23, 2024 · 287dabe · 287dabe
1 parent a54a318
commit 287dabe
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 11 deletions.
diff --git a/...nt-s3/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json b/...nt-s3/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.expected.json
@@ -580,7 +580,9 @@
  "Id"
  ]
  },
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...st/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json b/...st/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.expected.json
@@ -538,7 +538,9 @@
  "Id"
  ]
  },
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...s-constructs/aws-cloudfront-s3/test/integ.cfts3-cmk-provided-as-bucket-prop.expected.json b/...s-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/...@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json b/...@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json
@@ -849,7 +849,9 @@
  "Id"
  ]
  },
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...s-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json b/...s-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json
@@ -818,7 +818,9 @@
  ]
  },
  "OriginPath": "/testPath",
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json b/...constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json
@@ -568,7 +568,9 @@
  "Id"
  ]
  },
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...olutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBuckets.expected.json b/...olutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBuckets.expected.json
@@ -855,7 +855,9 @@
  "Id"
  ]
  },
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.expected.json b/...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/...s/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json b/...s/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json
@@ -827,7 +827,9 @@
  "Id"
  ]
  },
- "S3OriginConfig": {}
+ "S3OriginConfig": {
+ "OriginAccessIdentity": ""
+ }
  }
  ]
  }

diff --git a/...solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.expected.json b/...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
@@ -83,6 +83,6 @@ class S3OacBucketOrigin extends cloudfront.OriginBase {
  }
 
  protected renderS3OriginConfig(): cloudfront.CfnDistribution.S3OriginConfigProperty | undefined {
- return { };
+ return { originAccessIdentity: '' };
  }
 }