From: Félix-Antoine Fortin <felix-antoine.fortin@calculquebec.ca>
Date: Fri, 1 Oct 2021 18:11:39 +0000 (-0400)
Subject: Fix gid insync regex for converting to GID
X-Git-Tag: v3.3.0~5^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=27ec1b758e1d095f2feb8522d275743647c93d58;p=puppet-modules%2Fpuppetlabs-firewall.git

Fix gid insync regex for converting to GID
---

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index ffbfcb1..75724f7 100644
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -1442,14 +1442,14 @@ Puppet::Type.newtype(:firewall) do
       # If 'should' contains anything other than digits,
       # we assume that we have to do a lookup to convert
       # to UID
-      unless should[%r{[0-9]+}] == should
+      unless should[%r{[0-9]+(-[0-9]+)?}] == should
         should = Etc.getgrnam(should).gid
       end
 
       # If 'is' contains anything other than digits,
       # we assume that we have to do a lookup to convert
       # to UID
-      unless is[%r{[0-9]+}] == is
+      unless is[%r{[0-9]+(-[0-9]+)?}] == is
         is = Etc.getgrnam(is).gid
       end