fix: mq_broker creation with tags; closes ansible-collections#1832

Signed-off-by: Ali AlKhalidi <[email protected]>
alialkhalidi · Sep 7, 2023 · 17b90af · 17b90af
1 parent 3a801c0
commit 17b90af
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/changelogs/fragments/1832-mq_broker_tags.yml b/changelogs/fragments/1832-mq_broker_tags.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - mq_broker - ensure broker is created with ``tags`` when passed (https://github.com/ansible-collections/community.aws/issues/1832).
diff --git a/plugins/modules/mq_broker.py b/plugins/modules/mq_broker.py
@@ -237,6 +237,7 @@
     "storage_type": "StorageType",
     "subnet_ids": "SubnetIds",
     "users": "Users",
+    "tags": "Tags",
 }
 
 

diff --git a/tests/integration/targets/mq/defaults/main.yml b/tests/integration/targets/mq/defaults/main.yml
@@ -5,3 +5,5 @@ vpc_name: "{{ resource_prefix }}-vpc"
 vpc_cidr: "10.0.0.0/16"
 subnet_cidr: "10.0.1.0/24"
 sg_name: "{{resource_prefix}}-sg"
+tags:
+  workload_type: other
diff --git a/tests/integration/targets/mq/tasks/broker_tests.yml b/tests/integration/targets/mq/tasks/broker_tests.yml
@@ -3,6 +3,7 @@
     broker_name: "{{ broker_name }}"
     security_groups: "{{ broker_sg_ids.split(',') }}"
     subnet_ids: "{{ broker_subnet_ids.split(',') }}"
+    tags: "{{ tags }}"
   register: result
 - set_fact:
     broker_id: "{{ result.broker['broker_id'] }}"
@@ -20,6 +21,7 @@
       - result_c1.broker['broker_name'] == broker_name
       - result_c1.broker['broker_state'] == 'CREATION_IN_PROGRESS'
       - ( result_c1.broker['storage_type'] | upper ) == 'EFS'
+      - result_c1.broker['tags'] == tags
   when: not ansible_check_mode
 - debug:
     msg: "Wait until broker {{ broker_name }} ({{ broker_id }}) enters running state. This may take several minutes"

diff --git a/tests/integration/targets/mq/tasks/main.yml b/tests/integration/targets/mq/tasks/main.yml
@@ -32,4 +32,4 @@
     - name: cleanup broker
       include_tasks: broker_cleanup.yml
 
-    - include_tasks: env_cleanup.yml
+    - include_tasks: env_cleanup.yml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- mq_broker - ensure broker is created with ``tags`` when passed (https://github.com/ansible-collections/community.aws/issues/1832).