add support for CloudFront logging to s3 object ownership changes (#464)

dougtoppin · Doug Toppin · web-flow · commit a3892ca2bb8d · 2023-04-17T11:56:22.000-04:00
update xml2js version, add changelog entry
run prettier, update snapshot, update versions
update changelog with s3 change reason

Co-authored-by: Doug Toppin &lt;toppaws@amazon.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.1.2] - 2023-04-14
+
+### Changed
+
+- added s3 bucket ownership control permission and ownership parameter to S3 logging bucket to account for [changes in S3 default behavior](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-faq.html)
+- changed xml2js version to 0.5.0
+
 ## [6.1.1] - 2023-02-09
 
 ### Added
diff --git a/source/constructs/lib/common-resources/custom-resources/custom-resource-construct.ts b/source/constructs/lib/common-resources/custom-resources/custom-resource-construct.ts
@@ -84,6 +84,7 @@ export class CustomResourcesConstruct extends Construct {
                 "s3:GetObject",
                 "s3:PutObject",
                 "s3:ListBucket",
+                "s3:PutBucketOwnershipControls",
               ],
               resources: [
                 Stack.of(this).formatArn({
diff --git a/source/constructs/package-lock.json b/source/constructs/package-lock.json
diff --git a/source/constructs/package.json b/source/constructs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "constructs",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "Serverless Image Handler Constructs",
   "license": "Apache-2.0",
   "bin": {
diff --git a/source/constructs/test/__snapshots__/constructs.test.ts.snap b/source/constructs/test/__snapshots__/constructs.test.ts.snap
@@ -1581,6 +1581,7 @@ exports[`Serverless Image Handler Stack Snapshot 1`] = `
                     "s3:GetObject",
                     "s3:PutObject",
                     "s3:ListBucket",
+                    "s3:PutBucketOwnershipControls",
                   ],
                   "Effect": "Allow",
                   "Resource": {
diff --git a/source/custom-resource/index.ts b/source/custom-resource/index.ts
@@ -618,6 +618,7 @@ async function createCloudFrontLoggingBucket(requestProperties: CreateLoggingBuc
     const createBucketRequestParams: CreateBucketRequest = {
       Bucket: bucketName,
       ACL: "log-delivery-write",
+      ObjectOwnership: "ObjectWriter",
     };
     await s3Client.createBucket(createBucketRequestParams).promise();
 
diff --git a/source/custom-resource/package-lock.json b/source/custom-resource/package-lock.json
diff --git a/source/custom-resource/package.json b/source/custom-resource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "custom-resource",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "private": true,
   "description": "Serverless Image Handler custom resource",
   "license": "Apache-2.0",
diff --git a/source/image-handler/package-lock.json b/source/image-handler/package-lock.json
diff --git a/source/image-handler/package.json b/source/image-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "image-handler",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "private": true,
   "description": "A Lambda function for performing on-demand image edits and manipulations.",
   "license": "Apache-2.0",
diff --git a/source/package.json b/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "source",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "private": true,
   "description": "ESLint and prettier dependencies to be used within the solution",
   "license": "Apache-2.0",
diff --git a/source/solution-utils/package-lock.json b/source/solution-utils/package-lock.json
diff --git a/source/solution-utils/package.json b/source/solution-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solution-utils",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "private": true,
   "description": "Utilities to be used within this solution",
   "license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "constructs",`
`3`		`- "version": "6.1.1",`
	`3`	`+ "version": "6.1.2",`
`4`	`4`	`"description": "Serverless Image Handler Constructs",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"bin": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "custom-resource",`
`3`		`- "version": "6.1.1",`
	`3`	`+ "version": "6.1.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Serverless Image Handler custom resource",`
`6`	`6`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "image-handler",`
`3`		`- "version": "6.1.1",`
	`3`	`+ "version": "6.1.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "A Lambda function for performing on-demand image edits and manipulations.",`
`6`	`6`	`"license": "Apache-2.0",`