backupninja/mysql,pgsql: Accept databases only as arrays and simplify code accordingly

Author: KrisMagjistari

manifests/entry/mysql.pp

@@ -3,24 +3,24 @@
 # This defined type handles the mysql backupninja task entries
 #
 define backupninja::entry::mysql (
-  Enum['present', 'absent'] $ensure         = $backupninja::ensure,
-  Optional[Integer] $weight                 = 20,
-  Variant[Array[String], String] $when      = '',
-  Boolean $hotcopy                          = false,
-  Boolean $sqldump                          = true,
-  String $sqldumpoptions                    = '--lock-tables --complete-insert --add-drop-table --quick --quote-names',
-  Boolean $compress                         = false,
-  String $dbhost                            = '',
-  Stdlib::Absolutepath $backupdir           = "${backupninja::params::backupdir}/mysql",
-  Variant[Array[String], String] $databases = 'all',
-  String $user                              = '',
-  String $dbusername                        = '',
-  String $dbpassword                        = '',
-  Stdlib::Absolutepath $configfile          = $backupninja::params::mysql_configfile,
-  String $nodata                            = '',
-  Array[String] $nodata_any                 = [],
-  String $vsname                            = '',
-  String $handler                           = 'mysql',
+  Enum['present', 'absent'] $ensure    = $backupninja::ensure,
+  Optional[Integer] $weight            = 20,
+  Variant[Array[String], String] $when = '',
+  Boolean $hotcopy                     = false,
+  Boolean $sqldump                     = true,
+  String $sqldumpoptions               = '--lock-tables --complete-insert --add-drop-table --quick --quote-names',
+  Boolean $compress                    = false,
+  String $dbhost                       = '',
+  Stdlib::Absolutepath $backupdir      = "${backupninja::params::backupdir}/mysql",
+  Array[String] $databases             = ['all'],
+  String $user                         = '',
+  String $dbusername                   = '',
+  String $dbpassword                   = '',
+  Stdlib::Absolutepath $configfile     = $backupninja::params::mysql_configfile,
+  String $nodata                       = '',
+  Array[String] $nodata_any            = [],
+  String $vsname                       = '',
+  String $handler                      = 'mysql',
 ) {
 
   require backupninja::params
@@ -32,21 +32,11 @@
     $_when_real = [] << $when
   }
 
-  if empty($databases) {
-    $db_list = ['all']
-  }
-  elsif is_string($databases) {
-    $db_list = split($databases, ' ')
-  }
-  else {
-    $db_list = $databases
-  }
-
-  if $db_list.size > 1 and 'all' in $db_list {
+  if $databases.size > 1 and 'all' in $databases {
     $db_list_real = ['all']
   }
   else {
-    $db_list_real = $db_list.unique
+    $db_list_real = $databases.unique
   }
 
 

manifests/entry/pgsql.pp

@@ -8,7 +8,7 @@
   Variant[Array[String], String] $when = '',
   Boolean $compress                    = false,
   Stdlib::Absolutepath $backupdir      = "${backupninja::params::backupdir}/postgres",
-  String $databases                    = 'all',
+  Array[String] $databases             = ['all'],
   String $format                       = 'custom',
   String $handler                      = 'pgsql',
 ) {
@@ -22,21 +22,11 @@
     $_when_real = [] << $when
   }
 
-  if empty($databases) {
-    $db_list = ['all']
-  }
-  elsif is_string($databases) {
-    $db_list = split($databases, ' ')
-  }
-  else {
-    $db_list = $databases
-  }
-
-  if $db_list.size > 1 and 'all' in $db_list {
+  if $databases.size > 1 and 'all' in $databases {
     $db_list_real = ['all']
   }
   else {
-    $db_list_real = $db_list.unique
+    $db_list_real = $databases.unique
   }
 
   $formats = [ 'plain', 'tar', 'custom' ]