Revert "Update 3rdparty rabbitmq module"

[mirror/dsa-puppet.git] / 3rdparty / modules / rabbitmq / lib / puppet / type / rabbitmq_user_permissions.rb

diff --git a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
index a1fc929..493d47c 100644 (file)
--- a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
@@ -1,14 +1,5 @@
 Puppet::Type.newtype(:rabbitmq_user_permissions) do
-  desc <<-DESC
-Type for managing rabbitmq user permissions
-
-@example Define some rabbitmq_user_permissions
- rabbitmq_user_permissions { 'dan@myvhost':
-   configure_permission => '.*',
-   read_permission      => '.*',
-   write_permission     => '.*',
- }
-DESC
+  desc 'Type for managing rabbitmq user permissions'
 
   ensurable do
     defaultto(:present)
@@ -22,9 +13,9 @@ DESC
 
   autorequire(:service) { 'rabbitmq-server' }
 
-  newparam(:name, namevar: true) do
+  newparam(:name, :namevar => true) do
     desc 'combination of user@vhost to grant privileges to'
-    newvalues(%r{^\S+@\S+$})
+    newvalues(/^\S+@\S+$/)
   end
 
   newproperty(:configure_permission) do
@@ -56,9 +47,13 @@ DESC
     [self[:name].split('@')[0]]
   end
 
+  # I may want to dissalow whitespace
   def validate_permissions(value)
-    Regexp.new(value)
-  rescue RegexpError
-    raise ArgumentError, "Invalid regexp #{value}"
+    begin
+      Regexp.new(value)
+    rescue RegexpError
+      raise ArgumentError, "Invalid regexp #{value}"
+    end
   end
+
 end