From e548fdd3648fc1c0e7d096b723cfaa989cb43daf Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Thu, 14 Sep 2023 11:36:32 +0200 Subject: [PATCH] downgrade requirement of stdlib less than v9.0.0 --- functions/parse.pp | 2 +- manifests/feature/elasticsearch.pp | 2 +- manifests/feature/gelf.pp | 2 +- manifests/feature/icingadb.pp | 2 +- manifests/feature/idomysql.pp | 2 +- manifests/feature/idopgsql.pp | 2 +- manifests/feature/influxdb.pp | 2 +- manifests/feature/influxdb2.pp | 2 +- manifests/init.pp | 2 +- metadata.json | 2 +- templates/object.conf.epp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/functions/parse.pp b/functions/parse.pp index ab7a2ad8..7bf17a22 100644 --- 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 index 361e789b..856da2c3 100644 --- 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 index 484dfe1f..e0d2ed66 100644 --- 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 index ef87c04d..e0d5e039 100644 --- 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 index 24794004..d85ab303 100644 --- 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 index a94fb26b..224c2f03 100644 --- 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 index f6bc7f9f..5c5c7874 100644 --- 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 index c8b01d28..0649e5b8 100644 --- 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 index 93c18696..d2682562 100644 --- 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 index 21387006..7ff49988 100644 --- 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 index 6de478a9..432abb4f 100644 --- 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 { -%>