puppetlabs/stdlib: Require 9.x

voxpupuli · Jun 16, 2023 · 7d8c6cf · 7d8c6cf
1 parent 3837bd9
commit 7d8c6cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/functions/bool2num_hash_recursive.pp b/functions/bool2num_hash_recursive.pp
@@ -38,6 +38,6 @@ function yum::bool2num_hash_recursive($arg) {
     # https://github.com/kuleuven/puppet-lint-manifest_whitespace-check/issues/8
     Hash({ $key => $return_value })
   }.reduce |$attrs_memo, $kv| {
-    merge($attrs_memo, $kv)
+    $attrs_memo + $kv
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -183,13 +183,13 @@
       }
 
       $_normalized_attrs = $attrs ? {
-        Hash    => merge($attrs, $_normalized_ensure),
+        Hash    => $attrs + $_normalized_ensure,
         default => $_normalized_ensure,
       }
 
       Hash({ $key => $_normalized_attrs })
     }.reduce |$memo, $cfg_opt_hash| {
-      merge($memo, $cfg_opt_hash)
+      $memo + $cfg_opt_hash
     }
 
     $_normalized_config_options.each |$config, $attributes| {
@@ -209,7 +209,7 @@
   }
 
   # cleanup old kernels
-  ensure_packages([$utils_package_name])
+  stdlib::ensure_packages([$utils_package_name])
 
   $_real_installonly_limit = $config_options['installonly_limit'] ? {
     Variant[String, Integer] => $config_options['installonly_limit'],

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.18.0 < 9.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/concat",