Merge pull request #100 from noelmcloughlin/next

fix(queues): apply queue arguments if specified

Author: noelmcloughlin

pillar.example

@@ -27,16 +27,11 @@ rabbitmq:
         - default_vhost
       queues:
         my-queue:
-          ## note : dict format
           user: saltstack_mq
           passwd: password
           durable: 'true'
           auto_delete: 'false'
           vhost: default_vhost
-          arguments:
-            - x-message-ttl: 8640000
-            - x-expires: 8640000
-            - x-dead-letter-exchange: my-exchange
       bindings:
         my-binding:
           source: 'amq.topic'
@@ -113,10 +108,10 @@ rabbitmq:
         my-upstream1:
           component: federation-upstream
           params:
-            'uri': 'amqp://saltstack_mq:password@localhost'
-            'ack-mode': on-confirm
-            'trust-user-id': true
-            'max-hops': 1
+            uri: 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            trust-user-id: true
+            max-hops: 1
           vhost: default_vhost
 
     rabbit2:
@@ -141,16 +136,15 @@ rabbitmq:
         - rabbit2_vhost
       queues:
         my-queue:
-          ## note : dict format
           user: saltstack_mq
           passwd: password
           durable: 'true'
           auto_delete: 'false'
           vhost: rabbit2_vhost
           arguments:
-            - x-message-ttl: 8640000
-            - x-expires: 8640000
-            - x-dead-letter-exchange: my-exchange
+            x-dead-letter-exchange: my-exchange
+            x-expires: 8640000
+            x-queue-type: quorum
       bindings:
         my-binding:
           source: 'amq.topic'
@@ -226,10 +220,10 @@ rabbitmq:
         my-upstream1:
           component: federation-upstream
           params:
-            'uri': 'amqp://saltstack_mq:password@localhost'
-            'ack-mode': on-confirm
-            'trust-user-id': true
-            'max-hops': 1
+            uri: 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            trust-user-id: true
+            max-hops: 1
           vhost: rabbit2_vhost
 
   pkg:

rabbitmq/config/queues/install.sls

@@ -18,7 +18,8 @@ include:
 
 rabbitmq-config-queues-enabled-{{ name }}-{{ queue }}:
   cmd.run:
-    - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }}  # noqa 204
+    - name: >-
+            /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }} arguments='{{ "{}" if "arguments" not in q else q.arguments|json }}'  # noqa 204
     - onlyif:
         - test -x /usr/local/sbin/rabbitmqadmin
         # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management

test/integration/default/files/_mapdata/centos-7.yaml

@@ -64,10 +64,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: default_vhost
       plugins:
       - rabbitmq_management
@@ -94,10 +94,6 @@ values:
           vhost: default_vhost
       queues:
         my-queue:
-          arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
           auto_delete: 'false'
           durable: 'true'
           passwd: password
@@ -174,10 +170,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: rabbit2_vhost
       plugins: []
       policies:
@@ -199,9 +195,9 @@ values:
       queues:
         my-queue:
           arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
+            x-dead-letter-exchange: my-exchange
+            x-expires: 8640000
+            x-queue-type: quorum
           auto_delete: 'false'
           durable: 'true'
           passwd: password

test/integration/default/files/_mapdata/centos-8.yaml

@@ -64,10 +64,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: default_vhost
       plugins:
       - rabbitmq_management
@@ -94,10 +94,6 @@ values:
           vhost: default_vhost
       queues:
         my-queue:
-          arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
           auto_delete: 'false'
           durable: 'true'
           passwd: password
@@ -174,10 +170,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: rabbit2_vhost
       plugins: []
       policies:
@@ -199,9 +195,9 @@ values:
       queues:
         my-queue:
           arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
+            x-dead-letter-exchange: my-exchange
+            x-expires: 8640000
+            x-queue-type: quorum
           auto_delete: 'false'
           durable: 'true'
           passwd: password

test/integration/default/files/_mapdata/debian-10.yaml

@@ -62,10 +62,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: default_vhost
       plugins:
         - rabbitmq_management
@@ -92,10 +92,6 @@ values:
           vhost: default_vhost
       queues:
         my-queue:
-          arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
           auto_delete: 'false'
           durable: 'true'
           passwd: password
@@ -172,10 +168,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: rabbit2_vhost
       plugins: []
       policies:
@@ -197,9 +193,9 @@ values:
       queues:
         my-queue:
           arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
+            x-dead-letter-exchange: my-exchange
+            x-expires: 8640000
+            x-queue-type: quorum
           auto_delete: 'false'
           durable: 'true'
           passwd: password

test/integration/default/files/_mapdata/debian-11.yaml

@@ -60,10 +60,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: default_vhost
       plugins:
         - rabbitmq_management
@@ -90,10 +90,6 @@ values:
           vhost: default_vhost
       queues:
         my-queue:
-          arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
           auto_delete: 'false'
           durable: 'true'
           passwd: password
@@ -170,10 +166,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: rabbit2_vhost
       plugins: []
       policies:
@@ -195,9 +191,9 @@ values:
       queues:
         my-queue:
           arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
+            x-dead-letter-exchange: my-exchange
+            x-expires: 8640000
+            x-queue-type: quorum
           auto_delete: 'false'
           durable: 'true'
           passwd: password

test/integration/default/files/_mapdata/debian-9.yaml

@@ -62,10 +62,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: default_vhost
       plugins:
         - rabbitmq_management
@@ -92,10 +92,6 @@ values:
           vhost: default_vhost
       queues:
         my-queue:
-          arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
           auto_delete: 'false'
           durable: 'true'
           passwd: password
@@ -171,10 +167,10 @@ values:
         my-upstream1:
           component: federation-upstream
           params:
-            'ack-mode': on-confirm
-            'max-hops': 1
-            'trust-user-id': true
-            'uri': 'amqp://saltstack_mq:password@localhost'
+            ack-mode: on-confirm
+            max-hops: 1
+            trust-user-id: true
+            uri: 'amqp://saltstack_mq:password@localhost'
           vhost: rabbit2_vhost
       plugins: []
       policies:
@@ -196,9 +192,9 @@ values:
       queues:
         my-queue:
           arguments:
-          - x-message-ttl: 8640000
-          - x-expires: 8640000
-          - x-dead-letter-exchange: my-exchange
+            x-dead-letter-exchange: my-exchange
+            x-expires: 8640000
+            x-queue-type: quorum
           auto_delete: 'false'
           durable: 'true'
           passwd: password