Correct passing of object arguments

Author: kadamwhite

modules/tester/manifests/config.pp

@@ -1,35 +1,55 @@
 # Tester extension for Chassis
 class tester::config (
-	$test_database = undef,
-	$test_database_user = undef,
-	$test_database_password = undef,
-	$test_database_host = undef,
-	$test_database_prefix = 'test_',
+  $test_config = {},
+  $ensure = present,
 ) {
-  if ( ! empty( $::config[disabled_extensions] ) and 'chassis/tester' in $::config[disabled_extensions] ) {
-    $file = absent
-  } else {
-    $file = present
+  # If test DB configuration was provided, pull those values out.
+  $test_database = $test_config[name] ? {
+    /.*/ => $test_config[name],
+    default => undef,
+  }
+  $test_database_user = $test_config[user] ? {
+    /.*/ => $test_config[user],
+    default => undef,
+  }
+  $test_database_password = $test_config[password] ? {
+    /.*/ => $test_config[password],
+    default => 'password',
+  }
+  $test_database_host = $test_config[host] ? {
+    /.*/ => $test_config[host],
+    default => 'localhost',
+  }
+  $test_database_prefix = $test_config[prefix] ? {
+    /.*/ => $test_config[prefix],
+    default => 'test_',
   }
 
   file { '/vagrant/extensions/tester/wpdevel/wp-tests-config.php':
-    ensure  => $file,
+    ensure  => $ensure,
     content => template('tester/wp-tests-config.php.erb')
   }
 
   file { '/etc/profile.d/tester-env.sh':
-    ensure  => $file,
+    ensure  => $ensure,
     content => template('tester/tester-env.sh.erb')
   }
 
-  if ( $file == absent or $test_database ) {
-    file { '/vagrant/local-config-tester.php':
-      ensure  => $file,
-      content => template('tester/local-config-tester.php.erb')
-    }
+  # Determine whether a DB configuration file should exist.
+  if ( absent == $ensure ) {
+    $db_config_file = absent
+  } elsif ( empty( $test_database ) and empty( $test_database_user ) ) {
+    $db_config_file = absent
+  } else {
+    $db_config_file = present
+  }
+
+  file { '/vagrant/local-config-tester.php':
+    ensure  => $db_config_file,
+    content => template('tester/local-config-tester.php.erb')
   }
 
-  if ( present == $file ) {
+  if ( present == $ensure ) {
     exec { 'load_tester_envs':
       path      => '/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin',
       command   => "bash -c 'source /etc/profile.d/tester-env.sh'",

modules/tester/manifests/init.pp

@@ -28,11 +28,9 @@
 		}
 	}
 
-	# Invoke even if tester is disabled in order to clean up templated files.
+	# Invoke even if tester is disabled, in order to clean up templated files.
 	class { 'tester::config':
-		test_database => $config[tester_db][name],
-		test_database_user => $config[tester_db][user],
-		test_database_password => $config[tester_db][password],
-		test_database_host => $config[tester_db][host],
+		test_config => $config[tester_db],
+		ensure      => $tester,
 	}
 }