Merge pull request #489 from xcompass/exported-resource-mysql-db

Allow to use different name for db resource other than db name

Author: igalic

README.md

@@ -434,6 +434,25 @@ Creates a database with a user and assigns some privileges.
     }
 ```
 
+Or using a different resource name with exported resources,
+
+```puppet
+    @@mysql::db { "mydb_${fqdn}":
+      user     => 'myuser',
+      password => 'mypass',
+      dbname   => 'mydb',
+      host     => ${fqdn},
+      grant    => ['SELECT', 'UPDATE'],
+      tag      => $domain,
+    }
+```
+
+Then collect it on the remote DB server.
+
+```puppet
+    Mysql::Db <<| tag == $domain |>>
+```
+
 ###Providers
 
 ####mysql_database

manifests/db.pp

@@ -2,6 +2,7 @@
 define mysql::db (
   $user,
   $password,
+  $dbname      = $name,
   $charset     = 'utf8',
   $collate     = 'utf8_general_ci',
   $host        = 'localhost',
@@ -13,18 +14,18 @@
   #input validation
   validate_re($ensure, '^(present|absent)$',
   "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  $table = "${name}.*"
+  $table = "${dbname}.*"
 
   include '::mysql::client'
 
-  mysql_database { $name:
+  $db_resource = {
     ensure   => $ensure,
     charset  => $charset,
     collate  => $collate,
     provider => 'mysql',
     require  => [ Class['mysql::server'], Class['mysql::client'] ],
-    before   => Mysql_user["${user}@${host}"],
   }
+  ensure_resource('mysql_database', $dbname, $db_resource)
 
   $user_resource = {
     ensure        => $ensure,
@@ -40,19 +41,19 @@
       provider   => 'mysql',
       user       => "${user}@${host}",
       table      => $table,
-      require    => [ Mysql_user["${user}@${host}"], Class['mysql::server'] ],
+      require    => [Mysql_database[$dbname], Mysql_user["${user}@${host}"], Class['mysql::server'] ],
     }
 
     $refresh = ! $enforce_sql
 
     if $sql {
-      exec{ "${name}-import":
-        command     => "/usr/bin/mysql ${name} < ${sql}",
+      exec{ "${dbname}-import":
+        command     => "/usr/bin/mysql ${dbname} < ${sql}",
         logoutput   => true,
         environment => "HOME=${::root_home}",
         refreshonly => $refresh,
         require     => Mysql_grant["${user}@${host}/${table}"],
-        subscribe   => Mysql_database[$name],
+        subscribe   => Mysql_database[$dbname],
       }
     }
   }

spec/acceptance/mysql_db_spec.rb

@@ -46,4 +46,26 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
       expect(shell("mysql -e 'show tables;' spec2|grep table1").exit_code).to be_zero
     end
   end
+
+  describe 'creating a database with dbname parameter' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      pp = <<-EOS
+        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
+        mysql::db { 'spec1':
+          user     => 'root1',
+          password => 'password',
+	  dbname   => 'realdb',
+        }
+      EOS
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    it 'should have the database named realdb' do
+      expect(shell("mysql -e 'show databases;'|grep realdb").exit_code).to be_zero
+    end
+  end
 end

spec/defines/mysql_db_spec.rb

@@ -48,4 +48,9 @@
       'collate' => 'utf8_danish_ci',
     })
   end
+
+  it 'should use dbname parameter as database name instead of name' do
+    params.merge!({'dbname' => 'real_db'})
+    should contain_mysql_database('real_db')
+  end
 end

spec/system/mysql_db_spec.rb

@@ -58,4 +58,31 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
       end
     end
   end
+
+  describe 'creating a database with dbname parameter' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      pp = <<-EOS
+        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
+        mysql::db { 'spec1':
+          user     => 'root1',
+          password => 'password',
+	  dbname   => 'realdb',
+        }
+      EOS
+
+      # Run it twice and test for idempotency
+      puppet_apply(pp) do |r|
+        [0,2].should include r.exit_code
+        r.refresh
+        r.exit_code.should be_zero
+      end
+    end
+
+    it 'should have the database' do
+      shell("mysql -e 'show databases;'|grep realdb") do |s|
+        s.exit_code.should be_zero
+      end
+    end
+  end
 end

tests/mysql_db.pp

@@ -0,0 +1,17 @@
+class { 'mysql::server':
+  config_hash => {'root_password' => 'password'}
+}
+mysql::db { 'mydb':
+  user     => 'myuser',
+  password => 'mypass',
+  host     => 'localhost',
+  grant    => ['SELECT', 'UPDATE'],
+}
+mysql::db { "mydb_${fqdn}":
+  user     => 'myuser',
+  password => 'mypass',
+  dbname   => 'mydb',
+  host     => ${fqdn},
+  grant    => ['SELECT', 'UPDATE'],
+  tag      => $domain,
+}