Add database connection helper

.kitchen.yml

@@ -20,14 +20,20 @@ platforms:
     image: centos-7-0-x64
 
 - name: ubuntu-12.04
+  run_list:
+    - recipe[apt]
   driver:
     box: bento/ubuntu-12.04
     image: ubuntu-12-04-x64
 - name: ubuntu-14.04
+  run_list:
+    - recipe[apt]
   driver:
     box: bento/ubuntu-14.04
     image: ubuntu-14-04-x64
 - name: ubuntu-15.04
+  run_list:
+    - recipe[apt]
   driver:
     box: bento/ubuntu-15.04
     image: ubuntu-15-04-x64

Berksfile

@@ -2,4 +2,5 @@ source 'https://supermarket.chef.io'
 
 metadata
 
+cookbook 'apt'
 cookbook 'java'

CHANGELOG.md

@@ -6,6 +6,8 @@
   [[GH-40]](https://github.com/bflad/chef-confluence/issues/40)
 * Added Crowd SSO support.
   [[GH-26]](https://github.com/parallels-cookbooks/confluence/pull/26)
+* Create database connection helper.
+  [[GH-61]](https://github.com/parallels-cookbooks/confluence/pull/61)
 
 ## 1.7.1
 

libraries/helpers.rb

@@ -36,6 +36,26 @@ def confluence_version
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
+    def confluence_database_connection
+      settings = merge_confluence_settings
+
+      database_connection = {
+        :host => settings['database']['host'],
+        :port => settings['database']['port']
+      }
+
+      case settings['database']['type']
+      when 'mysql'
+        database_connection.merge!(:username => 'root', :password => node['mysql']['server_root_password'])
+      when 'postgresql'
+        database_connection.merge!(:username => 'postgres', :password => node['postgresql']['password']['postgres'])
+      end
+
+      database_connection
+    end
+    # rubocop:enable Metrics/AbcSize
+
     # Merges Confluence settings from data bag and node attributes.
     # Data dag settings always has a higher priority.
     #
@@ -244,3 +264,4 @@ def confluence_checksum_map
 end
 
 ::Chef::Recipe.send(:include, Confluence::Helpers)
+::Chef::Resource.send(:include, Confluence::Helpers)

recipes/database.rb

@@ -19,11 +19,6 @@
 
 settings = merge_confluence_settings
 
-database_connection = {
-  :host => settings['database']['host'],
-  :port => settings['database']['port']
-}
-
 case settings['database']['type']
 when 'mysql'
   mysql2_chef_gem 'confluence' do
@@ -40,24 +35,22 @@
     action [:create, :start]
   end
 
-  database_connection.merge!(:username => 'root', :password => node['mysql']['server_root_password'])
-
   mysql_database settings['database']['name'] do
-    connection database_connection
+    connection confluence_database_connection
     collation 'utf8_bin'
     encoding 'utf8'
     action :create
   end
 
   # See this MySQL bug: http://bugs.mysql.com/bug.php?id=31061
   mysql_database_user '' do
-    connection database_connection
+    connection confluence_database_connection
     host 'localhost'
     action :drop
   end
 
   mysql_database_user settings['database']['user'] do
-    connection database_connection
+    connection confluence_database_connection
     host '%'
     password settings['database']['password']
     database_name settings['database']['name']
@@ -67,16 +60,15 @@
 when 'postgresql'
   include_recipe 'postgresql::server'
   include_recipe 'database::postgresql'
-  database_connection.merge!(:username => 'postgres', :password => node['postgresql']['password']['postgres'])
 
   postgresql_database_user settings['database']['user'] do
-    connection database_connection
+    connection confluence_database_connection
     password settings['database']['password']
     action :create
   end
 
   postgresql_database settings['database']['name'] do
-    connection database_connection
+    connection confluence_database_connection
     connection_limit '-1'
     encoding 'utf8'
     owner settings['database']['user']