Merge pull request #293 from StateFarmIns/missing_translation_for_por…

…t_range Update firewalld custom service to translate port ranges with a colon…
voxpupuli · May 28, 2020 · 79e4203 · 79e4203
2 parents 5a59913 + 50b8590
commit 79e4203
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/puppet/type/firewalld_custom_service.rb b/lib/puppet/type/firewalld_custom_service.rb
@@ -51,7 +51,8 @@
       return value if value == :unset
 
       if value.is_a?(Hash)
-        value = Hash[value.map { |k, v| [k, v.to_s] }]
+        # Handle the legacy format from the module translate : to -
+        value = Hash[value.map { |k, v| [k, v.to_s.tr(':', '-')] }]
       else
         port, protocol = value.split('/')
 

diff --git a/spec/unit/puppet/type/firewalld_custom_service_spec.rb b/spec/unit/puppet/type/firewalld_custom_service_spec.rb
@@ -80,6 +80,7 @@
       '65535/tcp',
       'tcp',
       { 'protocol' => 'tcp' },
+      { 'port' => '1234:4567', 'protocol' => 'tcp' },
       { 'port' => 1234, 'protocol' => 'tcp' },
       { 'port' => 1234, 'protocol' => 'udp' },
       { 'port' => 1234, 'protocol' => 'sctp' },