Companion 3 default to no s3 acl (transloadit#3826)

* default to no ACL for s3 and remove no longer needed process.env.COMPANION_AWS_DISABLE_ACL * fix what looks like a bug
docsend · Jun 27, 2022 · 6d75cb5 · 6d75cb5
1 parent 4f69af2
commit 6d75cb5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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,