X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Fprovider%2Frabbitmq_binding%2Frabbitmqadmin.rb;h=e02c46685dc3600bad2bc4a3f4830e7a1cacd0b6;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=e7f9345b31eb97f8e5eda1509f6841ffa74f6131;hpb=921e69100a563cf143f56a3905d8362336d939ff;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb
index e7f9345b3..e02c46685 100644
--- a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb
@@ -1,76 +1,73 @@
 require 'json'
 require 'puppet'
-require 'digest'
-
 Puppet::Type.type(:rabbitmq_binding).provide(:rabbitmqadmin) do
-  has_command(:rabbitmqctl, 'rabbitmqctl') do
-    environment HOME: '/tmp'
-  end
-  has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
-    environment HOME: '/tmp'
-  end
 
-  confine feature: :posix
-
-  # Without this, the composite namevar stuff doesn't work properly.
-  mk_resource_methods
+  if Puppet::PUPPETVERSION.to_f < 3
+    commands :rabbitmqctl   => 'rabbitmqctl'
+    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
+  else
+    has_command(:rabbitmqctl, 'rabbitmqctl') do
+      environment :HOME => "/tmp"
+    end
+    has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
+      environment :HOME => "/tmp"
+    end
+  end
+  defaultfor :feature => :posix
 
   def should_vhost
     if @should_vhost
       @should_vhost
     else
-      @should_vhost = resource[:vhost]
+      @should_vhost = resource[:name].split('@').last
     end
   end
 
   def self.all_vhosts
     vhosts = []
-    rabbitmqctl('list_vhosts', '-q').split(%r{\n}).map do |vhost|
+    rabbitmqctl('list_vhosts', '-q').split(/\n/).collect do |vhost|
       vhosts.push(vhost)
     end
     vhosts
   end
 
   def self.all_bindings(vhost)
-    rabbitmqctl('list_bindings', '-q', '-p', vhost, 'source_name', 'destination_name', 'destination_kind', 'routing_key', 'arguments').split(%r{\n})
+    rabbitmqctl('list_bindings', '-q', '-p', vhost, 'source_name', 'destination_name', 'destination_kind', 'routing_key', 'arguments').split(/\n/)
   end
 
   def self.instances
     resources = []
     all_vhosts.each do |vhost|
-      all_bindings(vhost).map do |line|
-        source_name, destination_name, destination_type, routing_key, arguments = line.split(%r{\t})
+      all_bindings(vhost).collect do |line|
+        source_name, destination_name, destination_type, routing_key, arguments = line.split(/\t/)
         # Convert output of arguments from the rabbitmqctl command to a json string.
         if !arguments.nil?
-          arguments = arguments.gsub(%r{^\[(.*)\]$}, '').gsub(%r{\{("(?:.|\\")*?"),}, '{\1:').gsub(%r{\},\{}, ',')
-          arguments = '{}' if arguments == ''
+          arguments = arguments.gsub(/^\[(.*)\]$/, "").gsub(/\{("(?:.|\\")*?"),/, '{\1:').gsub(/\},\{/, ",")
+          if arguments == ""
+            arguments = '{}'
+          end
         else
           arguments = '{}'
         end
-        hashed_name = Digest::SHA256.hexdigest format('%s@%s@%s@%s', source_name, destination_name, vhost, routing_key)
-        next if source_name.empty?
-        binding = {
-          source: source_name,
-          destination: destination_name,
-          vhost: vhost,
-          destination_type: destination_type,
-          routing_key: routing_key,
-          arguments: JSON.parse(arguments),
-          ensure: :present,
-          name: hashed_name
-        }
-        resources << new(binding) if binding[:name]
+        if (source_name != '')
+          binding = {
+            :destination_type => destination_type,
+            :routing_key      => routing_key,
+            :arguments        => JSON.parse(arguments),
+            :ensure           => :present,
+            :name             => "%s@%s@%s" % [source_name, destination_name, vhost],
+          }
+          resources << new(binding) if binding[:name]
+        end
       end
     end
     resources
   end
 
-  # see
-  # https://github.com/puppetlabs/puppetlabs-netapp/blob/d0a655665463c69c932f835ba8756be32417a4e9/lib/puppet/provider/netapp_qtree/sevenmode.rb#L66-L73
   def self.prefetch(resources)
-    bindings = instances
-    resources.each do |name, res|
-      if (provider = bindings.find { |binding| binding.source == res[:source] && binding.destination == res[:destination] && binding.vhost == res[:vhost] && binding.routing_key == res[:routing_key] })
+    packages = instances
+    resources.keys.each do |name|
+      if provider = packages.find{ |pkg| pkg.name == name }
         resources[name].provider = provider
       end
     end
@@ -82,26 +79,34 @@ Puppet::Type.type(:rabbitmq_binding).provide(:rabbitmqadmin) do
 
   def create
     vhost_opt = should_vhost ? "--vhost=#{should_vhost}" : ''
+    name = resource[:name].split('@').first
+    destination = resource[:name].split('@')[1]
     arguments = resource[:arguments]
-    arguments = {} if arguments.nil?
+    if arguments.nil?
+      arguments = {}
+    end
     rabbitmqadmin('declare',
-                  'binding',
-                  vhost_opt,
-                  "--user=#{resource[:user]}",
-                  "--password=#{resource[:password]}",
-                  '-c',
-                  '/etc/rabbitmq/rabbitmqadmin.conf',
-                  "source=#{resource[:source]}",
-                  "destination=#{resource[:destination]}",
-                  "arguments=#{arguments.to_json}",
-                  "routing_key=#{resource[:routing_key]}",
-                  "destination_type=#{resource[:destination_type]}")
+      'binding',
+      vhost_opt,
+      "--user=#{resource[:user]}",
+      "--password=#{resource[:password]}",
+      '-c',
+      '/etc/rabbitmq/rabbitmqadmin.conf',
+      "source=#{name}",
+      "destination=#{destination}",
+      "arguments=#{arguments.to_json}",
+      "routing_key=#{resource[:routing_key]}",
+      "destination_type=#{resource[:destination_type]}"
+    )
     @property_hash[:ensure] = :present
   end
 
   def destroy
     vhost_opt = should_vhost ? "--vhost=#{should_vhost}" : ''
-    rabbitmqadmin('delete', 'binding', vhost_opt, "--user=#{resource[:user]}", "--password=#{resource[:password]}", '-c', '/etc/rabbitmq/rabbitmqadmin.conf', "source=#{resource[:source]}", "destination_type=#{resource[:destination_type]}", "destination=#{resource[:destination]}", "properties_key=#{resource[:routing_key]}")
+    name = resource[:name].split('@').first
+    destination = resource[:name].split('@')[1]
+    rabbitmqadmin('delete', 'binding', vhost_opt, "--user=#{resource[:user]}", "--password=#{resource[:password]}", '-c', '/etc/rabbitmq/rabbitmqadmin.conf', "source=#{name}", "destination_type=#{resource[:destination_type]}", "destination=#{destination}", "properties_key=#{resource[:routing_key]}")
     @property_hash[:ensure] = :absent
   end
+
 end