fix(exchanges): accept arguments if supplied

saltstack-formulas · Aug 1, 2021 · 6df27a6 · 6df27a6
1 parent 52eacec
commit 6df27a6
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 57 deletions.
diff --git a/pillar.example b/pillar.example
@@ -51,8 +51,8 @@ rabbitmq:
           auto_delete: 'false'
           vhost: default_vhost
           arguments:
-            - 'alternate-**exchange': 'amq.fanout'
-            - 'test-header': 'testing'
+            alternate-**exchange: 'amq.fanout'
+            test-header: 'testing'
       remove_guest_user: true
       users:
         user1:
@@ -164,8 +164,8 @@ rabbitmq:
           auto_delete: 'false'
           vhost: rabbit2_vhost
           arguments:
-            - 'alternate-**exchange': 'amq.fanout'
-            - 'test-header': 'testing'
+            alternate-**exchange: 'amq.fanout'
+            test-header: 'testing'
       remove_guest_user: true
       users:
         user1:

diff --git a/rabbitmq/config/exchanges/install.sls b/rabbitmq/config/exchanges/install.sls
@@ -18,7 +18,8 @@ include:
 
 rabbitmq-config-exchanges-enabled-{{ name }}-{{ exchange }}:
   cmd.run:
-    - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare exchange --vhost={{ ex.vhost }} --username={{ ex.user }} --password={{ ex.passwd }} name={{ exchange }} type={{ ex.type }} durable={{ ex.durable }} internal={{ ex.internal }} auto_delete={{ ex.auto_delete }}  # noqa 204
+    - name: >-
+            /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare exchange --vhost={{ ex.vhost }} --username={{ ex.user }} --password={{ ex.passwd }} name={{ exchange }} type={{ ex.type }} durable={{ ex.durable }} internal={{ ex.internal }} auto_delete={{ ex.auto_delete }} arguments='{{ "{}" if "arguments" not in ex else ex.arguments|json }}'  # noqa 204
     - onlyif:
         - test -x /usr/local/sbin/rabbitmqadmin
         - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management

diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -50,8 +50,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -155,8 +155,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -50,8 +50,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -155,8 +155,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -46,8 +46,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -151,8 +151,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -50,8 +50,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -155,8 +155,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -50,8 +50,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -155,8 +155,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -50,8 +50,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -155,8 +155,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -48,8 +48,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'
@@ -153,8 +153,8 @@ values:
       exchanges:
         my-exchange:
           arguments:
-          - alternate-**exchange: amq.fanout
-          - test-header: testing
+            alternate-**exchange: amq.fanout
+            test-header: testing
           auto_delete: 'false'
           durable: 'true'
           internal: 'false'