X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Ftype%2Frabbitmq_user_permissions.rb;h=a1fc9298697b460f078c5e426ca364971795dfcc;hb=921e69100a563cf143f56a3905d8362336d939ff;hp=493d47c88a6d4025455a50d2ccba8bcdb7bd450d;hpb=b54f52d2899c5785923c804fdfbba0782c147da4;p=mirror%2Fdsa-puppet.git

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