Add Stdlib 9.x compatibility (#59)

Graylog2 · Aug 14, 2023 · 6c15d5a · 6c15d5a
1 parent 9345c30
commit 6c15d5a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/manifests/allinone.pp b/manifests/allinone.pp
@@ -12,7 +12,7 @@
   }
 
 
-  if has_key($elasticsearch, 'version') {
+  if 'version' in $elasticsearch {
     $es_version = $elasticsearch['version']
   } else {
     $es_version = '7.10.2'
@@ -34,7 +34,7 @@
   }
 
 
-  if has_key($graylog, 'major_version') {
+  if 'major_version' in $graylog {
     $graylog_major_version = $graylog['major_version']
   } else {
     $graylog_major_version = $graylog::params::major_version

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -1,6 +1,6 @@
 class graylog::server(
   $package_version = $graylog::params::package_version,
-  $config = undef,
+  Hash $config = undef,
   $user = $graylog::params::server_user,
   $group = $graylog::params::server_group,
   $ensure = running,
@@ -13,15 +13,12 @@
   if $config == undef {
     fail('Missing "config" setting!')
   }
-  if ! is_hash($config) {
-    fail('$config needs to be a hash data type!')
-  }
 
   # Check mandatory settings
-  if ! has_key($config, 'password_secret') {
+  unless 'password_secret' in $config {
     fail('Missing "password_secret" config setting!')
   }
-  if has_key($config, 'root_password_sha2') {
+  if 'root_password_sha2' in $config {
     if length($config['root_password_sha2']) < 64 {
       fail('The root_password_sha2 parameter does not look like a SHA256 checksum!')
     }

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