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

Add permission to upload ACL in ExtraArgs #318

Merged
merged 11 commits into from
May 7, 2021
Merged

Add permission to upload ACL in ExtraArgs #318

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5343627
Add permission to upload ACL in ExtraArgs
cbcoutinho Apr 6, 2021
a4ec988
Add docs to aws_s3 docstring
cbcoutinho Apr 7, 2021
f00cb89
Update CHANGELOG
cbcoutinho Apr 7, 2021
5d0ac18
Revert "Update CHANGELOG"
cbcoutinho Apr 7, 2021
5ec1939
Add bugfix CHANGELOG fragment
cbcoutinho Apr 7, 2021
7bb20b6
Add pr link to changelog fragment
cbcoutinho Apr 7, 2021
d38de0d
wip: create task for testing bucket ACL upload
cbcoutinho Apr 7, 2021
0824b14
Create s3 bucket during ACL test with policy template
cbcoutinho Apr 8, 2021
522da9b
Integration test fixups
tremble Apr 9, 2021
c9f79db
Make sure bucket isn't completely public
tremble Apr 9, 2021
7fe54a7
Remove versioning from test bucket config
cbcoutinho Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/318-s3-upload-acl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- aws_s3 - Fix upload permission when an S3 bucket ACL policy requires a particular canned ACL
tremble marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 9 additions & 1 deletion plugins/modules/aws_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
- This option lets the user set the canned permissions on the object/bucket that are created.
The permissions that can be set are C(private), C(public-read), C(public-read-write), C(authenticated-read) for a bucket or
C(private), C(public-read), C(public-read-write), C(aws-exec-read), C(authenticated-read), C(bucket-owner-read),
C(bucket-owner-full-control) for an object. Multiple permissions can be specified as a list.
C(bucket-owner-full-control) for an object. Multiple permissions can be specified as a list; although only the first one
will be used during the initial upload of the file
default: ['private']
type: list
elements: str
Expand Down Expand Up @@ -531,6 +532,13 @@ def upload_s3file(module, s3, bucket, obj, expiry, metadata, encrypt, headers, s
else:
extra['Metadata'][option] = metadata[option]

if module.params.get('permission'):
permissions = module.params['permission']
if isinstance(permissions, str):
extra['ACL'] = permissions
elif isinstance(permissions, list):
extra['ACL'] = permissions[0]

if 'ContentType' not in extra:
content_type = None
if src is not None:
Expand Down