Update 3rdparty rabbitmq module

[mirror/dsa-puppet.git] / 3rdparty / modules / rabbitmq / lib / puppet / provider / rabbitmq_policy / rabbitmqctl.rb

diff --git a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
index 7e73295..1d112e9 100644 (file)
--- a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
@@ -2,37 +2,54 @@ require 'json'
 require 'puppet/util/package'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmqctl'))
-Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Provider::Rabbitmqctl) do
-
-  defaultfor :feature => :posix
+Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, parent: Puppet::Provider::Rabbitmqctl) do
+  confine feature: :posix
 
   # cache policies
-  def self.policies(name, vhost)
+  def self.policies(vhost, name)
     @policies = {} unless @policies
     unless @policies[vhost]
       @policies[vhost] = {}
-      self.run_with_retries {
+      policy_list = run_with_retries do
         rabbitmqctl('list_policies', '-q', '-p', vhost)
-      }.split(/\n/).each do |line|
-        # rabbitmq<3.2 does not support the applyto field
-        # 1 2      3?  4  5                                            6
-        # / ha-all all .* {"ha-mode":"all","ha-sync-mode":"automatic"} 0
-        if line =~ /^(\S+)\s+(\S+)\s+(all|exchanges|queues)?\s*(\S+)\s+(\S+)\s+(\d+)$/
-          applyto = $3 || 'all'
-          @policies[vhost][$2] = {
-            :applyto    => applyto,
-            :pattern    => $4,
-            :definition => JSON.parse($5),
-            :priority   => $6}
-        else
-          raise Puppet::Error, "cannot parse line from list_policies:#{line}"
-        end
+      end
+
+      # rabbitmq<3.2 does not support the applyto field
+      # 1 2      3?  4  5                                            6
+      # / ha-all all .* {"ha-mode":"all","ha-sync-mode":"automatic"} 0 << This is for RabbitMQ v < 3.7.0
+      # / ha-all .* all {"ha-mode":"all","ha-sync-mode":"automatic"} 0 << This is for RabbitMQ v >= 3.7.0
+      if Puppet::Util::Package.versioncmp(rabbitmq_version, '3.7') >= 0
+        regex = %r{^(\S+)\s+(\S+)\s+(\S+)\s+(all|exchanges|queues)?\s+(\S+)\s+(\d+)$}
+        applyto_index = 4
+        pattern_index = 3
+      else
+        regex = %r{^(\S+)\s+(\S+)\s+(all|exchanges|queues)?\s*(\S+)\s+(\S+)\s+(\d+)$}
+        applyto_index = 3
+        pattern_index = 4
+      end
+
+      policy_list.split(%r{\n}).each do |line|
+        raise Puppet::Error, "cannot parse line from list_policies:#{line}" unless line =~ regex
+        n          = Regexp.last_match(2)
+        applyto    = Regexp.last_match(applyto_index) || 'all'
+        priority   = Regexp.last_match(6)
+        definition = JSON.parse(Regexp.last_match(5))
+        # be aware that the gsub will reset the captures
+        # from the regexp above
+        pattern    = Regexp.last_match(pattern_index).to_s.gsub(%r{\\\\}, '\\')
+
+        @policies[vhost][n] = {
+          applyto: applyto,
+          pattern: pattern,
+          definition: definition,
+          priority: priority
+        }
       end
     end
     @policies[vhost][name]
   end
 
-  def policies(name, vhost)
+  def policies(vhost, name)
     self.class.policies(vhost, name)
   end
 
@@ -60,7 +77,7 @@ Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Pro
     policies(should_vhost, should_policy)[:pattern]
   end
 
-  def pattern=(pattern)
+  def pattern=(_pattern)
     set_policy
   end
 
@@ -68,7 +85,7 @@ Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Pro
     policies(should_vhost, should_policy)[:applyto]
   end
 
-  def applyto=(applyto)
+  def applyto=(_applyto)
     set_policy
   end
 
@@ -76,7 +93,7 @@ Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Pro
     policies(should_vhost, should_policy)[:definition]
   end
 
-  def definition=(definition)
+  def definition=(_definition)
     set_policy
   end
 
@@ -84,36 +101,37 @@ Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Pro
     policies(should_vhost, should_policy)[:priority]
   end
 
-  def priority=(priority)
+  def priority=(_priority)
     set_policy
   end
 
   def set_policy
-    unless @set_policy
-      @set_policy = true
-      resource[:applyto]    ||= applyto
-      resource[:definition] ||= definition
-      resource[:pattern]    ||= pattern
-      resource[:priority]   ||= priority
-      # rabbitmq>=3.2.0
-      if Puppet::Util::Package.versioncmp(self.class.rabbitmq_version, '3.2.0') >= 0
-        rabbitmqctl('set_policy',
-          '-p', should_vhost,
-          '--priority', resource[:priority],
-          '--apply-to', resource[:applyto].to_s,
-          should_policy,
-          resource[:pattern],
-          resource[:definition].to_json
-        )
-      else
-        rabbitmqctl('set_policy',
-          '-p', should_vhost,
-          should_policy,
-          resource[:pattern],
-          resource[:definition].to_json,
-          resource[:priority]
-        )
-      end
+    return if @set_policy
+    @set_policy = true
+    resource[:applyto]    ||= applyto
+    resource[:definition] ||= definition
+    resource[:pattern]    ||= pattern
+    resource[:priority]   ||= priority
+    # rabbitmq>=3.2.0
+    if Puppet::Util::Package.versioncmp(self.class.rabbitmq_version, '3.2.0') >= 0
+      rabbitmqctl(
+        'set_policy',
+        '-p', should_vhost,
+        '--priority', resource[:priority],
+        '--apply-to', resource[:applyto].to_s,
+        should_policy,
+        resource[:pattern],
+        resource[:definition].to_json
+      )
+    else
+      rabbitmqctl(
+        'set_policy',
+        '-p', should_vhost,
+        should_policy,
+        resource[:pattern],
+        resource[:definition].to_json,
+        resource[:priority]
+      )
     end
   end
 end