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
transloadit · Jun 27, 2022 · 2f46fd1 · 2f46fd1
1 parent 45e6650
commit 2f46fd1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/packages/@uppy/companion/src/config/companion.js b/packages/@uppy/companion/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/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/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/packages/@uppy/companion/src/standalone/helper.js b/packages/@uppy/companion/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,

diff --git a/website/src/docs/companion.md b/website/src/docs/companion.md
@@ -263,7 +263,7 @@ export COMPANION_AWS_USE_ACCELERATE_ENDPOINT="false"
 # to set X-Amz-Expires query param in presigned urls (in seconds, default: 300)
 export COMPANION_AWS_EXPIRES="300"
 # to set a canned ACL for uploaded objects: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl
-export COMPANION_AWS_ACL="public-read"
+export COMPANION_AWS_ACL="private"
 
 # corresponds to the server.oauthDomain option
 export COMPANION_OAUTH_DOMAIN="sub.domain.com"
@@ -333,7 +333,7 @@ const options = {
     region: 'us-east-1',
     useAccelerateEndpoint: false, // default: false,
     expires: 3600, // default: 300 (5 minutes)
-    acl: 'private', // default: public-read
+    acl: 'private', // default: none
   },
   server: {
     host: 'localhost:3020', // or yourdomain.com