cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[s3_sync] Add cache_control option (#27388)

Browse source
This commit is contained in:
Jérôme Guilbot 2017-08-04 12:35:08 -04:00 committed by Ryan Brown
parent 0f60041dea
commit e29daf34f7
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/cloud/amazon/s3_sync.py
View file

@ -25,7 +25,7 @@ module: s3_sync
short_description: Efficiently upload multiple files to S3 short_description: Efficiently upload multiple files to S3
description: description:
- The S3 module is great, but it is very slow for a large volume of files- even a dozen will be noticeable. In addition to speed, it handles globbing, - The S3 module is great, but it is very slow for a large volume of files- even a dozen will be noticeable. In addition to speed, it handles globbing,
inclusions/exclusions, mime types, expiration mapping, recursion, and smart directory mapping. inclusions/exclusions, mime types, expiration mapping, recursion, cache control and smart directory mapping.
version_added: "2.3" version_added: "2.3"
options: options:
mode: mode:
@ -82,6 +82,13 @@ options:
- For multiple patterns, comma-separate them. - For multiple patterns, comma-separate them.
required: false required: false
default: ".*" default: ".*"
cache_control:
description:
- This is a string.
- Cache-Control header set on uploaded objects.
- Directives are separated by commmas.
required: false
version_added: "2.4"
author: tedder author: tedder
extends_documentation_fragment: extends_documentation_fragment:
@ -105,6 +112,7 @@ EXAMPLES = '''
key_prefix: config_files/web key_prefix: config_files/web
file_change_strategy: force file_change_strategy: force
permission: public-read permission: public-read
cache_control: "public, max-age=31536000"
include: "*" include: "*"
exclude: "*.txt,.*" exclude: "*.txt,.*"
''' '''
@ -444,6 +452,8 @@ def upload_files(s3, bucket, filelist, params):
} }
if params.get('permission'): if params.get('permission'):
args['ACL'] = params['permission'] args['ACL'] = params['permission']
if params.get('cache_control'):
args['CacheControl'] = params['cache_control']
# if this fails exception is caught in main() # if this fails exception is caught in main()
s3.upload_file(entry['fullpath'], bucket, entry['s3_path'], ExtraArgs=args, Callback=None, Config=None) s3.upload_file(entry['fullpath'], bucket, entry['s3_path'], ExtraArgs=args, Callback=None, Config=None)
ret.append(entry) ret.append(entry)
@ -464,7 +474,8 @@ def main():
mime_map=dict(required=False, type='dict'), mime_map=dict(required=False, type='dict'),
exclude=dict(required=False, default=".*"), exclude=dict(required=False, default=".*"),
include=dict(required=False, default="*"), include=dict(required=False, default="*"),
# future options: cache_control (string or map, perhaps), encoding, metadata, storage_class, retries cache_control=dict(required=False, default=''),
# future options: encoding, metadata, storage_class, retries
) )
) )