From 0c038b21f1e86d886e457aaa4420b12941227af7 Mon Sep 17 00:00:00 2001 From: Simon Kok Date: Fri, 8 Dec 2023 11:26:08 +0100 Subject: [PATCH] Move from ACL enforced bucket ownership to Ownership Controls + megalinter prettier fix (#666) * Remove ACLs to enforce bucket ownership, use OwnershipControls instead * Fix MegaLinter JSON Prettier command --- .mega-linter.yml | 4 +--- .prettierrc.js | 4 ++-- .../adf-bootstrap/deployment/global.yml | 1 - .../adf-bootstrap/deployment/pipeline_management.yml | 8 ++++++-- src/template.yml | 12 +++++++++--- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.mega-linter.yml b/.mega-linter.yml index ad7deaf9c..c89e80a57 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -30,9 +30,7 @@ FILEIO_REPORTER: false # Install plugin for list handling. JSON_PRETTIER_PRE_COMMANDS: - - command: | - npm install -g prettier-plugin-multiline-arrays@1.1.4 - npm install --prefix /node-deps/ prettier-plugin-multiline-arrays@1.1.4 + - command: "npm install prettier-plugin-multiline-arrays@3.0.0" cwd: "workspace" CLOUDFORMATION_CFN_LINT_CONFIG_FILE: '.cfnlintrc' diff --git a/.prettierrc.js b/.prettierrc.js index 15479ccf8..96a083aef 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -4,5 +4,5 @@ module.exports = { ], trailingComma: 'es5', semi: false, - singleQuote: true -} + singleQuote: true, +}; diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/global.yml b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/global.yml index d4efbe8eb..9264881bd 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/global.yml +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/global.yml @@ -165,7 +165,6 @@ Resources: DeletionPolicy: Retain UpdateReplacePolicy: Retain Properties: - AccessControl: BucketOwnerFullControl OwnershipControls: Rules: - ObjectOwnership: BucketOwnerEnforced diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/pipeline_management.yml b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/pipeline_management.yml index 0c710645b..6bcae811b 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/pipeline_management.yml +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/pipeline_management.yml @@ -1048,7 +1048,9 @@ Resources: DeletionPolicy: Retain UpdateReplacePolicy: Retain Properties: - AccessControl: BucketOwnerFullControl + OwnershipControls: + Rules: + - ObjectOwnership: BucketOwnerEnforced BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: @@ -1073,7 +1075,9 @@ Resources: DeletionPolicy: Retain UpdateReplacePolicy: Retain Properties: - AccessControl: BucketOwnerFullControl + OwnershipControls: + Rules: + - ObjectOwnership: BucketOwnerEnforced BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: diff --git a/src/template.yml b/src/template.yml index 322f14b45..5f1a9e76d 100644 --- a/src/template.yml +++ b/src/template.yml @@ -151,7 +151,9 @@ Resources: UpdateReplacePolicy: Retain Type: AWS::S3::Bucket Properties: - AccessControl: BucketOwnerFullControl + OwnershipControls: + Rules: + - ObjectOwnership: BucketOwnerEnforced BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: @@ -169,7 +171,9 @@ Resources: DeletionPolicy: Retain UpdateReplacePolicy: Retain Properties: - AccessControl: BucketOwnerFullControl + OwnershipControls: + Rules: + - ObjectOwnership: BucketOwnerEnforced BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: @@ -684,7 +688,9 @@ Resources: DeletionPolicy: Retain UpdateReplacePolicy: Retain Properties: - AccessControl: BucketOwnerFullControl + OwnershipControls: + Rules: + - ObjectOwnership: BucketOwnerEnforced BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: