Merge pull request #930 from bastelfreak/puppet4

replace validate_* with datatypes in db.pp

Author: hunner

manifests/db.pp

@@ -2,26 +2,20 @@
 define mysql::db (
   $user,
   $password,
-  $dbname         = $name,
-  $charset        = 'utf8',
-  $collate        = 'utf8_general_ci',
-  $host           = 'localhost',
-  $grant          = 'ALL',
-  $sql            = undef,
-  $enforce_sql    = false,
-  $ensure         = 'present',
-  $import_timeout = 300,
-  $import_cat_cmd = 'cat',
+  $dbname                                     = $name,
+  $charset                                    = 'utf8',
+  $collate                                    = 'utf8_general_ci',
+  $host                                       = 'localhost',
+  $grant                                      = 'ALL',
+  Optional[Variant[Array, Hash, String]] $sql = undef,
+  $enforce_sql                                = false,
+  Enum['absent', 'present'] $ensure           = 'present',
+  $import_timeout                             = 300,
+  $import_cat_cmd                             = 'cat',
 ) {
   #input validation
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
   $table = "${dbname}.*"
 
-  if !(is_array($sql) or is_string($sql)) {
-    fail('$sql must be either a string or an array.')
-  }
-
   $sql_inputs = join([$sql], ' ')
 
   include '::mysql::client'

metadata.json

@@ -72,7 +72,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 4.7.0 < 5.0.0"
     }
   ],
   "description": "MySQL module"

spec/defines/mysql_db_spec.rb

@@ -17,12 +17,6 @@
         }
       }
 
-      it 'should report an error when ensure is not present or absent' do
-        params.merge!({'ensure' => 'invalid_val'})
-        expect { catalogue }.to raise_error(Puppet::Error,
-                                          /invalid_val is not supported for ensure\. Allowed values are 'present' and 'absent'\./)
-      end
-
       it 'should not notify the import sql exec if no sql script was provided' do
         is_expected.to contain_mysql_database('test_db').without_notify
       end
@@ -54,12 +48,6 @@
         is_expected.to contain_exec('test_db-import').with_command('cat test_sql test_2_sql | mysql test_db')
       end
 
-      it 'should report an error if sql isn\'t a string or an array' do
-        params.merge!({'sql' => {'foo' => 'test_sql', 'bar' => 'test_2_sql'}})
-        expect { catalogue }.to raise_error(Puppet::Error,
-                                          /\$sql must be either a string or an array\./)
-      end
-
       it 'should not create database and database user' do
         params.merge!({'ensure' => 'absent', 'host' => 'localhost'})
         is_expected.to contain_mysql_database('test_db').with_ensure('absent')

spec/unit/puppet/functions/mysql_deepmerge_spec.rb

@@ -24,11 +24,6 @@
   end
 
   describe 'when calling mysql_deepmerge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_mysql_deepmerge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_mysql_deepmerge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
     it 'should accept empty strings as puppet undef' do
       expect { new_hash = scope.function_mysql_deepmerge([{}, ''])}.not_to raise_error
     end