support current stdlib

rrotter · rrotter · commit 370c8e2ec725 · 2023-09-21T11:58:19.000-04:00
has_key function dropped: puppetlabs/puppetlabs-stdlib#1319
diff --git a/manifests/mod.pp b/manifests/mod.pp
@@ -54,7 +54,7 @@
   $mod_libs = $apache::mod_libs
   if $lib {
     $_lib = $lib
-  } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
+  } elsif $mod in $mod_libs {
     $_lib = $mod_libs[$mod]
   } else {
     $_lib = "mod_${mod}.so"
@@ -83,7 +83,7 @@
   $mod_packages = $apache::mod_packages
   if $package {
     $_package = $package
-  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+  } elsif $mod in $mod_packages {
     if ($apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease != '2') {
       # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
       $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
diff --git a/manifests/mod/jk.pp b/manifests/mod/jk.pp
@@ -301,7 +301,7 @@
 
   # Ensure that we are not using variables with the typo fixed by MODULES-6225
   # anymore:
-  if !empty($workers_file_content) and has_key($workers_file_content, 'worker_mantain') {
+  if !empty($workers_file_content) and ('worker_mantain' in $workers_file_content) {
     fail('Please replace $workers_file_content[\'worker_mantain\'] by $workers_file_content[\'worker_maintain\']. See MODULES-6225 for details.')
   }
 
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
@@ -53,9 +53,9 @@
   $mod_packages = $apache::mod_packages
   if $package_name {
     $_package_name = $package_name
-  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+  } elsif $mod in $mod_packages {
     $_package_name = $mod_packages[$mod]
-  } elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
+  } elsif 'phpXXX' in $mod_packages {
     $_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
   } else {
     $_package_name = undef

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@`
`301`	`301`
`302`	`302`	`# Ensure that we are not using variables with the typo fixed by MODULES-6225`
`303`	`303`	`# anymore:`
`304`		`- if !empty($workers_file_content) and has_key($workers_file_content, 'worker_mantain') {`
	`304`	`+ if !empty($workers_file_content) and ('worker_mantain' in $workers_file_content) {`
`305`	`305`	`fail('Please replace $workers_file_content[\'worker_mantain\'] by $workers_file_content[\'worker_maintain\']. See MODULES-6225 for details.')`
`306`	`306`	`}`
`307`	`307`