Merge branch 'master' into allow-adapt-config-file-permissions

Author: carabasdaniel

.github/workflows/release.yml

@@ -7,7 +7,9 @@ on:
 
 jobs:
   LitmusAcceptance:
-
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
     runs-on: self-hosted
 
     strategy:

.sync.yml

@@ -8,6 +8,8 @@
     - rubocop-i18n
     - rubocop-rspec
 ".travis.yml":
+  global_env: 
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
   deploy_to_forge:
     enabled: false
   branches:
@@ -67,10 +69,10 @@
     stage: acceptance
   - bundler_args: 
     dist: trusty
-    env: PLATFORMS=el7_puppet5
+    env: PLATFORMS=el6_puppet5
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[travis_el7]'
+    - bundle exec rake 'litmus:provision_list[travis_el6]'
     - bundle exec rake 'litmus:install_agent[puppet5]'
     - bundle exec rake litmus:install_module
     script:
@@ -80,10 +82,10 @@
     stage: acceptance
   - bundler_args: 
     dist: trusty
-    env: PLATFORM=el7_puppet6
+    env: PLATFORM=el6_puppet6
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[travis_el7]'
+    - bundle exec rake 'litmus:provision_list[travis_el6]'
     - bundle exec rake 'litmus:install_agent[puppet6]'
     - bundle exec rake litmus:install_module
     script:
@@ -93,10 +95,10 @@
     stage: acceptance
   - bundler_args: 
     dist: trusty
-    env: PLATFORMS=el6_puppet5
+    env: PLATFORMS=el7_puppet5
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[travis_el6]'
+    - bundle exec rake 'litmus:provision_list[travis_el7]'
     - bundle exec rake 'litmus:install_agent[puppet5]'
     - bundle exec rake litmus:install_module
     script:
@@ -106,10 +108,10 @@
     stage: acceptance
   - bundler_args: 
     dist: trusty
-    env: PLATFORMS=el6_puppet6
+    env: PLATFORMS=el7_puppet6
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[travis_el6]'
+    - bundle exec rake 'litmus:provision_list[travis_el7]'
     - bundle exec rake 'litmus:install_agent[puppet6]'
     - bundle exec rake litmus:install_module
     script:

.travis.yml

@@ -7,14 +7,18 @@ before_install:
   - rm -f Gemfile.lock
   - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
   - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
-  - '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
+  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
+  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
   - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
+env:
+  global:
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
 stages:
   - static
   - spec
@@ -107,7 +111,7 @@ matrix:
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORM=el7_puppet6
+      env: PLATFORMS=el7_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker

Gemfile

@@ -24,10 +24,10 @@ group :development do
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-lint-i18n",                                        require: false
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end

README.md

@@ -95,6 +95,9 @@ replicate-do-db = base2
 
 To implement version specific parameters, specify the version, such as [mysqld-5.5]. This allows one config for different versions of MySQL.
 
+If you don’t want to use the default configuration, you can also supply your options to the `$options` parameter instead of `$override_options`.
+Please note that `$options` and `$override_options` are mutually exclusive, you can only use one of them.
+
 ### Create a database
 
 To create a database with a user and some assigned privileges:
@@ -250,19 +253,19 @@ Class['mysql::bindings']
 
 #### Optional: Install the MariaDB official repo
 
-In this example, we'll use the latest stable (currently 10.1) from the official MariaDB repository, not the one from the distro repository. You could instead use the package from the Ubuntu repository. Make sure you use the repository corresponding to the version you want.
+In this example, we'll use the latest stable (currently 10.3) from the official MariaDB repository, not the one from the distro repository. You could instead use the package from the Ubuntu repository. Make sure you use the repository corresponding to the version you want.
 
 **Note:** `sfo1.mirrors.digitalocean.com` is one of many mirrors available. You can use any official mirror.
 
 ```puppet
 include apt
 
 apt::source { 'mariadb':
-  location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu',
+  location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.3/ubuntu',
   release  => $::lsbdistcodename,
   repos    => 'main',
   key      => {
-    id     => '199369E5404BD5FC7D2FE43BCBCB082A1BB943DB',
+    id     => '177F4010FE56CA3336300305F1656F24C74CD1D8',
     server => 'hkp://keyserver.ubuntu.com:80',
   },
   include => {
@@ -274,7 +277,7 @@ apt::source { 'mariadb':
 
 #### Install the MariaDB server
 
-This example shows MariaDB server installation on Ubuntu Trusty. Adjust the version and the parameters of `my.cnf` as needed. All parameters of the `my.cnf` can be defined using the `override_options` parameter.
+This example shows MariaDB server installation on Ubuntu Xenial. Adjust the version and the parameters of `my.cnf` as needed. All parameters of the `my.cnf` can be defined using the `override_options` parameter.
 
 The folders `/var/log/mysql` and `/var/run/mysqld` are created automatically, but if you are using other custom folders, they should exist as prerequisites for this code.
 
@@ -285,8 +288,8 @@ Specify the version of the package you want with the `package_ensure` parameter.
 ```puppet
 class {'::mysql::server':
   package_name     => 'mariadb-server',
-  package_ensure   => '10.1.14+maria-1~trusty',
-  service_name     => 'mysql',
+  package_ensure   => '1:10.3.21+maria~xenial',
+  service_name     => 'mysqld',
   root_password    => 'AVeryStrongPasswordUShouldEncrypt!',
   override_options => {
     mysqld => {
@@ -316,7 +319,7 @@ Specify the version of the package you want with the `package_ensure` parameter.
 ```puppet
 class {'::mysql::client':
   package_name    => 'mariadb-client',
-  package_ensure  => '10.1.14+maria-1~trusty',
+  package_ensure  => '1:10.3.21+maria~xenial',
   bindings_enable => true,
 }
 

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'

locales/puppetlabs-mysql.pot

@@ -77,6 +77,12 @@ msgid ""
 "future release."
 msgstr ""
 
+#. ./manifests/server.pp:122
+msgid ""
+"You can\'t specify $options and $override_options simultaneously, see the "
+"README section \'Customize server options\'!"
+msgstr ""
+
 #: ./lib/puppet/parser/functions/mysql_deepmerge.rb:22
 msgid ""
 "mysql_deepmerge(): wrong number of arguments (%{args_length}; must be at "

manifests/server.pp

@@ -21,6 +21,8 @@
 #   Path to secret file containing temporary root password.
 # @param manage_config_file
 #   Whether the MySQL configuration file should be managed. Valid values are `true`, `false`. Defaults to `true`.
+# @param options
+#   A hash of options structured like the override_options, but not merged with the default options. Use this if you don’t want your options merged with the default options.
 # @param override_options
 #   Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file:  See  above for usage details.
 # @param package_ensure
@@ -67,38 +69,38 @@
 #   This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter above for details on changing the root password.
 #
 class mysql::server (
-  $config_file             = $mysql::params::config_file,
-  $config_file_mode        = $mysql::params::config_file_mode,
-  $includedir              = $mysql::params::includedir,
-  $install_options         = undef,
-  $install_secret_file     = $mysql::params::install_secret_file,
-  $manage_config_file      = $mysql::params::manage_config_file,
-  $override_options        = {},
-  $package_ensure          = $mysql::params::server_package_ensure,
-  $package_manage          = $mysql::params::server_package_manage,
-  $package_name            = $mysql::params::server_package_name,
-  $purge_conf_dir          = $mysql::params::purge_conf_dir,
-  $remove_default_accounts = false,
-  $restart                 = $mysql::params::restart,
-  $root_group              = $mysql::params::root_group,
-  $mysql_group             = $mysql::params::mysql_group,
-  $root_password           = $mysql::params::root_password,
-  $service_enabled         = $mysql::params::server_service_enabled,
-  $service_manage          = $mysql::params::server_service_manage,
-  $service_name            = $mysql::params::server_service_name,
-  $service_provider        = $mysql::params::server_service_provider,
-  $create_root_user        = $mysql::params::create_root_user,
-  $create_root_my_cnf      = $mysql::params::create_root_my_cnf,
-  $create_root_login_file  = $mysql::params::create_root_login_file,
-  $login_file              = $mysql::params::login_file,
-  $users                   = {},
-  $grants                  = {},
-  $databases               = {},
-
-  # Deprecated parameters
-  $enabled                 = undef,
-  $manage_service          = undef,
-  $old_root_password       = undef
+                  $config_file             = $mysql::params::config_file,
+                  $config_file_mode        = $mysql::params::config_file_mode,
+                  $includedir              = $mysql::params::includedir,
+                  $install_options         = undef,
+                  $install_secret_file     = $mysql::params::install_secret_file,
+                  $manage_config_file      = $mysql::params::manage_config_file,
+  Mysql::Options  $options                 = {},
+                  $override_options        = {},
+                  $package_ensure          = $mysql::params::server_package_ensure,
+                  $package_manage          = $mysql::params::server_package_manage,
+                  $package_name            = $mysql::params::server_package_name,
+                  $purge_conf_dir          = $mysql::params::purge_conf_dir,
+                  $remove_default_accounts = false,
+                  $restart                 = $mysql::params::restart,
+                  $root_group              = $mysql::params::root_group,
+                  $mysql_group             = $mysql::params::mysql_group,
+                  $root_password           = $mysql::params::root_password,
+                  $service_enabled         = $mysql::params::server_service_enabled,
+                  $service_manage          = $mysql::params::server_service_manage,
+                  $service_name            = $mysql::params::server_service_name,
+                  $service_provider        = $mysql::params::server_service_provider,
+                  $create_root_user        = $mysql::params::create_root_user,
+                  $create_root_my_cnf      = $mysql::params::create_root_my_cnf,
+                  $create_root_login_file  = $mysql::params::create_root_login_file,
+                  $login_file              = $mysql::params::login_file,
+                  $users                   = {},
+                  $grants                  = {},
+                  $databases               = {},
+                  # Deprecated parameters
+                  $enabled                 = undef,
+                  $manage_service          = undef,
+                  $old_root_password       = undef
 ) inherits mysql::params {
 
   # Deprecated parameters.
@@ -118,8 +120,16 @@
     warning(translate('The `old_root_password` attribute is no longer used and will be removed in a future release.'))
   }
 
-  # Create a merged together set of options.  Rightmost hashes win over left.
-  $options = mysql::normalise_and_deepmerge($mysql::params::default_options, $override_options)
+  if ! empty($options) and ! empty($override_options) {
+    fail(translate('You can\'t specify $options and $override_options simultaneously, see the README section \'Customize server options\'!'))
+  }
+
+  # If override_options are set, create a merged together set of options. Rightmost hashes win over left.
+  # If options are set, just use them.
+  $_options = empty($options) ? {
+    true  => mysql::normalise_and_deepmerge($mysql::params::default_options, $override_options),
+    false => $options,
+  }
 
   Class['mysql::server::root_password'] -> Mysql::Db <| |>
 

manifests/server/binarylog.pp

@@ -5,7 +5,7 @@
 #
 class mysql::server::binarylog {
 
-  $options = $mysql::server::options
+  $options = $mysql::server::_options
   $includedir = $mysql::server::includedir
 
   $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false)

manifests/server/config.pp

@@ -5,7 +5,7 @@
 #
 class mysql::server::config {
 
-  $options = $mysql::server::options
+  $options = $mysql::server::_options
   $includedir = $mysql::server::includedir
 
   File {