From 6d75cb5011caee94880a8816328cca22466e1803 Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Sun, 26 Jun 2022 22:24:25 -0700
Subject: [PATCH] Companion 3 default to no s3 acl (#3826)

* default to no ACL for s3

and remove no longer needed process.env.COMPANION_AWS_DISABLE_ACL

* fix what looks like a bug
---
 src/config/companion.js  | 1 -
 src/server/Uploader.js   | 1 -
 src/standalone/helper.js | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/config/companion.js b/src/config/companion.js
index 64cbf4e793..7515e71e7b 100644
--- a/src/config/companion.js
+++ b/src/config/companion.js
@@ -10,7 +10,6 @@ const defaultOptions = {
   },
   providerOptions: {},
   s3: {
-    acl: 'public-read', // todo default to no ACL in next major
     endpoint: 'https://{service}.{region}.amazonaws.com',
     conditions: [],
     useAccelerateEndpoint: false,
diff --git a/src/server/Uploader.js b/src/server/Uploader.js
index 1d888507c3..f5da1e338c 100644
--- a/src/server/Uploader.js
+++ b/src/server/Uploader.js
@@ -638,7 +638,6 @@ class Uploader {
     const params = {
       Bucket: options.bucket,
       Key: options.getKey(null, filename, this.options.metadata),
-      ACL: options.acl,
       ContentType: this.options.metadata.type,
       Metadata: this.options.metadata,
       Body: stream,
diff --git a/src/standalone/helper.js b/src/standalone/helper.js
index 20f0748f9e..05ff2c3ea3 100644
--- a/src/standalone/helper.js
+++ b/src/standalone/helper.js
@@ -78,7 +78,7 @@ const getConfigFromEnv = () => {
       useAccelerateEndpoint:
       process.env.COMPANION_AWS_USE_ACCELERATE_ENDPOINT === 'true',
       expires: parseInt(process.env.COMPANION_AWS_EXPIRES || '300', 10),
-      acl: process.env.COMPANION_AWS_DISABLE_ACL === 'true' ? null : (process.env.COMPANION_AWS_ACL || 'public-read'), // todo default to no ACL in next major and remove COMPANION_AWS_DISABLE_ACL
+      acl: process.env.COMPANION_AWS_ACL,
     },
     server: {
       host: process.env.COMPANION_DOMAIN,