Merge pull request #847 from magicmemories/feature/delivery-limit-policy

Allow delivery-limit policy to be set

Author: wyardley

lib/puppet/type/rabbitmq_policy.rb

@@ -128,12 +128,18 @@ def validate_definition(definition)
         raise ArgumentError, "Invalid shards-per-node value '#{shards_per_node_val}'"
       end
     end
-    if definition.key? 'ha-sync-batch-size' # rubocop:disable Style/GuardClause
+    if definition.key? 'ha-sync-batch-size'
       ha_sync_batch_size_val = definition['ha-sync-batch-size']
       unless ha_sync_batch_size_val.to_i.to_s == ha_sync_batch_size_val
         raise ArgumentError, "Invalid ha-sync-batch-size value '#{ha_sync_batch_size_val}'"
       end
     end
+    if definition.key? 'delivery-limit' # rubocop:disable Style/GuardClause
+      delivery_limit_val = definition['delivery-limit']
+      unless delivery_limit_val.to_i.to_s == delivery_limit_val
+        raise ArgumentError, "Invalid delivery-limit value '#{delivery_limit_val}'"
+      end
+    end
   end
 
   def munge_definition(definition)
@@ -158,6 +164,9 @@ def munge_definition(definition)
     if definition.key? 'ha-sync-batch-size'
       definition['ha-sync-batch-size'] = definition['ha-sync-batch-size'].to_i
     end
+    if definition.key? 'delivery-limit'
+      definition['delivery-limit'] = definition['delivery-limit'].to_i
+    end
     definition
   end
 end

spec/unit/puppet/type/rabbitmq_policy_spec.rb

@@ -180,6 +180,19 @@
     end.to raise_error(Puppet::Error, %r{Invalid ha-sync-batch-size value.*future})
   end
 
+  it 'accepts and converts the delivery-limit value' do
+    definition = { 'delivery-limit' => '3' }
+    policy[:definition] = definition
+    expect(policy[:definition]['delivery-limit']).to eq(3)
+  end
+
+  it 'does not accept non-numeric delivery-limit value' do
+    definition = { 'delivery-limit' => 'future' }
+    expect do
+      policy[:definition] = definition
+    end.to raise_error(Puppet::Error, %r{Invalid delivery-limit value.*future})
+  end
+
   context 'accepts list value in ha-params when ha-mode = nodes' do
     before do
       policy[:definition] = definition