From d6ca26c7f0d60f86a8ac3a40b129b010caa34321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabija=20Bruzgait=C4=97?= <Gabija.Bruzgaite@adform.com>
Date: Mon, 4 Dec 2023 11:15:23 +0200
Subject: [PATCH 1/5] stdlib v9 and puppet v8 support

---
 manifests/config.pp | 4 ++--
 metadata.json       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 5f48fb6e7..0da4da525 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -21,7 +21,7 @@
 
   $init_defaults = {
     'MAX_OPEN_FILES' => '65535',
-  }.merge($elasticsearch::init_defaults)
+  }.stdlib::merge($elasticsearch::init_defaults)
 
   if ($elasticsearch::ensure == 'present') {
     file {
@@ -164,7 +164,7 @@
     # }
 
     # Generate Elasticsearch config
-    $data = merge(
+    $data = stdlib::merge(
       $elasticsearch::config,
       { 'path.data' => $elasticsearch::datadir },
       { 'path.logs' => $elasticsearch::logdir },
diff --git a/metadata.json b/metadata.json
index 4357d6690..62054b7b1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -22,7 +22,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 9.0.0"
+      "version_requirement": ">= 4.13.0 < 10.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -78,7 +78,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ]
 }

From c3a2f8c3fb2042a15c5c7df99f3b6b812e3fee5b Mon Sep 17 00:00:00 2001
From: Gabija <59805033+ggabijaa@users.noreply.github.com>
Date: Wed, 6 Dec 2023 13:39:13 +0200
Subject: [PATCH 2/5] Update stdlib version

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 62054b7b1..12f875207 100644
--- a/metadata.json
+++ b/metadata.json
@@ -22,7 +22,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     }
   ],
   "operatingsystem_support": [

From 4e1de2acec0e6fabbee7e762a6813944f8450cbf Mon Sep 17 00:00:00 2001
From: Gabija <59805033+ggabijaa@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:30:39 +0200
Subject: [PATCH 3/5] Update config.pp

---
 manifests/config.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 623716cd5..c2d317f26 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -21,7 +21,8 @@
 
   $init_defaults = {
     'MAX_OPEN_FILES' => '65535',
-  }.stdlib::merge($elasticsearch::init_defaults)
+  } + $elasticsearch::init_defaults
+  
 
   if ($elasticsearch::ensure == 'present') {
     file {

From 658ac0fd601e78262e3f38eed19eabb8c5031bf0 Mon Sep 17 00:00:00 2001
From: Gabija <59805033+ggabijaa@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:32:51 +0200
Subject: [PATCH 4/5] Update config.pp

---
 manifests/config.pp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index c2d317f26..9a8d1cab4 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -165,12 +165,7 @@
     # }
 
     # Generate Elasticsearch config
-    $data = stdlib::merge(
-      $elasticsearch::config,
-      { 'path.data' => $elasticsearch::datadir },
-      { 'path.logs' => $elasticsearch::logdir },
-      $_tls_config
-    )
+    $data = $elasticsearch::config + { 'path.data' => $elasticsearch::datadir } + { 'path.logs' => $elasticsearch::logdir } + $_tls_config
 
     file { "${elasticsearch::configdir}/elasticsearch.yml":
       ensure  => 'file',

From feb25ad3e4e9ab6d04162b9c76898f1c73a43ebb Mon Sep 17 00:00:00 2001
From: Gabija <59805033+ggabijaa@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:34:02 +0200
Subject: [PATCH 5/5] lint

---
 manifests/config.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 9a8d1cab4..749cf0e54 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -22,7 +22,6 @@
   $init_defaults = {
     'MAX_OPEN_FILES' => '65535',
   } + $elasticsearch::init_defaults
-  
 
   if ($elasticsearch::ensure == 'present') {
     file {