File: fix-list_users-provider.patch

package info (click to toggle)
puppet-module-puppetlabs-rabbitmq 8.5.0-10
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 1,192 kB
  • sloc: ruby: 5,227; sh: 10; makefile: 4
file content (38 lines) | stat: -rw-r--r-- 1,392 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
Description: Fix list_users provider
Author: Thomas Goirand <zigo@debian.org>
Forwarded: https://github.com/voxpupuli/puppet-rabbitmq/pull/1060
Last-Update: 2025-05-29

Index: puppet-module-puppetlabs-rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
===================================================================
--- puppet-module-puppetlabs-rabbitmq.orig/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
+++ puppet-module-puppetlabs-rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
@@ -15,15 +15,19 @@ Puppet::Type.type(:rabbitmq_user).provid
       rabbitmqctl_list('users')
     end
 
-    user_list.split(%r{\n}).map do |line|
-      raise Puppet::Error, "Cannot parse invalid user line: #{line}" unless line =~ %r{^(\S+)\s+\[(.*?)\]$}
-      user = Regexp.last_match(1)
-      tags = Regexp.last_match(2).split(%r{,\s*})
-      new(
-        ensure: :present,
-        name: user,
-        tags: tags
-      )
+    if user_list.split(%r{\n}).size > 0
+      user_list.split(%r{\n})[1..-1].map do |line|
+        raise Puppet::Error, "Cannot parse invalid user line: #{line}" unless line =~ %r{^(\S+)\s+\[(.*?)\]$}
+        user = Regexp.last_match(1)
+        tags = Regexp.last_match(2).split(%r{,\s*})
+        new(
+          ensure: :present,
+          name: user,
+          tags: tags
+        )
+      end
+    else
+      user_list = []
     end
   end