Replace legacy merge() with native puppet code

voxpupuli · Aug 21, 2023 · d9ddc17 · d9ddc17
1 parent 5dac750
commit d9ddc17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -254,12 +254,12 @@
   }
 
   $policies.each | $name, $policy_config | {
-    $merges_policy_config = merge($global_acl_config, $policy_config)
+    $merges_policy_config = $global_acl_config + $policy_config
     create_resources(consul_policy, { $name => $merges_policy_config })
   }
 
   $tokens.each | $name, $token_config | {
-    $merged_token_config = merge($global_acl_config, $token_config)
+    $merged_token_config = $global_acl_config + $token_config
     create_resources(consul_token, { $name => $merged_token_config })
   }
 }
diff --git a/manifests/watch.pp b/manifests/watch.pp
@@ -106,7 +106,7 @@
     }
   }
 
-  $merged_hash = merge($basic_hash, $type_hash)
+  $merged_hash = $basic_hash + $type_hash
 
   $watch_hash = {
     watches => [$merged_hash.filter |$key, $val| { $val =~ NotUndef }],