Remove stdlib's legacy function usage

voxpupuli · May 31, 2023 · 58cb84e · 58cb84e
1 parent eafe2c8
commit 58cb84e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/config/global.pp b/manifests/config/global.pp
@@ -1,6 +1,6 @@
 class rsyslog::config::global {
   #create a hash just with legacy type values
-  $legacytype = $rsyslog::config::global_config.filter |$key, $value| { has_key( $value, 'type') }
+  $legacytype = $rsyslog::config::global_config.filter |$key, $value| { 'type' in $value }
 
   $legacytype.each |$param, $config| {
     rsyslog::component::global_config { $param:
@@ -13,7 +13,7 @@
   }
 
   #create a hash just with the non legacy type value
-  $newtype = $rsyslog::config::global_config.filter |$key, $value| { ! has_key( $value, 'type') }
+  $newtype = $rsyslog::config::global_config.filter |$key, $value| { ! 'type' in $value }
 
   #flatten the nested hash of hashes to one single hash
   $flattendata = $newtype.keys.reduce({}) |$memo, $key| { $memo + { $key => $newtype[$key]["value"] } }

diff --git a/templates/action.epp b/templates/action.epp
@@ -26,7 +26,7 @@ action(type="<%= $type %>"
 <%}-%>
 <% if $config { -%>
   <% $config.each |$k, $v| { -%>
-  <%- if is_array($v) { -%>
+  <%- if $v =~ Array { -%>
   <%= $k %>=<%= join(["[\"", join($v, '", "'), "\"]"], "")  %>
   <%- } else { -%>
   <%= $k %>="<%= $v %>"