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

aws_kms tags fix (#53088)

Browse source 
* Fix TagName and TagValue in aws_kms

Fixes #53061

* Improve test suite to check for tags

Also fixed some obvious failures, need to run the test suite from time
to time!
This commit is contained in:
Will Thames 2019-03-01 04:54:18 +10:00 committed by Sloane Hertel
parent 5d8f307116
commit 91eee48f1b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/cloud/amazon/aws_kms.py
View file

@ -666,7 +666,7 @@ def update_key(connection, module, key):
def create_key(connection, module): def create_key(connection, module):
params = dict(BypassPolicyLockoutSafetyCheck=False, params = dict(BypassPolicyLockoutSafetyCheck=False,
Tags=ansible_dict_to_boto3_tag_list(module.params['tags']), Tags=ansible_dict_to_boto3_tag_list(module.params['tags'], tag_name_key_name='TagKey', tag_value_key_name='TagValue'),
KeyUsage='ENCRYPT_DECRYPT', KeyUsage='ENCRYPT_DECRYPT',
Origin='AWS_KMS') Origin='AWS_KMS')
if module.params.get('description'): if module.params.get('description'):

7
test/integration/targets/aws_kms/tasks/main.yml
View file

@ -17,6 +17,8 @@
aws_secret_key: "{{ aws_secret_key }}" aws_secret_key: "{{ aws_secret_key }}"
security_token: "{{ security_token }}" security_token: "{{ security_token }}"
alias: "{{ resource_prefix }}-kms" alias: "{{ resource_prefix }}-kms"
tags:
Hello: World
state: present state: present
enabled: yes enabled: yes
register: create_kms register: create_kms
@ -25,6 +27,7 @@
assert: assert:
that: that:
- create_kms.key_state == "Enabled" - create_kms.key_state == "Enabled"
- create_kms.tags['Hello'] == 'World'
- name: find facts about the key - name: find facts about the key
aws_kms_facts: aws_kms_facts:
@ -92,8 +95,6 @@
alias: "{{ resource_prefix }}-kms" alias: "{{ resource_prefix }}-kms"
register: new_key register: new_key
- fail:
- name: set aws environment base fact - name: set aws environment base fact
set_fact: set_fact:
aws_environment_base: aws_environment_base:
@ -146,7 +147,7 @@
- grant_one.grants|length == 1 - grant_one.grants|length == 1
- name: Add a second grant - name: Add a second grant
kms: aws_kms:
region: "{{ aws_region }}" region: "{{ aws_region }}"
aws_access_key: "{{ aws_access_key }}" aws_access_key: "{{ aws_access_key }}"
aws_secret_key: "{{ aws_secret_key }}" aws_secret_key: "{{ aws_secret_key }}"