Add an acceptance test and fix an edge case with test timing

During upgrade test, checking the admin socket file presence is not enough.
We need to wait it's really ready to accept connections.
The exec is splitted between the two cases :
- Initial run and no .my.cnf file, we build the full mysql cmd
- .my.cnf already exists, we use it

Author: Arakmar

manifests/service.pp

@@ -6,7 +6,7 @@
 
   # systemd unit files replaced use of `init.d` in version 2.0.0 for some operating systems but only in 2.0.7 for CentOS/Redhat
   if (versioncmp($proxysql::version, '2.0.7') >= 0 and fact('os.family') == 'RedHat' and fact('os.name') != 'Amazon')
-  or (versioncmp($proxysql::version, '2')     >= 0 and fact('os.family') == 'Debian') {
+  or (versioncmp($proxysql::version, '2') >= 0 and fact('os.family') == 'Debian') {
     $drop_in_ensure = $proxysql::restart ? {
       true  => 'present',
       false => 'absent',
@@ -53,12 +53,32 @@
     }
   }
 
-  exec { 'wait_for_admin_socket_to_open':
-    command   => "test -S ${proxysql::admin_listen_socket}",
-    unless    => "test -S ${proxysql::admin_listen_socket}",
-    tries     => '3',
-    try_sleep => '10',
-    require   => Service[$proxysql::service_name],
-    path      => '/bin:/usr/bin',
+  $socket_wait_connection_method = $proxysql::admin_listen_socket ? {
+    ''      => "-h ${proxysql::admin_listen_ip} -P ${proxysql::admin_listen_port}",
+    default => "-S ${proxysql::admin_listen_socket}"
+  }
+
+  $wait_exec_params = {
+    tries       => '10',
+    try_sleep   => '2',
+    subscribe   => Service[$proxysql::service_name],
+    refreshonly => true,
+    path        => '/bin:/usr/bin',
+  }
+
+  # It happens that the admin socket is created but not ready (at least during acceptance tests)
+  # This first exec is used for the first run when no .my.cnf file is created yet
+  exec { 'wait_for_admin_socket_availability_no_my_cnf':
+    command     => "mysql -u ${proxysql::admin_username} ${socket_wait_connection_method} -e 'SELECT 1'",
+    environment => ["MYSQL_PWD=${proxysql::admin_password.unwrap}"],
+    unless      => "test -f ${proxysql::mycnf_file_name}",
+    *           => $wait_exec_params,
+  }
+
+  # We prefer to use .my.cnf if available. In case of password change, we need the old credentials.
+  exec { 'wait_for_admin_socket_availability_with_my_cnf':
+    command => "mysql --defaults-extra-file=${proxysql::mycnf_file_name} -e 'SELECT 1'",
+    onlyif  => "test -f ${proxysql::mycnf_file_name}",
+    *       => $wait_exec_params,
   }
 }

spec/acceptance/class_spec.rb

@@ -35,6 +35,44 @@ class { 'proxysql':
     end
   end
 
+  context 'Upgrading to version 3.0' do
+    it 'works idempotently with no errors' do
+      pp = <<-EOS
+      class { 'proxysql':
+        package_ensure => latest,
+        version        => '3.0.4',
+        admin_password => Sensitive('new-admin-password'),
+      }
+      EOS
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
+
+      # Run it again, this time relying on proxysql_version fact
+      pp = <<-EOS
+      class { 'proxysql':
+        admin_password => Sensitive('new-admin-password'),
+      }
+      EOS
+      apply_manifest(pp, catch_changes: true)
+    end
+
+    describe package('proxysql') do
+      it { is_expected.to be_installed }
+    end
+
+    describe service('proxysql') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe command('proxysql --version') do
+      its(:exit_status) { is_expected.to eq 0 }
+      its(:stdout) { is_expected.to match %r{^ProxySQL version 3\.0\.} }
+    end
+  end
+
   context 'extended testing' do
     # Using puppet_apply as a helper
     it 'works idempotently with no errors' do

spec/classes/proxysql_spec.rb

@@ -51,6 +51,7 @@
           sys_group = 'proxysql'
 
           admin_socket = '/tmp/proxysql_admin.sock'
+          my_cnf_path = '/root/.my.cnf'
 
           it do
             is_expected.to contain_file('proxysql-config-file').with(ensure: 'file',
@@ -73,7 +74,7 @@
                                                                 owner: sys_user,
                                                                 group: sys_group,
                                                                 mode: '0400',
-                                                                path: '/root/.my.cnf')
+                                                                path: my_cnf_path)
           end
 
           it do
@@ -85,15 +86,29 @@
           it { is_expected.to contain_service('proxysql').with_hasrestart(true) }
 
           it do
-            is_expected.to contain_exec('wait_for_admin_socket_to_open').with(
-              command: "test -S #{admin_socket}",
-              unless: "test -S #{admin_socket}",
-              tries: 3,
-              try_sleep: 10,
-              require: 'Service[proxysql]',
-              path: '/bin:/usr/bin'
+            is_expected.to contain_exec('wait_for_admin_socket_availability_no_my_cnf').with(
+              command: "mysql -u admin -S #{admin_socket} -e 'SELECT 1'",
+              unless: "test -f #{my_cnf_path}",
+              environment: ["MYSQL_PWD=admin"],
+              tries: '10',
+              try_sleep: '2',
+              subscribe: 'Service[proxysql]',
+              refreshonly: true,
+              path: '/bin:/usr/bin',
             )
           end
+
+          it do
+            is_expected.to contain_exec('wait_for_admin_socket_availability_with_my_cnf').with(
+              command: "mysql --defaults-extra-file=#{my_cnf_path} -e 'SELECT 1'",
+              onlyif: "test -f #{my_cnf_path}",
+              tries: '10',
+              try_sleep: '2',
+              subscribe: 'Service[proxysql]',
+              refreshonly: true,
+              path: '/bin:/usr/bin',
+              )
+          end
         end
 
         context 'with parameter datadir_mode set' do