Merge pull request #1572 from puppetlabs/pdksync_CONT-1028-update-stdlib-dependency

pdksync - (MAINT) - Allow Stdlib 9.x

Author: jordanbreen28

manifests/backup/mysqlbackup.pp

@@ -75,9 +75,9 @@
 
   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')
     }
   }
 

manifests/backup/mysqldump.pp

@@ -43,7 +43,7 @@
 
   unless $facts['os']['family'] == 'FreeBSD' {
     if $backupcompress and $compression_command == 'bzcat -zc' {
-      ensure_packages(['bzip2'])
+      stdlib::ensure_packages(['bzip2'])
       Package['bzip2'] -> File['mysqlbackup.sh']
     }
   }
@@ -70,9 +70,9 @@
 
   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')
     }
   }
 

manifests/backup/xtrabackup.pp

@@ -35,7 +35,7 @@
   String[1]                                     $backupmethod_package     = $mysql::params::xtrabackup_package_name,
   Array[String]                                 $excludedatabases = [],
 ) inherits mysql::params {
-  ensure_packages($backupmethod_package)
+  stdlib::ensure_packages($backupmethod_package)
 
   $backuppassword_unsensitive = if $backuppassword =~ Sensitive {
     $backuppassword.unwrap
@@ -110,9 +110,9 @@
 
   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')
     }
   }
 

manifests/server/config.pp

@@ -41,8 +41,8 @@
           $dir = $options['mysqld']["${entry}"]
 
           if ( $dir and $dir != '/usr' and $dir != '/tmp' ) {
-            $clean_dir = shell_escape($dir)
-            $clean_package_name = shell_escape($mysql::server::package_name)
+            $clean_dir = stdlib::shell_escape($dir)
+            $clean_package_name = stdlib::shell_escape($mysql::server::package_name)
 
             exec { "${entry}-managed_dir-mkdir":
               command => ['/bin/mkdir', '-p', $clean_dir],

manifests/server/service.pp

@@ -56,7 +56,7 @@
       $mysqlsocket = $options['mysqld']['socket']
     }
 
-    $test_command = ['test', '-S', shell_escape($mysqlsocket)]
+    $test_command = ['test', '-S', stdlib::shell_escape($mysqlsocket)]
     if $service_ensure != 'stopped' {
       exec { 'wait_for_mysql_socket_to_open':
         command   => $test_command,

metadata.json

@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 8.4.0 < 9.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     }
   ],
   "operatingsystem_support": [

spec/acceptance/05_mysql_xtrabackup_spec.rb

@@ -23,10 +23,10 @@ class { 'mysql::server': root_password => 'password' }
               ensure  => present,
               source  => $source_url,
             }
-            ensure_packages('gnupg')
-            ensure_packages('gnupg2')
-            ensure_packages('curl')
-            ensure_packages('percona-release',{
+            stdlib::ensure_packages('gnupg')
+            stdlib::ensure_packages('gnupg2')
+            stdlib::ensure_packages('curl')
+            stdlib::ensure_packages('percona-release',{
               ensure   => present,
               provider => 'dpkg',
               source   => '/tmp/percona-release_latest.deb',
@@ -47,12 +47,12 @@ class { 'mysql::server': root_password => 'password' }
               $percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-3.noarch.rpm'
               $epel_url = 'https://archives.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm'
             }
-            ensure_packages('percona-release',{
+            stdlib::ensure_packages('percona-release',{
               ensure   => present,
               provider => 'rpm',
               source   => $percona_url,
             })
-            ensure_packages('epel-release',{
+            stdlib::ensure_packages('epel-release',{
               ensure   => present,
               provider => 'rpm',
               source   => $epel_url,
@@ -141,9 +141,9 @@ class { 'mysql::server': root_password => 'password' }
               ensure => present,
               source => $source_url,
             }
-            ensure_packages('gnupg')
-            ensure_packages('gnupg2')
-            ensure_packages('percona-release',{
+            stdlib::ensure_packages('gnupg')
+            stdlib::ensure_packages('gnupg2')
+            stdlib::ensure_packages('percona-release',{
               ensure   => present,
               provider => 'dpkg',
               source   => '/tmp/percona-release_latest.deb',
@@ -157,12 +157,12 @@ class { 'mysql::server': root_password => 'password' }
           /RedHat/: {
             $percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
             $epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
-            ensure_packages('percona-release',{
+            stdlib::ensure_packages('percona-release',{
               ensure   => present,
               provider => 'rpm',
               source   => $percona_url,
             })
-            ensure_packages('epel-release',{
+            stdlib::ensure_packages('epel-release',{
               ensure   => present,
               provider => 'rpm',
               source   => $epel_url,