Merge pull request #741 from Icinga/feature/old-stdlib

Downgrade requirement of stdlib less than v9.0.0
voxpupuli · Sep 14, 2023 · 6096fb1 · 6096fb1
2 parents ea9b4e1 + e548fdd
commit 6096fb1
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/functions/parse.pp b/functions/parse.pp
@@ -28,7 +28,7 @@ function icinga2::parse(
   icinga2::icinga2_attributes(
     $attrs,
     concat($icinga2::globals::reserved, $reserved),
-    stdlib::merge($icinga2::_constants, $constants),
+    $icinga2::_constants + $constants,
     $indent
   )
 }
diff --git a/manifests/feature/elasticsearch.pp b/manifests/feature/elasticsearch.pp
@@ -158,7 +158,7 @@
   icinga2::object { 'icinga2::object::ElasticsearchWriter::elasticsearch':
     object_name => 'elasticsearch',
     object_type => 'ElasticsearchWriter',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_ssl)),
+    attrs       => delete_undef_values($attrs + $attrs_ssl),
     attrs_list  => concat(keys($attrs), keys($attrs_ssl)),
     target      => "${conf_dir}/features-available/elasticsearch.conf",
     notify      => $_notify,

diff --git a/manifests/feature/gelf.pp b/manifests/feature/gelf.pp
@@ -125,7 +125,7 @@
   icinga2::object { 'icinga2::object::GelfWriter::gelf':
     object_name => 'gelf',
     object_type => 'GelfWriter',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_ssl)),
+    attrs       => delete_undef_values($attrs + $attrs_ssl),
     attrs_list  => concat(keys($attrs), keys($attrs_ssl)),
     target      => "${conf_dir}/features-available/gelf.conf",
     order       => 10,

diff --git a/manifests/feature/icingadb.pp b/manifests/feature/icingadb.pp
@@ -176,7 +176,7 @@
   icinga2::object { 'icinga2::object::IcingaDB::icingadb':
     object_name => 'icingadb',
     object_type => 'IcingaDB',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_tls)),
+    attrs       => delete_undef_values($attrs + $attrs_tls),
     attrs_list  => concat(keys($attrs), keys($attrs_tls)),
     target      => "${conf_dir}/features-available/icingadb.conf",
     order       => 10,

diff --git a/manifests/feature/idomysql.pp b/manifests/feature/idomysql.pp
@@ -246,7 +246,7 @@
   icinga2::object { 'icinga2::object::IdoMysqlConnection::ido-mysql':
     object_name => 'ido-mysql',
     object_type => 'IdoMysqlConnection',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_ssl)),
+    attrs       => delete_undef_values($attrs + $attrs_ssl),
     attrs_list  => concat(keys($attrs), keys($attrs_ssl)),
     target      => "${conf_dir}/features-available/ido-mysql.conf",
     order       => 10,

diff --git a/manifests/feature/idopgsql.pp b/manifests/feature/idopgsql.pp
@@ -227,7 +227,7 @@
   icinga2::object { 'icinga2::object::IdoPgsqlConnection::ido-pgsql':
     object_name => 'ido-pgsql',
     object_type => 'IdoPgsqlConnection',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_ssl)),
+    attrs       => delete_undef_values($attrs + $attrs_ssl),
     attrs_list  => concat(keys($attrs), keys($attrs_ssl)),
     target      => "${conf_dir}/features-available/ido-pgsql.conf",
     order       => 10,

diff --git a/manifests/feature/influxdb.pp b/manifests/feature/influxdb.pp
@@ -201,7 +201,7 @@
   icinga2::object { 'icinga2::object::InfluxdbWriter::influxdb':
     object_name => 'influxdb',
     object_type => 'InfluxdbWriter',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_ssl)),
+    attrs       => delete_undef_values($attrs + $attrs_ssl),
     attrs_list  => concat(keys($attrs), keys($attrs_ssl)),
     target      => "${conf_dir}/features-available/influxdb.conf",
     notify      => $_notify,

diff --git a/manifests/feature/influxdb2.pp b/manifests/feature/influxdb2.pp
@@ -178,7 +178,7 @@
   icinga2::object { 'icinga2::object::Influxdb2Writer::influxdb2':
     object_name => 'influxdb2',
     object_type => 'Influxdb2Writer',
-    attrs       => delete_undef_values(stdlib::merge($attrs, $attrs_ssl)),
+    attrs       => delete_undef_values($attrs + $attrs_ssl),
     attrs_list  => concat(keys($attrs), keys($attrs_ssl)),
     target      => "${conf_dir}/features-available/influxdb2.conf",
     notify      => $_notify,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -130,7 +130,7 @@
   $_reserved = $icinga2::globals::reserved
 
   # merge constants with defaults
-  $_constants = stdlib::merge($icinga2::globals::constants, $constants)
+  $_constants = $icinga2::globals::constants + $constants
 
   # validate confd, boolean or string
   if $confd =~ Boolean {

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

diff --git a/templates/object.conf.epp b/templates/object.conf.epp
@@ -11,7 +11,7 @@
       Array $ignore = [],
 | -%>
 
-<% $_attrs = stdlib::merge($attrs, { 'assign where' => $assign, 'ignore where' => $ignore, }) -%>
+<% $_attrs = $attrs + { 'assign where' => $assign, 'ignore where' => $ignore, } -%>
 <% if $apply =~ String { %>apply <%= $object_type -%>
 <% if $prefix { -%>
 <% if $prefix =~ String { %> "<%= $prefix %>"<% } else { -%>