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

changed if logic Type to boolean (#49628)

Browse source 
* changed Type to boolean

* fix after review

* created fragment
This commit is contained in:
Aleksander Kovtunenko 2018-12-17 23:21:36 +02:00 committed by Sam Doran
parent 0ccd231afd
commit ba562043e1
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/49676-s3bucket-requester_pays_change_if_condition.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- replaced if condition requester_pays is None with True or False instead

6
lib/ansible/modules/cloud/amazon/s3_bucket.py
View file

@ -58,7 +58,7 @@ options:
- With Requester Pays buckets, the requester instead of the bucket owner pays the cost - With Requester Pays buckets, the requester instead of the bucket owner pays the cost
of the request and the data download from the bucket. of the request and the data download from the bucket.
type: bool type: bool
default: 'no' default: False
state: state:
description: description:
- Create or remove the s3 bucket - Create or remove the s3 bucket
@ -197,7 +197,7 @@ def create_or_update_bucket(s3_client, module, location):
if exp.response['Error']['Code'] != 'NotImplemented' or requester_pays is not None: if exp.response['Error']['Code'] != 'NotImplemented' or requester_pays is not None:
module.fail_json_aws(exp, msg="Failed to get bucket request payment") module.fail_json_aws(exp, msg="Failed to get bucket request payment")
else: else:
if requester_pays is not None: if requester_pays:
payer = 'Requester' if requester_pays else 'BucketOwner' payer = 'Requester' if requester_pays else 'BucketOwner'
if requester_pays_status != payer: if requester_pays_status != payer:
put_bucket_request_payment(s3_client, name, payer) put_bucket_request_payment(s3_client, name, payer)
@ -545,7 +545,7 @@ def main():
force=dict(required=False, default='no', type='bool'), force=dict(required=False, default='no', type='bool'),
policy=dict(required=False, default=None, type='json'), policy=dict(required=False, default=None, type='json'),
name=dict(required=True, type='str'), name=dict(required=True, type='str'),
requester_pays=dict(default='no', type='bool'), requester_pays=dict(default=False, type='bool'),
s3_url=dict(aliases=['S3_URL'], type='str'), s3_url=dict(aliases=['S3_URL'], type='str'),
state=dict(default='present', type='str', choices=['present', 'absent']), state=dict(default='present', type='str', choices=['present', 'absent']),
tags=dict(required=False, default=None, type='dict'), tags=dict(required=False, default=None, type='dict'),