diff options
author | Benno Joy <bennojoy@gmail.com> | 2015-09-01 09:15:15 +0530 |
---|---|---|
committer | Benno Joy <bennojoy@gmail.com> | 2015-09-01 09:15:15 +0530 |
commit | b5db2743622583d0f9f1ea91d8a0e5b8c18e3448 (patch) | |
tree | 1af2b4affe54d021fc59e7be85d2b00b25af376f | |
parent | 0bff493fae732f4e9fab9a9211a7fc37f3ab86e8 (diff) | |
parent | 8215aad3b3345be74d1a4f9dc90bc8019d48fb81 (diff) | |
download | ansible-modules-core-b5db2743622583d0f9f1ea91d8a0e5b8c18e3448.tar.gz |
Merge pull request #1940 from jcowley/s3-permissions
Add support for S3 canned permissions. resolves #1939
-rw-r--r-- | cloud/amazon/s3.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cloud/amazon/s3.py b/cloud/amazon/s3.py index e98308bb..e82f20d9 100644 --- a/cloud/amazon/s3.py +++ b/cloud/amazon/s3.py @@ -93,6 +93,12 @@ options: - Keyname of the object inside the bucket. Can be used to create "virtual directories", see examples. required: false default: null + permission: + description: + - This option let's the user set the canned permissions on the object/bucket that are created. The permissions that can be set are 'private', 'public-read', 'public-read-write', 'authenticated-read'. + required: false + default: private + version_added: "2.0" prefix: description: - Limits the response to keys that begin with the specified prefix for list mode @@ -167,7 +173,7 @@ EXAMPLES = ''' - s3: bucket=mybucket mode=list prefix=/my/desired/ marker=/my/desired/0023.txt max_keys=472 # Create an empty bucket -- s3: bucket=mybucket mode=create +- s3: bucket=mybucket mode=create permission=public-read # Create a bucket with key as directory, in the EU region - s3: bucket=mybucket object=/my/directory/path mode=create region=eu-west-1 @@ -236,6 +242,7 @@ def create_bucket(module, s3, bucket, location=None): location = Location.DEFAULT try: bucket = s3.create_bucket(bucket, location=location) + bucket.set_acl(module.params.get('permission')) except s3.provider.storage_response_error, e: module.fail_json(msg= str(e)) if bucket: @@ -297,6 +304,7 @@ def upload_s3file(module, s3, bucket, obj, src, expiry, metadata, encrypt, heade key.set_metadata(meta_key, metadata[meta_key]) key.set_contents_from_filename(src, encrypt_key=encrypt, headers=headers) + key.set_acl(module.params.get('permission')) url = key.generate_url(expiry) module.exit_json(msg="PUT operation complete", url=url, changed=True) except s3.provider.storage_copy_error, e: @@ -369,6 +377,7 @@ def main(): metadata = dict(type='dict'), mode = dict(choices=['get', 'put', 'delete', 'create', 'geturl', 'getstr', 'delobj', 'list'], required=True), object = dict(), + permission = dict(choices=['private', 'public-read', 'public-read-write', 'authenticated-read'], default='private'), version = dict(default=None), overwrite = dict(aliases=['force'], default='always'), prefix = dict(default=None), |