Replace stdlib::merge() calls by native operand +

Author: deric

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+
+## [2024-06-27] Release 1.1.0
+
+**Changes**
+ - Fixed `puppetlabs/apt` requirement
+ - Fixed Puppet 8 warnings
+ - Replaced `merge()` function calls by native `+` operand
+
+[Full changes](https://github.com/deric/puppet-fluentbit/compare/v1.0.0...v1.1.0)
+
+
 ## [2024-06-21] Release 1.0.0
 
 **Changes**

manifests/init.pp

@@ -283,15 +283,15 @@
   ~> Class['fluentbit::service']
 
   $inputs.each |$name, $conf| {
-    create_resources(fluentbit::pipeline, { $name => merge({ 'pipeline' => 'input' }, $conf) })
+    create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'input' } + $conf })
   }
 
   $outputs.each |$name, $conf| {
-    create_resources(fluentbit::pipeline, { $name => merge({ 'pipeline' => 'output' }, $conf) })
+    create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'output' } + $conf })
   }
 
   $filters.each |$name, $conf| {
-    create_resources(fluentbit::pipeline, { $name => merge({ 'pipeline' => 'filter' }, $conf) })
+    create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'filter' } + $conf })
   }
 
   create_resources(fluentbit::upstream, $upstreams)

manifests/pipeline.pp

@@ -72,15 +72,11 @@
         name          => $plugin,
         pipeline_type => $pipeline,
         order         => $order,
-        properties    => merge(
-          $db_settings,
-          {
-            alias => $title,
-          },
-          $properties,
-          $script_settings,
-          $upstream_settings,
-        )
+        properties    => $db_settings
+        + { alias => $title }
+        + $properties
+        + $script_settings
+        + $upstream_settings,
       }
     ),
   }