Push what I've got but we're looking at a table flip

Signed-off-by: Dan Webb <[email protected]>

libraries/helpers.rb

@@ -260,8 +260,7 @@ def mysqld_bin
     end
 
     def mysql_systemd_start_pre
-      return '/usr/bin/mysqld_pre_systemd' if el7? || el8? || fedora?
-      return '/usr/bin/mysql-systemd-start pre' if platform_family?('rhel')
+      return '/usr/bin/mysqld_pre_systemd' if el7? || el8? || fedora? || platform_family?('rhel')
       return '/usr/lib/mysql/mysql-systemd-helper install' if suse?
 
       '/usr/share/mysql/mysql-systemd-start pre'

libraries/mysql_service.rb

@@ -6,14 +6,13 @@ class MysqlService < MysqlServiceBase
 
     # installation type and service_manager
     property :install_method, %w(package auto none), default: 'auto', desired_state: false
-    property :service_manager, %w(sysvinit upstart systemd auto), default: 'auto', desired_state: false
 
     # mysql_server_installation
     property :version, String, default: '8.0', desired_state: false
     property :major_version, String, default: lazy { major_from_full(version) }, desired_state: false
     property :package_name, String, default: lazy { default_package_name }, desired_state: false
-    property :package_options, [String, nil], desired_state: false
-    property :package_version, [String, nil], desired_state: false
+    property :package_options, String, desired_state: false
+    property :package_version, String, desired_state: false
 
     ################
     # Helper Methods
@@ -24,13 +23,12 @@ def copy_properties_to(to, *properties)
       properties.each do |p|
         # If the property is set on from, and exists on to, set the
         # property on to
-        if to.class.properties.include?(p) && property_is_set?(p)
-          to.send(p, send(p))
-        end
+        to.send(p, send(p)) if to.class.properties.include?(p) && property_is_set?(p)
       end
     end
 
     action_class do
+      # rubocop:disable Metrics/MethodLength
       def installation(&block)
         case new_resource.install_method
         when 'auto'
@@ -44,18 +42,10 @@ def installation(&block)
         copy_properties_to(install)
         install
       end
+      # rubocop:enable Metrics/MethodLength
 
       def svc_manager(&block)
-        case new_resource.service_manager
-        when 'auto'
-          svc = mysql_service_manager(new_resource.name, &block)
-        when 'sysvinit'
-          svc = mysql_service_manager_sysvinit(new_resource.name, &block)
-        when 'upstart'
-          svc = mysql_service_manager_upstart(new_resource.name, &block)
-        when 'systemd'
-          svc = mysql_service_manager_systemd(new_resource.name, &block)
-        end
+        svc = mysql_service_manager_systemd(new_resource.name, &block)
         copy_properties_to(svc)
         svc
       end

libraries/mysql_service_manager_systemd.rb

@@ -1,4 +1,6 @@
+# rubocop:disable Style/FrozenStringLiteralComment
 module MysqlCookbook
+  # rubocop:disable Metrics/ClassLength, Style/Documentation
   class MysqlServiceManagerSystemd < MysqlServiceBase
     resource_name :mysql_service_manager_systemd
     provides :mysql_service_manager_systemd
@@ -16,6 +18,7 @@ class MysqlServiceManagerSystemd < MysqlServiceBase
       initialize_database
     end
 
+    # rubocop:disable Metrics/BlockLength
     action :start do
       # Needed for Debian / Ubuntu
       directory '/usr/libexec' do
@@ -38,24 +41,19 @@ class MysqlServiceManagerSystemd < MysqlServiceBase
         action :create
       end
 
-      # this is the main systemd unit file
-      template "/etc/systemd/system/#{mysql_name}.service" do
-        path "/etc/systemd/system/#{mysql_name}.service"
+      # Use an override.conf so that we override the values we care about and
+      # let the package do the heavy lifting
+      # this stops us from breaking during upgrades as we have done before
+      template '/etc/systemd/system/mysqld.service.d/override.conf' do
+        path '/etc/systemd/system/mysqld.service.d/override.conf'
         source 'systemd/mysqld.service.erb'
         owner 'root'
         group 'root'
         mode '0644'
-        variables(
-          config: new_resource,
-          etc_dir: etc_dir,
-          base_dir: base_dir,
-          mysqld_bin: mysqld_bin,
-          mysql_systemd_start_pre: mysql_systemd_start_pre,
-          mysql_systemd: mysql_systemd
-        )
+        variables(config: new_resource)
         cookbook 'mysql'
         notifies :run, "execute[#{new_resource.instance} systemctl daemon-reload]", :immediately
-        action :create
+        action :nothing
       end
 
       # avoid 'Unit file changed on disk' warning
@@ -85,17 +83,18 @@ class MysqlServiceManagerSystemd < MysqlServiceBase
         service_name mysql_name
         provider Chef::Provider::Service::Systemd
         supports restart: true, status: true
-        action [:enable, :start]
+        action %i[enable start]
       end
     end
+    # rubocop:enable Metrics/BlockLength
 
     action :stop do
       # service management resource
       service mysql_name.to_s do
         service_name mysql_name
         provider Chef::Provider::Service::Systemd
         supports status: true
-        action [:disable, :stop]
+        action %i[disable stop]
         only_if { ::File.exist?("/usr/lib/systemd/system/#{mysql_name}.service") }
       end
     end
@@ -126,7 +125,7 @@ def stop_system_service
           service_name system_service_name
           provider Chef::Provider::Service::Systemd
           supports status: true
-          action [:stop, :disable]
+          action %i[disable stop]
         end
       end
 
@@ -136,10 +135,12 @@ def delete_stop_service
           service_name mysql_name
           provider Chef::Provider::Service::Systemd
           supports status: true
-          action [:disable, :stop]
+          action %i[disable stop]
           only_if { ::File.exist?("/usr/lib/systemd/system/#{mysql_name}.service") }
         end
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength, Style/Documentation
 end
+# rubocop:enable Style/FrozenStringLiteralComment

templates/default/systemd/mysqld.service.erb

@@ -1,21 +1,3 @@
-[Unit]
-Description=mysql_service[mysql-<%= @config.instance %>]
-After=syslog.target
-After=network.target
-
 [Service]
-Type=simple
 User=<%= @config.run_user %>
 Group=<%= @config.run_group %>
-PermissionsStartOnly=true
-ExecStartPre=<%= @mysql_systemd_start_pre %>
-
-ExecStart=<%= @mysqld_bin %> --defaults-file=<%= @etc_dir %>/my.cnf --basedir=<%= @base_dir %>
-ExecStartPost=<%= @mysql_systemd %>
-TimeoutSec=300
-Restart=on-failure
-RuntimeDirectory=mysqld
-RuntimeDirectoryMode=755
-
-[Install]
-WantedBy=multi-user.target

test/cookbooks/test/recipes/user_database.rb

@@ -1,7 +1,5 @@
 ::Chef::DSL::Recipe.include MysqlCookbook::HashedPassword::Helper
 
-include_recipe 'test::yum_repo'
-
 # variables
 root_pass = 'arandompassword'
 

test/cookbooks/test/recipes/yum_repo.rb

@@ -1,7 +1,7 @@
 # Before that, we use "native" versions
 
-# unless node['mysql_test'].nil? || platform_family?('debian')
-#   yum_mysql_community_repo 'mysql_repo' do
-#     version node['mysql_test']['version']
-#   end
-# end
+unless node['mysql_test'].nil? || platform_family?('debian')
+  yum_mysql_community_repo 'mysql_repo' do
+    version node['mysql_test']['version']
+  end
+end