Merge pull request #46 from aws-solutions/feature/v2.6.2

Update to version v2.6.2

Author: groverlalit

CHANGELOG.md

@@ -4,6 +4,11 @@
  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).
 
+## [2.6.2] - 2023-04
+ ### Fixed
+ - Changed the Object Ownership for logging bucket from 'Object writer' to 'Bucket owner enforced' to mitigate the impact caused by new S3 default settings.
+ - Updated S3 bucket policy to support access logging.
+ 
 ## [2.6.1] - 2023-04
  ### Added
  - Added support to block customer misconfiguration for 'Terminate Unused Workspaces' feature. The feature will terminate workspaces only on the last day of the month to avoid accidental termination due to misconfiguration.

source/cdk.json

@@ -3,7 +3,8 @@
     "context": {
         "solution_id": "SO0018",
         "solution_name": "cost-optimizer-for-amazon-workspaces",
-        "solution_version": "%%VERSION%%"
+        "solution_version": "%%VERSION%%",
+        "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true
     },
     "versionReporting": false
 }

source/lib/components/usage-report-bucket-resources.ts

@@ -3,7 +3,7 @@
 
 import {Construct} from "constructs";
 import * as cdk from "aws-cdk-lib";
-import { Bucket, BlockPublicAccess, BucketEncryption, BucketAccessControl, BucketPolicy } from "aws-cdk-lib/aws-s3";
+import { Bucket, BlockPublicAccess, BucketEncryption, BucketPolicy } from "aws-cdk-lib/aws-s3";
 import overrideLogicalId from "../cdk-helper/override-logical-id";
 import { addCfnNagSuppression } from "../cdk-helper/add-cfn-nag-suppression";
 
@@ -18,7 +18,6 @@ export class UsageReportBucketResources extends Construct {
             blockPublicAccess: BlockPublicAccess.BLOCK_ALL,
             encryption: BucketEncryption.S3_MANAGED,
             removalPolicy: cdk.RemovalPolicy.RETAIN,
-            accessControl: BucketAccessControl.LOG_DELIVERY_WRITE,
             enforceSSL: true
         })
         overrideLogicalId(accessLoggingBucket, 'LogsBucket')