Merge branch 'main' into backup-fix-excluded-dbs

Author: BuJo

Diff for: .github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-        bundle exec matrix_from_metadata_v2 
+        bundle exec matrix_from_metadata_v2 --exclude-platforms '["Ubuntu-22.04-arm", "RedHat-9-arm"]'
 
   Acceptance:
     name: "${{matrix.platforms.label}}, ${{matrix.collection}}"

Diff for: .github/workflows/labeller.yml

@@ -6,7 +6,7 @@ on:
       - opened
       - labeled
       - unlabeled
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - labeled

Diff for: .github/workflows/nightly.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-        bundle exec matrix_from_metadata_v2 
+        bundle exec matrix_from_metadata_v2 --exclude-platforms '["Ubuntu-22.04-arm", "RedHat-9-arm"]'
 
   Acceptance:
     name: "${{matrix.platforms.label}}, ${{matrix.collection}}"

Diff for: README.md

@@ -659,7 +659,7 @@ The MySQL module has an example task that allows a user to execute arbitary SQL
 
 ## Limitations
 
-For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/main/metadata.json)
+This module lacks compatibility with the ARM architecture, for an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/main/metadata.json)
 
 **Note:** The mysqlbackup.sh does not work and is not supported on MySQL 5.7 and greater.
 

Diff for: lib/puppet/functions/mysql/innobackupex_args.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
-# @summary this function populates and returns the string of arguments which later gets injected in template.
-# arguments that return string holds is conditional and decided by the the input given to function.
-
+# @summary
+#   This function populates and returns the string of arguments which later gets injected in template. Arguments that return string holds is conditional and decided by the the input given to function.
+#
 Puppet::Functions.create_function(:'mysql::innobackupex_args') do
-  # @param args
-  #   String backupuser
-  #   Boolean backupcompress
-  #   String backuppassword_unsensitive
-  #   Array backupdatabases
-  #   Array optional_args
+  # @param backupuser
+  #   The user to use for the backup.
+  # @param backupcompress
+  #   If the backup should be compressed.
+  # @param backuppassword_unsensitive
+  #   The password to use for the backup.
+  # @param backupdatabases
+  #   The databases to backup.
+  # @param optional_args
+  #   Additional arguments to pass to innobackupex.
   #
   # @return String
   #   Generated on the basis of provided values.

Diff for: lib/puppet/functions/mysql/password.rb

@@ -22,7 +22,7 @@
   def password(password, sensitive = false)
     password = password.unwrap if password.is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive)
 
-    result_string = if %r{\*[A-F0-9]{40}$}.match?(password)
+    result_string = if %r{^\*[A-F0-9]{40}$}.match?(password)
                       password
                     elsif password.empty?
                       ''

Diff for: manifests/db.pp

@@ -51,8 +51,8 @@
   Variant[String, Sensitive[String]]             $password,
   Optional[Array[String[1]]]                     $tls_options     = undef,
   String                                         $dbname          = $name,
-  String[1]                                      $charset         = 'utf8',
-  String[1]                                      $collate         = 'utf8_general_ci',
+  String[1]                                      $charset         = 'utf8mb3',
+  String[1]                                      $collate         = 'utf8mb3_general_ci',
   String[1]                                      $host            = 'localhost',
   Variant[String[1], Array[String[1]]]           $grant           = 'ALL',
   Optional[Variant[String[1], Array[String[1]]]] $grant_options   = undef,

Diff for: manifests/params.pp

@@ -435,7 +435,6 @@
       'basedir'               => $mysql::params::basedir,
       'bind-address'          => '127.0.0.1',
       'datadir'               => $mysql::params::datadir,
-      'expire_logs_days'      => '10',
       'key_buffer_size'       => '16M',
       'log-error'             => $mysql::params::log_error,
       'max_allowed_packet'    => '16M',

Diff for: spec/acceptance/00_mysql_server_spec.rb

@@ -63,9 +63,9 @@ class { '::mysql::server':
       end
 
       it 'can be set' do
-        apply_manifest(pp, catch_failures: true) do |r|
-          expect(r.stderr).to be_empty
-        end
+        # TODO : Returning warning message while running above manifest
+        # Warning: Facter: Container runtime, 'docker', is unsupported, setting to, 'container_other'
+        apply_manifest(pp)
       end
     end
   end

Diff for: spec/functions/mysql_password_spec.rb

@@ -36,6 +36,10 @@
     expect(subject).to run.with_params('').and_return('')
   end
 
+  it 'converts the password when its given in caps with * sign' do
+    expect(subject).to run.with_params('AFDJKFD1*94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29').and_return('*91FF6DD4E1FC57D2EFC57F49552D0596F7D46BAF')
+  end
+
   it 'does not convert a password that is already a hash' do
     expect(subject).to run.with_params('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19').and_return('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19')
   end