Supporting version and action configuration for mysql package

Signed-off-by: Sean OMeara <[email protected]>

Author: runwaldarshu

.rubocop.yml

@@ -25,5 +25,12 @@ PerceivedComplexity:
 CyclomaticComplexity:
   Enabled: false
 
+PerceivedComplexity:
+  Enabled: false
+
 Style/FileName:
-  Enabled: false
+  Enabled: false
+
+AllCops:
+  Exclude:
+    - 'Guardfile'

attributes/default.rb

@@ -20,3 +20,7 @@
 
 # port
 default['mysql']['port'] = '3306'
+
+# server package version and action
+default['mysql']['server_package_version'] = nil
+default['mysql']['server_package_action'] = 'install'

libraries/provider_mysql_service_fedora.rb

@@ -16,7 +16,8 @@ def whyrun_supported?
 
         action :create do
           package new_resource.parsed_package_name do
-            action :install
+            action new_resource.parsed_package_action
+            version new_resource.parsed_package_version
           end
 
           directory include_dir do

libraries/provider_mysql_service_rhel.rb

@@ -30,7 +30,8 @@ def whyrun_supported?
           end
 
           package new_resource.parsed_package_name do
-            action :install
+            action new_resource.parsed_package_action
+            version new_resource.parsed_package_version
           end
 
           directory include_dir do

libraries/provider_mysql_service_ubuntu.rb

@@ -46,7 +46,8 @@ def whyrun_supported?
           # package automatically initializes database and starts service.
           # ... because that's totally super convenient.
           package new_resource.parsed_package_name do
-            action :install
+            action new_resource.parsed_package_action
+            version new_resource.parsed_package_version
           end
 
           # service

libraries/resource_mysql_service.rb

@@ -21,6 +21,8 @@ class MysqlService < Chef::Resource::LWRPBase
       attribute :service_name, :kind_of => String, :name_attribute => true
       attribute :template_source, :kind_of => String, :default => nil
       attribute :version, :kind_of => String, :default => nil
+      attribute :package_version, :kind_of => String, :default => nil
+      attribute :package_action, :kind_of => String, :default => nil
     end
 
     include Opscode::Mysql::Helpers
@@ -52,6 +54,14 @@ def parsed_package_name
         )
     end
 
+    def parsed_package_version
+      return package_version if package_version
+    end
+
+    def parsed_package_action
+      return package_action if package_action
+    end
+
     def parsed_port
       return port if port
     end

recipes/server.rb

@@ -28,6 +28,7 @@
   remove_anonymous_users node['mysql']['remove_anonymous_users']
   remove_test_database node['mysql']['remove_test_database']
   root_network_acl node['mysql']['root_network_acl']
-  version node['mysql']['version']
+  package_version node['mysql']['server_package_version']
+  package_action node['mysql']['server_package_action']
   action :create
 end

spec/unit/mysql_server/fedora/19/custom_stepinto_spec.rb

@@ -139,4 +139,78 @@
       expect(fedora_19_custom_run).to write_log('notify reload')
     end
   end
+
+  context 'when using non-default package_version parameter' do
+    let(:package_version) { '5.5.35-1.el6' }
+    let(:fedora_19_custom_run) do
+      ChefSpec::Runner.new(
+        :step_into => 'mysql_service',
+        :platform => 'fedora',
+        :version => '19'
+        ) do |node|
+        node.set['mysql']['service_name'] = 'fedora_19_custom'
+        node.set['mysql']['port'] = '3308'
+        node.set['mysql']['data_dir'] = '/data'
+        node.set['mysql']['template_source'] = 'custom.erb'
+        node.set['mysql']['allow_remote_root'] = true
+        node.set['mysql']['remove_anonymous_users'] = false
+        node.set['mysql']['remove_test_database'] = false
+        node.set['mysql']['root_network_acl'] = ['10.9.8.7/6', '1.2.3.4/5']
+        node.set['mysql']['server_root_password'] = 'YUNOSETPASSWORD'
+        node.set['mysql']['server_debian_password'] = 'postinstallscriptsarestupid'
+        node.set['mysql']['server_repl_password'] = 'syncmebabyonemoretime'
+        node.set['mysql']['server_package_version'] = package_version
+      end.converge('mysql_test_custom::server')
+    end
+
+    it 'creates mysql_service[fedora_19_custom] with correct package_version' do
+      expect(fedora_19_custom_run).to create_mysql_service('fedora_19_custom').with(
+        :parsed_version => '5.5',
+        :parsed_port => '3308',
+        :parsed_data_dir => '/data',
+        :parsed_package_version => package_version
+        )
+    end
+
+    it 'steps into mysql_service and installs package[community-mysql-server]' do
+      expect(fedora_19_custom_run).to install_package('community-mysql-server').with(:version => package_version)
+    end
+  end
+
+  context 'when using non-default package_action parameter' do
+    let(:package_action) { 'upgrade' }
+    let(:fedora_19_custom_run) do
+      ChefSpec::Runner.new(
+        :step_into => 'mysql_service',
+        :platform => 'fedora',
+        :version => '19'
+        ) do |node|
+        node.set['mysql']['service_name'] = 'fedora_19_custom'
+        node.set['mysql']['port'] = '3308'
+        node.set['mysql']['data_dir'] = '/data'
+        node.set['mysql']['template_source'] = 'custom.erb'
+        node.set['mysql']['allow_remote_root'] = true
+        node.set['mysql']['remove_anonymous_users'] = false
+        node.set['mysql']['remove_test_database'] = false
+        node.set['mysql']['root_network_acl'] = ['10.9.8.7/6', '1.2.3.4/5']
+        node.set['mysql']['server_root_password'] = 'YUNOSETPASSWORD'
+        node.set['mysql']['server_debian_password'] = 'postinstallscriptsarestupid'
+        node.set['mysql']['server_repl_password'] = 'syncmebabyonemoretime'
+        node.set['mysql']['server_package_action'] = package_action
+      end.converge('mysql_test_custom::server')
+    end
+
+    it 'creates mysql_service[fedora_19_custom] with correct package_action' do
+      expect(fedora_19_custom_run).to create_mysql_service('fedora_19_custom').with(
+        :parsed_version => '5.5',
+        :parsed_port => '3308',
+        :parsed_data_dir => '/data',
+        :parsed_package_action => package_action
+        )
+    end
+
+    it 'steps into mysql_service and upgrades package[community-mysql-server]' do
+      expect(fedora_19_custom_run).to upgrade_package('community-mysql-server')
+    end
+  end
 end

spec/unit/mysql_server/rhel/5/5_5_stepinto_spec.rb

@@ -144,4 +144,80 @@
       expect(centos_5_8_custom3_run).to write_log('notify reload')
     end
   end
+
+  context 'when using non-default package_version parameter' do
+    let(:package_version) { '5.5.35-1.el6' }
+    let(:centos_5_8_custom3_run) do
+      ChefSpec::Runner.new(
+        :step_into => 'mysql_service',
+        :platform => 'centos',
+        :version => '5.8'
+        ) do |node|
+        node.set['mysql']['service_name'] = 'centos_5_8_custom3'
+        node.set['mysql']['version'] = '5.5'
+        node.set['mysql']['port'] = '3308'
+        node.set['mysql']['data_dir'] = '/data'
+        node.set['mysql']['template_source'] = 'custom.erb'
+        node.set['mysql']['allow_remote_root'] = true
+        node.set['mysql']['remove_anonymous_users'] = false
+        node.set['mysql']['remove_test_database'] = false
+        node.set['mysql']['root_network_acl'] = ['10.9.8.7/6', '1.2.3.4/5']
+        node.set['mysql']['server_root_password'] = 'YUNOSETPASSWORD'
+        node.set['mysql']['server_debian_password'] = 'postinstallscriptsarestupid'
+        node.set['mysql']['server_repl_password'] = 'syncmebabyonemoretime'
+        node.set['mysql']['server_package_version'] = package_version
+      end.converge('mysql_test_custom::server')
+    end
+
+    it 'creates mysql_service[centos_5_8_custom3] with correct package_version' do
+      expect(centos_5_8_custom3_run).to create_mysql_service('centos_5_8_custom3').with(
+        :version => '5.5',
+        :port => '3308',
+        :data_dir => '/data',
+        :package_version => package_version
+        )
+    end
+
+    it 'steps into mysql_service and installs package[mysql55-mysql-server]' do
+      expect(centos_5_8_custom3_run).to install_package('mysql55-mysql-server').with(:version => package_version)
+    end
+  end
+
+  context 'when using non-default package_action parameter' do
+    let(:package_action) { 'upgrade' }
+    let(:centos_5_8_custom3_run) do
+      ChefSpec::Runner.new(
+        :step_into => 'mysql_service',
+        :platform => 'centos',
+        :version => '5.8'
+        ) do |node|
+        node.set['mysql']['service_name'] = 'centos_5_8_custom3'
+        node.set['mysql']['version'] = '5.5'
+        node.set['mysql']['port'] = '3308'
+        node.set['mysql']['data_dir'] = '/data'
+        node.set['mysql']['template_source'] = 'custom.erb'
+        node.set['mysql']['allow_remote_root'] = true
+        node.set['mysql']['remove_anonymous_users'] = false
+        node.set['mysql']['remove_test_database'] = false
+        node.set['mysql']['root_network_acl'] = ['10.9.8.7/6', '1.2.3.4/5']
+        node.set['mysql']['server_root_password'] = 'YUNOSETPASSWORD'
+        node.set['mysql']['server_debian_password'] = 'postinstallscriptsarestupid'
+        node.set['mysql']['server_repl_password'] = 'syncmebabyonemoretime'
+        node.set['mysql']['server_package_action'] = package_action
+      end.converge('mysql_test_custom::server')
+    end
+
+    it 'creates mysql_service[centos_5_8_custom3] with correct package_action' do
+      expect(centos_5_8_custom3_run).to create_mysql_service('centos_5_8_custom3').with(
+        :version => '5.5',
+        :port => '3308',
+        :data_dir => '/data',
+        :package_action => package_action
+        )
+    end
+
+    it 'steps into mysql_service and upgrades package[mysql55-mysql-server]' do
+      expect(centos_5_8_custom3_run).to upgrade_package('mysql55-mysql-server')
+    end
+  end
 end

spec/unit/mysql_server/ubuntu/10.04/custom_stepinto_spec.rb

@@ -196,4 +196,78 @@
       expect(ubuntu_10_04_custom_run).to write_log('notify reload')
     end
   end
+
+  context 'when using non-default package_version parameter' do
+    let(:package_version) { '5.1.73-1.el6' }
+    let(:ubuntu_10_04_custom_run) do
+      ChefSpec::Runner.new(
+        :step_into => 'mysql_service',
+        :platform => 'ubuntu',
+        :version => '10.04'
+        ) do |node|
+        node.set['mysql']['service_name'] = 'ubuntu_10_04_custom'
+        node.set['mysql']['port'] = '3308'
+        node.set['mysql']['data_dir'] = '/data'
+        node.set['mysql']['template_source'] = 'custom.erb'
+        node.set['mysql']['allow_remote_root'] = true
+        node.set['mysql']['remove_anonymous_users'] = false
+        node.set['mysql']['remove_test_database'] = false
+        node.set['mysql']['root_network_acl'] = ['10.9.8.7/6', '1.2.3.4/5']
+        node.set['mysql']['server_root_password'] = 'YUNOSETPASSWORD'
+        node.set['mysql']['server_debian_password'] = 'postinstallscriptsarestupid'
+        node.set['mysql']['server_repl_password'] = 'syncmebabyonemoretime'
+        node.set['mysql']['server_package_version'] = package_version
+      end.converge('mysql_test_custom::server')
+    end
+
+    it 'creates mysql_service[ubuntu_10_04_custom] with correct package_version' do
+      expect(ubuntu_10_04_custom_run).to create_mysql_service('ubuntu_10_04_custom').with(
+        :parsed_version => '5.1',
+        :parsed_port => '3308',
+        :parsed_data_dir => '/data',
+        :parsed_package_version => package_version
+        )
+    end
+
+    it 'steps into mysql_service and installs package[mysql-server-5.1]' do
+      expect(ubuntu_10_04_custom_run).to install_package('mysql-server-5.1').with(:version => package_version)
+    end
+  end
+
+  context 'when using non-default package_action parameter' do
+    let(:package_action) { 'upgrade' }
+    let(:ubuntu_10_04_custom_run) do
+      ChefSpec::Runner.new(
+        :step_into => 'mysql_service',
+        :platform => 'ubuntu',
+        :version => '10.04'
+        ) do |node|
+        node.set['mysql']['service_name'] = 'ubuntu_10_04_custom'
+        node.set['mysql']['port'] = '3308'
+        node.set['mysql']['data_dir'] = '/data'
+        node.set['mysql']['template_source'] = 'custom.erb'
+        node.set['mysql']['allow_remote_root'] = true
+        node.set['mysql']['remove_anonymous_users'] = false
+        node.set['mysql']['remove_test_database'] = false
+        node.set['mysql']['root_network_acl'] = ['10.9.8.7/6', '1.2.3.4/5']
+        node.set['mysql']['server_root_password'] = 'YUNOSETPASSWORD'
+        node.set['mysql']['server_debian_password'] = 'postinstallscriptsarestupid'
+        node.set['mysql']['server_repl_password'] = 'syncmebabyonemoretime'
+        node.set['mysql']['server_package_action'] = package_action
+      end.converge('mysql_test_custom::server')
+    end
+
+    it 'creates mysql_service[ubuntu_10_04_custom] with correct package_action' do
+      expect(ubuntu_10_04_custom_run).to create_mysql_service('ubuntu_10_04_custom').with(
+        :parsed_version => '5.1',
+        :parsed_port => '3308',
+        :parsed_data_dir => '/data',
+        :parsed_package_action => package_action
+        )
+    end
+
+    it 'steps into mysql_service and upgrades package[mysql-server-5.1]' do
+      expect(ubuntu_10_04_custom_run).to upgrade_package('mysql-server-5.1')
+    end
+  end
 end

test/fixtures/cookbooks/mysql_test_custom/recipes/server.rb

@@ -11,6 +11,8 @@
   server_root_password node['mysql']['server_root_password']
   server_debian_password node['mysql']['server_debian_password']
   server_repl_password node['mysql']['server_repl_password']
+  package_version node['mysql']['server_package_version']
+  package_action node['mysql']['server_package_action']
   action :create
 end