add KmsMasterKeyId as attribute option for boto3 call

changelogs/fragments/762-fix-kmsmasterkeyid-attr.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- sqs_queue - Providing a kms_master_key_id will now enable SSE properly (https://github.com/ansible-collections/community.aws/pull/762)

plugins/modules/sqs_queue.py

@@ -290,6 +290,7 @@ def describe_queue(client, queue_url):
 
 def create_or_update_sqs_queue(client, module):
     is_fifo = (module.params.get('queue_type') == 'fifo')
+    kms_master_key_id = module.params.get('kms_master_key_id')
     queue_name = get_queue_name(module, is_fifo)
     result = dict(
         name=queue_name,
@@ -300,8 +301,14 @@ def create_or_update_sqs_queue(client, module):
     queue_url = get_queue_url(client, queue_name)
     result['queue_url'] = queue_url
 
+    # Create a dict() to hold attributes that will be passed to boto3
+    create_attributes = {}
+
     if not queue_url:
-        create_attributes = {'FifoQueue': 'true'} if is_fifo else {}
+        if is_fifo:
+            create_attributes['FifoQueue'] = "True"
+        if kms_master_key_id:
+            create_attributes['KmsMasterKeyId'] = kms_master_key_id
         result['changed'] = True
         if module.check_mode:
             return result
@@ -385,7 +392,7 @@ def update_sqs_queue(module, client, queue_url):
     if changed and not check_mode:
         client.set_queue_attributes(QueueUrl=queue_url, Attributes=attributes_to_set, aws_retry=True)
 
-    return changed, existing_attributes.get('queue_arn'),
+    return changed, existing_attributes.get('queue_arn')
 
 
 def delete_sqs_queue(client, module):

tests/integration/targets/sqs_queue/tasks/main.yml

@@ -1,22 +1,26 @@
 ---
 - name: Main test block
+
   module_defaults:
     group/aws:
       aws_access_key: "{{ aws_access_key }}"
       aws_secret_key: "{{ aws_secret_key }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
+
   block:
   - block:
     - name: Test creating SQS queue
       sqs_queue:
         name: "{{ resource_prefix }}{{ 1000 | random }}"
       register: create_result
+
     - name: Assert SQS queue created
       assert:
         that:
           - create_result.changed
           - create_result.region == "{{ aws_region }}"
+
     always:
     - name: Test deleting SQS queue
       sqs_queue:
@@ -26,26 +30,32 @@
       retries: 3
       delay: 3
       until: delete_result.changed
+
     - name: Assert SQS queue deleted
       assert:
         that:
           - delete_result.changed
+
     - name: Test delete SQS queue that doesn't exist
       sqs_queue:
         name: "{{ resource_prefix }}{{ 1000 | random }}"
         state: absent
       register: delete_result
+
     - name: Assert delete non-existant queue returns cleanly
       assert:
         that:
           - delete_result.changed == False
+
   - name: Test queue features
     block:
       - name: Test create queue with attributes
         sqs_queue:
           name: "{{ resource_prefix }}{{ 1000 | random }}"
           default_visibility_timeout: 900
           delivery_delay: 900
+          # Test SSE
+          kms_master_key_id: alias/aws/sqs
           maximum_message_size: 9009
           message_retention_period: 900
           receive_message_wait_time: 10
@@ -55,18 +65,21 @@
               Effect: Allow
               Action: "*"
         register: create_result
+
       - name: Assert queue created with configuration
         assert:
           that:
             - create_result.changed
             - create_result.default_visibility_timeout == 900
             - create_result.delivery_delay == 900
+            - create_result.kms_master_key_id == "alias/aws/sqs"
             - create_result.maximum_message_size == 9009
             - create_result.message_retention_period == 900
             - create_result.receive_message_wait_time == 10
             - create_result.policy.Version == "2012-10-17"
             - create_result.policy.Statement[0].Effect == "Allow"
             - create_result.policy.Statement[0].Action == "*"
+
       - name: Test idempotentcy
         sqs_queue:
           name: "{{ create_result.name }}"
@@ -80,11 +93,14 @@
             Statement:
               Effect: Allow
               Action: "*"
+          kms_master_key_id: alias/aws/sqs
         register: create_result
+
       - name: Assert nothing changed
         assert:
           that:
             - not create_result.changed
+
       - name: Test update
         sqs_queue:
           name: "{{ create_result.name }}"
@@ -99,12 +115,14 @@
               Effect: Allow
               Action: "*"
         register: create_result
+
       - name: Assert queue updated with configuration
         assert:
           that:
             - create_result.changed
             - create_result.default_visibility_timeout == 899
             - create_result.delivery_delay == 899
+            - create_result.kms_master_key_id == "alias/aws/sqs"
             - create_result.maximum_message_size == 9008
             - create_result.message_retention_period == 899
             - create_result.receive_message_wait_time == 9
@@ -120,19 +138,22 @@
         retries: 3
         delay: 3
         until: delete_result.changed
+
   - name: Test queue with redrive
     block:
       - name: Creating dead letter queue
         sqs_queue:
           name: "{{ resource_prefix }}{{ 1000 | random }}"
         register: dead_letter_queue
+
       - name: Test create queue with redrive_policy
         sqs_queue:
           name: "{{ resource_prefix }}{{ 1000 | random }}"
           redrive_policy:
             maxReceiveCount: 5
             deadLetterTargetArn: "{{ dead_letter_queue.queue_arn }}"
         register: create_result
+
       - name: Assert queue created with configuration
         assert:
           that:
@@ -148,6 +169,7 @@
         with_items:
           - { name: "{{ create_result.name }}" }
           - { name: "{{ dead_letter_queue.name }}" }
+
   - name: Test FIFO queue
     block:
       - name: Creating FIFO queue
@@ -156,10 +178,12 @@
           queue_type: fifo
           content_based_deduplication: yes
         register: create_result
+
       - name: Assert queue created with configuration
         assert:
           that:
             - create_result.changed
+
     always:
       - name: Cleaning up queue
         sqs_queue: