puppetlabs/stdlib: Require 9.x

bastelfreak · bastelfreak · commit 37a957cda64b · 2023-08-30T20:57:42.000+02:00
diff --git a/manifests/backup/pg_dump.pp b/manifests/backup/pg_dump.pp
@@ -68,13 +68,13 @@
 ) {
   # Install required packages
   if $package_name {
-    ensure_packages($package_name)
+    stdlib::ensure_packages($package_name)
   }
   if $install_cron {
     if $facts['os']['family'] == 'RedHat' {
-      ensure_packages('cronie')
+      stdlib::ensure_packages('cronie')
     } elsif $facts['os']['family'] != 'FreeBSD' {
-      ensure_packages('cron')
+      stdlib::ensure_packages('cron')
     }
   }
 
diff --git a/manifests/server/extension.pp b/manifests/server/extension.pp
@@ -134,7 +134,7 @@
       default => $package_ensure,
     }
 
-    ensure_packages($package_name, {
+    stdlib::ensure_packages($package_name, {
         ensure  => $_package_ensure,
         tag     => 'puppetlabs-postgresql',
     })
diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp
@@ -186,7 +186,7 @@
       }
     }
 
-    ensure_packages([$package_name])
+    stdlib::ensure_packages([$package_name])
 
     $exec_command = ['/usr/sbin/semanage', 'port', '-a', '-t', 'postgresql_port_t', '-p', 'tcp', $port]
     $exec_unless = "/usr/sbin/semanage port -l | grep -qw ${port}"
diff --git a/manifests/server/instance/passwd.pp b/manifests/server/instance/passwd.pp
@@ -31,7 +31,7 @@
   # psql will default to connecting as $user if you don't specify name
   $_datbase_user_same = $database == $user
   $_dboption = $_datbase_user_same ? {
-    false => " --dbname ${shell_escape($database)}",
+    false => " --dbname ${stdlib::shell_escape($database)}",
     default => ''
   }
 
@@ -41,7 +41,7 @@
     #  without specifying a password ('ident' or 'trust' security). This is
     #  the default for pg_hba.conf.
     $escaped = postgresql::postgresql_escape($real_postgres_password)
-    $exec_command = "${shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
+    $exec_command = "${stdlib::shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${stdlib::shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
     exec { 'set_postgres_postgrespw':
       # This command works w/no password because we run it as postgres system
       # user
diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 5.2.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/apt",

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,13 @@`
`68`	`68`	`) {`
`69`	`69`	`# Install required packages`
`70`	`70`	`if $package_name {`
`71`		`- ensure_packages($package_name)`
	`71`	`+ stdlib::ensure_packages($package_name)`
`72`	`72`	`}`
`73`	`73`	`if $install_cron {`
`74`	`74`	`if $facts['os']['family'] == 'RedHat' {`
`75`		`- ensure_packages('cronie')`
	`75`	`+ stdlib::ensure_packages('cronie')`
`76`	`76`	`} elsif $facts['os']['family'] != 'FreeBSD' {`
`77`		`- ensure_packages('cron')`
	`77`	`+ stdlib::ensure_packages('cron')`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@`
`134`	`134`	`default => $package_ensure,`
`135`	`135`	`}`
`136`	`136`
`137`		`- ensure_packages($package_name, {`
	`137`	`+ stdlib::ensure_packages($package_name, {`
`138`	`138`	`ensure => $_package_ensure,`
`139`	`139`	`tag => 'puppetlabs-postgresql',`
`140`	`140`	`})`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`- ensure_packages([$package_name])`
	`189`	`+ stdlib::ensure_packages([$package_name])`
`190`	`190`
`191`	`191`	`$exec_command = ['/usr/sbin/semanage', 'port', '-a', '-t', 'postgresql_port_t', '-p', 'tcp', $port]`
`192`	`192`	`$exec_unless = "/usr/sbin/semanage port -l \| grep -qw ${port}"`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"dependencies": [`
`11`	`11`	`{`
`12`	`12`	`"name": "puppetlabs/stdlib",`
`13`		`- "version_requirement": ">= 5.2.0 < 10.0.0"`
	`13`	`+ "version_requirement": ">= 9.0.0 < 10.0.0"`
`14`	`14`	`},`
`15`	`15`	`{`
`16`	`16`	`"name": "puppetlabs/apt",`