Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Companion 3 default to no s3 acl #3826

Merged
merged 2 commits into from Jun 27, 2022
Merged

Companion 3 default to no s3 acl #3826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c82a49
default to no ACL for s3
mifi Jun 15, 2022
39d3771
fix what looks like a bug
mifi Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/@uppy/companion/src/config/companion.js
View file
Open in desktop
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion packages/@uppy/companion/src/server/Uploader.js
View file
Open in desktop
Expand Up @@ -647,7 +647,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,
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/standalone/helper.js
View file
Open in desktop
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions website/src/docs/companion.md
View file
Open in desktop
Expand Up @@ -262,7 +262,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"
Expand Down Expand Up @@ -332,7 +332,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
Expand Down