diff -pruN 8.1.0-7/.geppetto-rc.json 15.0.0-3/.geppetto-rc.json --- 8.1.0-7/.geppetto-rc.json 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.geppetto-rc.json 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,9 @@ +{ + "excludes": [ + "**/contrib/**", + "**/examples/**", + "**/tests/**", + "**/spec/**", + "**/pkg/**" + ] +} diff -pruN 8.1.0-7/.github/pull_request_template.md 15.0.0-3/.github/pull_request_template.md --- 8.1.0-7/.github/pull_request_template.md 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/pull_request_template.md 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,15 @@ +## Summary +Provide a detailed description of all the changes present in this pull request. + +## Additional Context +Add any additional context about the problem here. +- [ ] Root cause and the steps to reproduce. (If applicable) +- [ ] Thought process behind the implementation. + +## Related Issues (if any) +Mention any related issues or pull requests. + +## Checklist +- [ ] 🟢 Spec tests. +- [ ] 🟢 Acceptance tests. +- [ ] Manually verified. (For example `puppet apply`) \ No newline at end of file diff -pruN 8.1.0-7/.github/workflows/ci.yml 15.0.0-3/.github/workflows/ci.yml --- 8.1.0-7/.github/workflows/ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/workflows/ci.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,102 @@ +name: "ci" + +on: + pull_request: + branches: + - "main" + workflow_dispatch: + +jobs: + Spec: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main" + with: + runs_on: "ubuntu-20.04" + secrets: "inherit" + + setup_matrix: + name: "Setup Test Matrix" + needs: "Spec" + runs-on: ubuntu-20.04 + outputs: + matrix: ${{ steps.get-matrix.outputs.matrix }} + + steps: + - name: Checkout Source + uses: actions/checkout@v3 + + - name: Activate Ruby 2.7 + uses: ruby/setup-ruby@v1 + with: + ruby-version: "2.7" + bundler-cache: true + + - name: Print bundle environment + run: | + echo ::group::bundler environment + bundle env + echo ::endgroup:: + + - name: Setup Acceptance Test Matrix + id: get-matrix + run: | + bundle exec matrix_from_metadata_v2 + + Acceptance: + name: "${{matrix.platforms.label}}, ${{matrix.collection}}" + needs: + - setup_matrix + if: ${{ needs.setup_matrix.outputs.matrix != '{}' }} + + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}} + + env: + PUPPET_GEM_VERSION: '~> 7.24' + FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' + + steps: + - name: Checkout Source + uses: actions/checkout@v3 + + - name: Activate Ruby 2.7 + uses: ruby/setup-ruby@v1 + with: + ruby-version: "2.7" + bundler-cache: true + + - name: Print bundle environment + run: | + bundle env + + - name: "Disable mysqld apparmor profile" + if: matrix.platforms.provider == 'provision::docker' + run: | + sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/ + sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld + + - name: Provision test environment + run: | + bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]' + FILE='spec/fixtures/litmus_inventory.yaml' + sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true + + - name: Install agent + run: | + bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]' + + - name: Install module + run: | + bundle exec rake 'litmus:install_module' + + - name: Run acceptance tests + run: | + bundle exec rake 'litmus:acceptance:parallel' + + - name: Remove test environment + if: ${{ always() }} + continue-on-error: true + run: | + bundle exec rake 'litmus:tear_down' + diff -pruN 8.1.0-7/.github/workflows/labeller.yml 15.0.0-3/.github/workflows/labeller.yml --- 8.1.0-7/.github/workflows/labeller.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/workflows/labeller.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,22 @@ +name: community-labeller + +on: + issues: + types: + - opened + pull_request_target: + types: + - opened + +jobs: + label: + runs-on: ubuntu-latest + steps: + + - uses: puppetlabs/community-labeller@v0 + name: Label issues or pull requests + with: + label_name: community + label_color: '5319e7' + org_membership: puppetlabs + token: ${{ secrets.IAC_COMMUNITY_LABELER }} diff -pruN 8.1.0-7/.github/workflows/mend.yml 15.0.0-3/.github/workflows/mend.yml --- 8.1.0-7/.github/workflows/mend.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/workflows/mend.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,15 @@ +name: "mend" + +on: + pull_request: + branches: + - "main" + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + + mend: + uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main" + secrets: "inherit" diff -pruN 8.1.0-7/.github/workflows/nightly.yml 15.0.0-3/.github/workflows/nightly.yml --- 8.1.0-7/.github/workflows/nightly.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/workflows/nightly.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,101 @@ +name: "nightly" + +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + Spec: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main" + with: + runs_on: "ubuntu-20.04" + secrets: "inherit" + + setup_matrix: + name: "Setup Test Matrix" + needs: "Spec" + runs-on: ubuntu-20.04 + outputs: + matrix: ${{ steps.get-matrix.outputs.matrix }} + + steps: + - name: Checkout Source + uses: actions/checkout@v3 + + - name: Activate Ruby 2.7 + uses: ruby/setup-ruby@v1 + with: + ruby-version: "2.7" + bundler-cache: true + + - name: Print bundle environment + run: | + echo ::group::bundler environment + bundle env + echo ::endgroup:: + + - name: Setup Acceptance Test Matrix + id: get-matrix + run: | + bundle exec matrix_from_metadata_v2 + + Acceptance: + name: "${{matrix.platforms.label}}, ${{matrix.collection}}" + needs: + - setup_matrix + if: ${{ needs.setup_matrix.outputs.matrix != '{}' }} + + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}} + + env: + PUPPET_GEM_VERSION: '~> 7.24' + FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' + + steps: + - name: Checkout Source + uses: actions/checkout@v3 + + - name: Activate Ruby 2.7 + uses: ruby/setup-ruby@v1 + with: + ruby-version: "2.7" + bundler-cache: true + + - name: Print bundle environment + run: | + bundle env + + - name: "Disable mysqld apparmor profile" + if: matrix.platforms.provider == 'provision::docker' + run: | + sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/ + sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld + + - name: Provision test environment + run: | + bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]' + FILE='spec/fixtures/litmus_inventory.yaml' + sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true + + - name: Install agent + run: | + bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]' + + - name: Install module + run: | + bundle exec rake 'litmus:install_module' + + - name: Run acceptance tests + run: | + bundle exec rake 'litmus:acceptance:parallel' + + - name: Remove test environment + if: ${{ always() }} + continue-on-error: true + run: | + bundle exec rake 'litmus:tear_down' + diff -pruN 8.1.0-7/.github/workflows/release.yml 15.0.0-3/.github/workflows/release.yml --- 8.1.0-7/.github/workflows/release.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/workflows/release.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,9 @@ +name: "Publish module" + +on: + workflow_dispatch: + +jobs: + release: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main" + secrets: "inherit" diff -pruN 8.1.0-7/.github/workflows/release_prep.yml 15.0.0-3/.github/workflows/release_prep.yml --- 8.1.0-7/.github/workflows/release_prep.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.github/workflows/release_prep.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,15 @@ +name: "Release Prep" + +on: + workflow_dispatch: + inputs: + version: + description: "Module version to be released. Must be a valid semver string. (1.2.3)" + required: true + +jobs: + release_prep: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main" + with: + version: "${{ github.event.inputs.version }}" + secrets: "inherit" diff -pruN 8.1.0-7/.gitpod.Dockerfile 15.0.0-3/.gitpod.Dockerfile --- 8.1.0-7/.gitpod.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.gitpod.Dockerfile 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,18 @@ +FROM gitpod/workspace-full +RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \ + wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \ + sudo dpkg -i puppet6-release-bionic.deb && \ + sudo dpkg -i puppet-tools-release-bionic.deb && \ + sudo apt-get update && \ + sudo apt-get install -y pdk zsh puppet-agent && \ + sudo apt-get clean && \ + sudo rm -rf /var/lib/apt/lists/* +RUN sudo usermod -s $(which zsh) gitpod && \ + sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \ + echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \ + echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"' >> /home/gitpod/.zshrc && \ + sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \ + mkdir -p /home/gitpod/.config/puppet && \ + /opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml +RUN rm -f puppet6-release-bionic.deb puppet-tools-release-bionic.deb +ENTRYPOINT /usr/bin/zsh diff -pruN 8.1.0-7/.gitpod.yml 15.0.0-3/.gitpod.yml --- 8.1.0-7/.gitpod.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.gitpod.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,9 @@ +image: + file: .gitpod.Dockerfile + +tasks: + - init: pdk bundle install + +vscode: + extensions: + - puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg== diff -pruN 8.1.0-7/.rubocop_todo.yml 15.0.0-3/.rubocop_todo.yml --- 8.1.0-7/.rubocop_todo.yml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/.rubocop_todo.yml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,128 @@ +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2023-04-12 10:15:38 UTC using RuboCop version 1.48.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 1 +Lint/FloatComparison: + Exclude: + - 'spec/spec_helper_acceptance_local.rb' + +# Offense count: 18 +Lint/ReturnInVoidContext: + Exclude: + - 'lib/puppet/provider/mysql_database/mysql.rb' + - 'lib/puppet/provider/mysql_user/mysql.rb' + +# Offense count: 18 +# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes. +Metrics/AbcSize: + Max: 64 + +# Offense count: 12 +# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode. +# AllowedMethods: refine +Metrics/BlockLength: + Max: 210 + +# Offense count: 4 +# Configuration parameters: CountComments, CountAsOne. +Metrics/ClassLength: + Max: 170 + +# Offense count: 11 +# Configuration parameters: AllowedMethods, AllowedPatterns. +Metrics/CyclomaticComplexity: + Max: 15 + +# Offense count: 23 +# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns. +Metrics/MethodLength: + Max: 75 + +# Offense count: 10 +# Configuration parameters: AllowedMethods, AllowedPatterns. +Metrics/PerceivedComplexity: + Max: 18 + +# Offense count: 24 +# Configuration parameters: MinSize. +Performance/CollectionLiteralInLoop: + Exclude: + - 'lib/puppet/type/mysql_grant.rb' + - 'spec/classes/mysql_backup_mysqldump_spec.rb' + - 'spec/classes/mysql_backup_xtrabackup_spec.rb' + - 'spec/classes/mysql_server_account_security_spec.rb' + - 'spec/classes/mysql_server_backup_spec.rb' + - 'spec/defines/mysql_db_spec.rb' + +# Offense count: 64 +# Configuration parameters: Prefixes, AllowedPatterns. +# Prefixes: when, with, without +RSpec/ContextWording: + Enabled: false + +# Offense count: 35 +# Configuration parameters: IgnoredMetadata. +RSpec/DescribeClass: + Enabled: false + +# Offense count: 33 +# Configuration parameters: CountAsOne. +RSpec/ExampleLength: + Max: 32 + +# Offense count: 36 +# Configuration parameters: AllowSubject. +RSpec/MultipleMemoizedHelpers: + Max: 8 + +# Offense count: 121 +# Configuration parameters: EnforcedStyle, IgnoreSharedExamples. +# SupportedStyles: always, named_only +RSpec/NamedSubject: + Exclude: + - 'spec/classes/graceful_failures_spec.rb' + - 'spec/classes/mycnf_template_spec.rb' + - 'spec/classes/mysql_backup_mysqldump_spec.rb' + - 'spec/classes/mysql_backup_xtrabackup_spec.rb' + - 'spec/classes/mysql_client_spec.rb' + - 'spec/classes/mysql_server_account_security_spec.rb' + - 'spec/classes/mysql_server_backup_spec.rb' + - 'spec/classes/mysql_server_spec.rb' + - 'spec/defines/mysql_db_spec.rb' + - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb' + - 'spec/functions/mysql_strip_hash_spec.rb' + +# Offense count: 45 +# Configuration parameters: AllowedGroups. +RSpec/NestedGroups: + Max: 5 + +# Offense count: 64 +# Configuration parameters: AllowedPatterns. +# AllowedPatterns: ^expect_, ^assert_ +RSpec/NoExpectationExample: + Enabled: false + +# Offense count: 61 +RSpec/StubbedMock: + Exclude: + - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb' + - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb' + - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb' + +# Offense count: 1 +# Configuration parameters: MinBranchesCount. +Style/HashLikeCase: + Exclude: + - 'lib/puppet/provider/mysql_login_path/inifile.rb' + +# Offense count: 2 +Style/MixinUsage: + Exclude: + - 'spec/spec_helper.rb' + - 'spec/spec_helper_local.rb' diff -pruN 8.1.0-7/CHANGELOG.md 15.0.0-3/CHANGELOG.md --- 8.1.0-7/CHANGELOG.md 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/CHANGELOG.md 2023-06-19 12:29:51.000000000 +0000 @@ -1,1010 +1,1258 @@ -# Change log + +# Changelog -All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). +All notable changes to this project will be documented in this file. -## [v8.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v8.1.0) (2019-04-02) +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). -[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.1...v8.1.0) +## [v15.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v15.0.0) - 2023-06-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v14.0.0...v15.0.0) ### Added -- Rotate option for xtrabackup script [\#1176](https://github.com/puppetlabs/puppetlabs-mysql/pull/1176) ([elfranne](https://github.com/elfranne)) -- Add support for dynamic backupmethods/mariabackup [\#1171](https://github.com/puppetlabs/puppetlabs-mysql/pull/1171) ([danquack](https://github.com/danquack)) +- (CONT-576) allow deferred function for token & secrets [#1569](https://github.com/puppetlabs/puppetlabs-mysql/pull/1569) ([Ramesh7](https://github.com/Ramesh7)) + +### Changed +- pdksync - (MAINT) - Require Stdlib 9.x [#1572](https://github.com/puppetlabs/puppetlabs-mysql/pull/1572) ([LukasAud](https://github.com/LukasAud)) ### Fixed -- \(MODULES-6627\) Remove unused --host flags from mysqlcaller [\#1174](https://github.com/puppetlabs/puppetlabs-mysql/pull/1174) ([david22swan](https://github.com/david22swan)) -- Set correct packagename for ruby\_mysql on Ubuntu 18.04 [\#1163](https://github.com/puppetlabs/puppetlabs-mysql/pull/1163) ([datty](https://github.com/datty)) -- \[MODULES-8779\] Set proper python\_package\_name for RHEL/CentOS 8 [\#1161](https://github.com/puppetlabs/puppetlabs-mysql/pull/1161) ([javierpena](https://github.com/javierpena)) -- fix install ordering for innodb data size [\#1160](https://github.com/puppetlabs/puppetlabs-mysql/pull/1160) ([fe80](https://github.com/fe80)) +- Fix broken sensitive parameter for mysql::password [#1564](https://github.com/puppetlabs/puppetlabs-mysql/pull/1564) ([cruelsmith](https://github.com/cruelsmith)) -## [8.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.0.1) (2019-03-20) +## [v14.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v14.0.0) - 2023-04-17 -[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.0...8.0.1) +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v13.3.0...v14.0.0) + +### Changed +- (CONT-789) Add Support for Puppet 8 / Drop Support for Puppet 6 [#1557](https://github.com/puppetlabs/puppetlabs-mysql/pull/1557) ([david22swan](https://github.com/david22swan)) + +## [v13.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v13.3.0) - 2023-04-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v13.2.0...v13.3.0) + +### Added + +- mysql::server: Implement reload_on_config_change [#1551](https://github.com/puppetlabs/puppetlabs-mysql/pull/1551) ([bastelfreak](https://github.com/bastelfreak)) ### Fixed -- \(MODULES-8684\) - Removing private tags from Puppet Types [\#1170](https://github.com/puppetlabs/puppetlabs-mysql/pull/1170) ([david22swan](https://github.com/david22swan)) +- move static data from params to server class [#1552](https://github.com/puppetlabs/puppetlabs-mysql/pull/1552) ([bastelfreak](https://github.com/bastelfreak)) -## [8.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.0.0) (2019-01-18) +## [v13.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v13.2.0) - 2023-02-24 -[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/7.0.0...8.0.0) +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v13.1.0...v13.2.0) + +### Added + +- (CONT-359) Syntax update [#1532](https://github.com/puppetlabs/puppetlabs-mysql/pull/1532) ([LukasAud](https://github.com/LukasAud)) + +### Fixed + +- xtrabackup.sh only touch when backup_success_file_path is set [#1522](https://github.com/puppetlabs/puppetlabs-mysql/pull/1522) ([JvGinkel](https://github.com/JvGinkel)) + +## [v13.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v13.1.0) - 2022-12-20 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v13.0.1...v13.1.0) + +### Added + +- mysql::db sql parameter support filenames with multiple dots [#1505](https://github.com/puppetlabs/puppetlabs-mysql/pull/1505) ([skn-bvdh](https://github.com/skn-bvdh)) + +### Fixed + +- (GH-1518) Declare minimum Puppet version 6.24.0 [#1519](https://github.com/puppetlabs/puppetlabs-mysql/pull/1519) ([pmcmaw](https://github.com/pmcmaw)) +- (GH-1516) Update sql example to use array [#1517](https://github.com/puppetlabs/puppetlabs-mysql/pull/1517) ([pmcmaw](https://github.com/pmcmaw)) +- do not emit other ssl directives when ssl = false [#1513](https://github.com/puppetlabs/puppetlabs-mysql/pull/1513) ([kjetilho](https://github.com/kjetilho)) +- (GH-1491) Fix for Ubuntu 22.04 [#1508](https://github.com/puppetlabs/puppetlabs-mysql/pull/1508) ([david22swan](https://github.com/david22swan)) + +## [v13.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v13.0.1) - 2022-10-24 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v13.0.0...v13.0.1) + +### Fixed + +- (CONT-173) - Updating deprecated facter instances [#1501](https://github.com/puppetlabs/puppetlabs-mysql/pull/1501) ([jordanbreen28](https://github.com/jordanbreen28)) +- pdksync - (CONT-189) Remove support for RedHat6 / OracleLinux6 / Scientific6 [#1498](https://github.com/puppetlabs/puppetlabs-mysql/pull/1498) ([david22swan](https://github.com/david22swan)) +- pdksync - (CONT-130) - Dropping Support for Debian 9 [#1495](https://github.com/puppetlabs/puppetlabs-mysql/pull/1495) ([jordanbreen28](https://github.com/jordanbreen28)) +- MySQL 8.0: Grant required privileges to xtrabackup user [#1478](https://github.com/puppetlabs/puppetlabs-mysql/pull/1478) ([jan-win1993](https://github.com/jan-win1993)) + +## [v13.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v13.0.0) - 2022-08-25 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v12.0.3...v13.0.0) + +### Added + +- pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04 [#1483](https://github.com/puppetlabs/puppetlabs-mysql/pull/1483) ([david22swan](https://github.com/david22swan)) +- [Compatibility] Add Raspbian OS to provider configuration [#1481](https://github.com/puppetlabs/puppetlabs-mysql/pull/1481) ([jordi-upc](https://github.com/jordi-upc)) +- Allow excludedatabases when using file_per_database [#1480](https://github.com/puppetlabs/puppetlabs-mysql/pull/1480) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB)) +- pdksync - (GH-cat-12) Add Support for Redhat 9 [#1477](https://github.com/puppetlabs/puppetlabs-mysql/pull/1477) ([david22swan](https://github.com/david22swan)) ### Changed +- Harden db defined type [#1484](https://github.com/puppetlabs/puppetlabs-mysql/pull/1484) ([chelnak](https://github.com/chelnak)) + +### Fixed -- \(MODULES-8193\) - Removal of inbuilt deepmerge and dirname functions [\#1145](https://github.com/puppetlabs/puppetlabs-mysql/pull/1145) ([david22swan](https://github.com/david22swan)) +- Harden config class [#1487](https://github.com/puppetlabs/puppetlabs-mysql/pull/1487) ([chelnak](https://github.com/chelnak)) +- Harden service class [#1486](https://github.com/puppetlabs/puppetlabs-mysql/pull/1486) ([chelnak](https://github.com/chelnak)) +- Harden root password class [#1485](https://github.com/puppetlabs/puppetlabs-mysql/pull/1485) ([chelnak](https://github.com/chelnak)) +- Use MariaDB for Ubuntu 20.04 [#1449](https://github.com/puppetlabs/puppetlabs-mysql/pull/1449) ([treydock](https://github.com/treydock)) +- Add support for mariabackup [#1447](https://github.com/puppetlabs/puppetlabs-mysql/pull/1447) ([rsynnest](https://github.com/rsynnest)) + +## [v12.0.3](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.3) - 2022-05-25 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v12.0.2...v12.0.3) + +### Fixed + +- (IAC-1595) MySQL maintenance [#1472](https://github.com/puppetlabs/puppetlabs-mysql/pull/1472) ([LukasAud](https://github.com/LukasAud)) +- Solve issue with repeated restarts if ssl-disable is true [#1425](https://github.com/puppetlabs/puppetlabs-mysql/pull/1425) ([markasammut](https://github.com/markasammut)) + +## [v12.0.2](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.2) - 2022-04-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v12.0.1...v12.0.2) ### Added -- \(MODULES-3539\) Allow @ in username [\#1155](https://github.com/puppetlabs/puppetlabs-mysql/pull/1155) ([Fogelholk](https://github.com/Fogelholk)) -- \(MODULES-8144\) - Add support for SLES 15 [\#1146](https://github.com/puppetlabs/puppetlabs-mysql/pull/1146) ([eimlav](https://github.com/eimlav)) -- Added support for RHSCL mysql versions and support for .mylogin.cnf for MySQL 5.6.6+ [\#1061](https://github.com/puppetlabs/puppetlabs-mysql/pull/1061) ([DJMuggs](https://github.com/DJMuggs)) +- pdksync - (IAC-1753) - Add Support for AlmaLinux 8 [#1444](https://github.com/puppetlabs/puppetlabs-mysql/pull/1444) ([david22swan](https://github.com/david22swan)) +- pdksync - (IAC-1751) - Add Support for Rocky 8 [#1442](https://github.com/puppetlabs/puppetlabs-mysql/pull/1442) ([david22swan](https://github.com/david22swan)) ### Fixed -- \(MODULES-8193\) - Wrapper methods created for inbuilt 4.x functions [\#1151](https://github.com/puppetlabs/puppetlabs-mysql/pull/1151) ([david22swan](https://github.com/david22swan)) -- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1150](https://github.com/puppetlabs/puppetlabs-mysql/pull/1150) ([tphoney](https://github.com/tphoney)) -- Add includedir for Gentoo [\#1147](https://github.com/puppetlabs/puppetlabs-mysql/pull/1147) ([baurmatt](https://github.com/baurmatt)) -- add mysql\_native\_password for mariadb 10.2 in password\_hash [\#1117](https://github.com/puppetlabs/puppetlabs-mysql/pull/1117) ([mlk-89](https://github.com/mlk-89)) -- Removing query\_cache ops that are no longer supported in MySQL \>= 8.0 [\#1107](https://github.com/puppetlabs/puppetlabs-mysql/pull/1107) ([ernstae](https://github.com/ernstae)) +- (Bugfix) Grant privileges idempotency Fix [#1466](https://github.com/puppetlabs/puppetlabs-mysql/pull/1466) ([LukasAud](https://github.com/LukasAud)) +- pdksync - (GH-iac-334) Remove Support for Ubuntu 16.04 [#1457](https://github.com/puppetlabs/puppetlabs-mysql/pull/1457) ([david22swan](https://github.com/david22swan)) +- pdksync - (IAC-1787) Remove Support for CentOS 6 [#1450](https://github.com/puppetlabs/puppetlabs-mysql/pull/1450) ([david22swan](https://github.com/david22swan)) +- add mysql_native_password plugin to authentication_string vs password [#1441](https://github.com/puppetlabs/puppetlabs-mysql/pull/1441) ([Heidistein](https://github.com/Heidistein)) +- fix Error: Transaction store file transactionstore.yaml is corrupt [#1429](https://github.com/puppetlabs/puppetlabs-mysql/pull/1429) ([andeman](https://github.com/andeman)) +- Combine multiple grants into one while checking state [#1428](https://github.com/puppetlabs/puppetlabs-mysql/pull/1428) ([fuyar](https://github.com/fuyar)) -## [7.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/7.0.0) (2018-10-25) +## [v12.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.1) - 2021-08-26 -[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.2.0...7.0.0) +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v12.0.0...v12.0.1) + +### Fixed + +- (IAC-1741) Allow stdlib v8.0.0 [#1433](https://github.com/puppetlabs/puppetlabs-mysql/pull/1433) ([david22swan](https://github.com/david22swan)) +- MODULES-8373 Fix mysql_grant resource to be idempodent on MySQL 8+ [#1427](https://github.com/puppetlabs/puppetlabs-mysql/pull/1427) ([theq86](https://github.com/theq86)) + +## [v12.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.0) - 2021-07-27 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.1.0...v12.0.0) + +### Changed +- Deprecate mysql::server::mysqltuner and show it as an example [#1409](https://github.com/puppetlabs/puppetlabs-mysql/pull/1409) ([ghoneycutt](https://github.com/ghoneycutt)) +- Deprecate mysql::server::monitor and show as an example [#1408](https://github.com/puppetlabs/puppetlabs-mysql/pull/1408) ([ghoneycutt](https://github.com/ghoneycutt)) +- Remove EOL platforms Debian 8 and Ubuntu 14.04 [#1406](https://github.com/puppetlabs/puppetlabs-mysql/pull/1406) ([ghoneycutt](https://github.com/ghoneycutt)) + +## [v11.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.1.0) - 2021-07-05 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.3...v11.1.0) + +### Added + +- (MODULES-11115) add Rocky Linux 8 compatibility [#1405](https://github.com/puppetlabs/puppetlabs-mysql/pull/1405) ([vchepkov](https://github.com/vchepkov)) +- Use Puppet-Datatype Sensitive [#1400](https://github.com/puppetlabs/puppetlabs-mysql/pull/1400) ([cocker-cc](https://github.com/cocker-cc)) + +### Fixed + +- Fix mysql_user parameters update on modern MySQL [#1415](https://github.com/puppetlabs/puppetlabs-mysql/pull/1415) ([weastur](https://github.com/weastur)) +- (IAC-1677) Fix issue with deprecated rspec [#1414](https://github.com/puppetlabs/puppetlabs-mysql/pull/1414) ([ghoneycutt](https://github.com/ghoneycutt)) +- Fix broken link and style in documentation [#1403](https://github.com/puppetlabs/puppetlabs-mysql/pull/1403) ([ghoneycutt](https://github.com/ghoneycutt)) + +## [v11.0.3](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.3) - 2021-06-21 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.2...v11.0.3) + +### Fixed + +- (IAC-1430) - Minor docs updating [#1401](https://github.com/puppetlabs/puppetlabs-mysql/pull/1401) ([pmcmaw](https://github.com/pmcmaw)) + +## [v11.0.2](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.2) - 2021-06-07 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.1...v11.0.2) + +### Fixed + +- (bugfix) - Pull python3-mysqldb in Debian Bullseye [#1396](https://github.com/puppetlabs/puppetlabs-mysql/pull/1396) ([thomasgoirand](https://github.com/thomasgoirand)) +- Update xtrabackup package name for Ubuntu 20.04 [#1387](https://github.com/puppetlabs/puppetlabs-mysql/pull/1387) ([rsynnest](https://github.com/rsynnest)) + +## [v11.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.1) - 2021-04-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.0...v11.0.1) + +### Fixed + +- Fix: Puppet Unknown variable: 'mysql::params::exec_path' [#1378](https://github.com/puppetlabs/puppetlabs-mysql/pull/1378) ([JvGinkel](https://github.com/JvGinkel)) +- (IAC-1497) - Removal of unsupported `translate` dependency [#1375](https://github.com/puppetlabs/puppetlabs-mysql/pull/1375) ([david22swan](https://github.com/david22swan)) +- (MODULES-10926) Fix Java binding package for Ubuntu 20.04 [#1373](https://github.com/puppetlabs/puppetlabs-mysql/pull/1373) ([treydock](https://github.com/treydock)) + +## [v11.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.0) - 2021-03-01 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.10.0...v11.0.0) + +### Added + +- Support compression command and extension [#1363](https://github.com/puppetlabs/puppetlabs-mysql/pull/1363) ([dploeger](https://github.com/dploeger)) ### Changed +- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [#1366](https://github.com/puppetlabs/puppetlabs-mysql/pull/1366) ([carabasdaniel](https://github.com/carabasdaniel)) + +### Fixed + +- pdksync - (MAINT) Remove SLES 11 support [#1370](https://github.com/puppetlabs/puppetlabs-mysql/pull/1370) ([sanfrancrisko](https://github.com/sanfrancrisko)) +- pdksync - (MAINT) Remove RHEL 5 family support [#1369](https://github.com/puppetlabs/puppetlabs-mysql/pull/1369) ([sanfrancrisko](https://github.com/sanfrancrisko)) + +## [v10.10.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.10.0) - 2021-02-12 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.9.1...v10.10.0) + +### Added + +- Set default MySQL version for FreeBSD [#1360](https://github.com/puppetlabs/puppetlabs-mysql/pull/1360) ([olevole](https://github.com/olevole)) + +## [v10.9.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.9.1) - 2021-01-07 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.9.0...v10.9.1) + +### Fixed + +- Repair check of logbindir [#1348](https://github.com/puppetlabs/puppetlabs-mysql/pull/1348) ([qha](https://github.com/qha)) + +## [v10.9.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.9.0) - 2020-12-16 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.8.0...v10.9.0) + +### Added + +- (FEAT) Add support for Puppet 7 [#1347](https://github.com/puppetlabs/puppetlabs-mysql/pull/1347) ([daianamezdrea](https://github.com/daianamezdrea)) +- (IAC-996) Removal of inappropriate terminology [#1340](https://github.com/puppetlabs/puppetlabs-mysql/pull/1340) ([pmcmaw](https://github.com/pmcmaw)) -- \(MODULES-6923\) remove staging module [\#1115](https://github.com/puppetlabs/puppetlabs-mysql/pull/1115) ([tphoney](https://github.com/tphoney)) +## [v10.8.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.8.0) - 2020-11-04 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/"v10.8.0"...v10.8.0) + +## ["v10.8.0"](https://github.com/puppetlabs/puppetlabs-mysql/tree/"v10.8.0") - 2020-11-04 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.7.1..."v10.8.0") ### Added -- \(MODULES-7857\) Support user creation on galera [\#1130](https://github.com/puppetlabs/puppetlabs-mysql/pull/1130) ([MaxFedotov](https://github.com/MaxFedotov)) -- MySQL 8 compatibility in user management [\#1092](https://github.com/puppetlabs/puppetlabs-mysql/pull/1092) ([zpetr](https://github.com/zpetr)) +- Add compatibility for Amazon Linux 2 [#1328](https://github.com/puppetlabs/puppetlabs-mysql/pull/1328) ([greno2](https://github.com/greno2)) ### Fixed -- \(MODULES-7487\) Check authentication string for user password on MariaDB 10.2.16+ [\#1135](https://github.com/puppetlabs/puppetlabs-mysql/pull/1135) ([gguillotte](https://github.com/gguillotte)) +- (IAC-1137) Ensure curl package is installed for xtrabackup tests [#1338](https://github.com/puppetlabs/puppetlabs-mysql/pull/1338) ([pmcmaw](https://github.com/pmcmaw)) +- (MODULES-10788) - fix for password prompt when creating mysql_login_path resource [#1334](https://github.com/puppetlabs/puppetlabs-mysql/pull/1334) ([andeman](https://github.com/andeman)) +- (MODULES-10790) - Setting logbin results in error Unknown variable: 'managed_dirs_path' [#1325](https://github.com/puppetlabs/puppetlabs-mysql/pull/1325) ([pmcmaw](https://github.com/pmcmaw)) +- Fix package for python bindings on Ubuntu 20.04 [#1323](https://github.com/puppetlabs/puppetlabs-mysql/pull/1323) ([tobias-urdin](https://github.com/tobias-urdin)) + +## [v10.7.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.7.1) - 2020-09-28 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.7.0...v10.7.1) + +### Fixed + +- (IAC-1175) Pin percona-release to version 1.0-22 for Debian 8 [#1329](https://github.com/puppetlabs/puppetlabs-mysql/pull/1329) ([pmcmaw](https://github.com/pmcmaw)) +- [MODULES-10773] Fix for rh-mysql80 [#1322](https://github.com/puppetlabs/puppetlabs-mysql/pull/1322) ([carabasdaniel](https://github.com/carabasdaniel)) + +## [v10.7.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.7.0) - 2020-08-13 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.6.0...v10.7.0) + +### Added + +- pdksync - (IAC-973) - Update travis/appveyor to run on new default branch `main` [#1316](https://github.com/puppetlabs/puppetlabs-mysql/pull/1316) ([david22swan](https://github.com/david22swan)) +- add package provider and source [#1314](https://github.com/puppetlabs/puppetlabs-mysql/pull/1314) ([fe80](https://github.com/fe80)) + +### Fixed + +- Remove non printable characters [#1315](https://github.com/puppetlabs/puppetlabs-mysql/pull/1315) ([elmobp](https://github.com/elmobp)) +- Remove control character from manifests/server.pp [#1312](https://github.com/puppetlabs/puppetlabs-mysql/pull/1312) ([tomkrouper](https://github.com/tomkrouper)) + +## [v10.6.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.6.0) - 2020-06-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.5.0...v10.6.0) + +### Added + +- Handle cron package from different module [#1306](https://github.com/puppetlabs/puppetlabs-mysql/pull/1306) ([ashish1099](https://github.com/ashish1099)) +- (IAC-746) - Add ubuntu 20.04 support [#1303](https://github.com/puppetlabs/puppetlabs-mysql/pull/1303) ([david22swan](https://github.com/david22swan)) +- (MODULES-1550) add new Feature MySQL login paths [#1295](https://github.com/puppetlabs/puppetlabs-mysql/pull/1295) ([andeman](https://github.com/andeman)) + +### Fixed + +- Add managed_dirs parameter [#1305](https://github.com/puppetlabs/puppetlabs-mysql/pull/1305) ([evgenkisel](https://github.com/evgenkisel)) +- change split on whitespace to split on tab in mysql_user [#1233](https://github.com/puppetlabs/puppetlabs-mysql/pull/1233) ([koshatul](https://github.com/koshatul)) + +## [v10.5.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.5.0) - 2020-05-13 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.4.0...v10.5.0) + +### Added + +- Support mariadb's ed25519-based authentication [#1292](https://github.com/puppetlabs/puppetlabs-mysql/pull/1292) ([dciabrin](https://github.com/dciabrin)) +- Allow changing the mysql-config-file group-ownership [#1284](https://github.com/puppetlabs/puppetlabs-mysql/pull/1284) ([unki](https://github.com/unki)) + +### Fixed + +- Remove legacy (old API) `mysql_password` function [#1299](https://github.com/puppetlabs/puppetlabs-mysql/pull/1299) ([alexjfisher](https://github.com/alexjfisher)) +- Improve differences between generated mysql service id values [#1293](https://github.com/puppetlabs/puppetlabs-mysql/pull/1293) ([ryaner](https://github.com/ryaner)) +- (MODULES-10023) Fix multiple xtrabackup regressions [#1245](https://github.com/puppetlabs/puppetlabs-mysql/pull/1245) ([fraenki](https://github.com/fraenki)) +- Fix binarylog by allowing users to specify managed directories [#1194](https://github.com/puppetlabs/puppetlabs-mysql/pull/1194) ([elfranne](https://github.com/elfranne)) + +## [v10.4.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.4.0) - 2020-03-03 -## [6.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.2.0) (2018-09-27) +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.3.0...v10.4.0) + +### Added + +- Allow adapting MySQL configuration file's permissions mode [#1278](https://github.com/puppetlabs/puppetlabs-mysql/pull/1278) ([unki](https://github.com/unki)) +- pdksync - (FM-8581) - Debian 10 added to travis and provision file refactored [#1275](https://github.com/puppetlabs/puppetlabs-mysql/pull/1275) ([david22swan](https://github.com/david22swan)) +- Allow backupcompress for xtrabackup profile [#1196](https://github.com/puppetlabs/puppetlabs-mysql/pull/1196) ([Spuffnduff](https://github.com/Spuffnduff)) +- Enable module to not use default options [#1192](https://github.com/puppetlabs/puppetlabs-mysql/pull/1192) ([morremeyer](https://github.com/morremeyer)) + +## [v10.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.3.0) - 2019-12-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.2.1...v10.3.0) + +### Added + +- (FM-8677) - Support added for CentOS 8 [#1254](https://github.com/puppetlabs/puppetlabs-mysql/pull/1254) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- Fix java and ruby binding packages for Debian 10 [#1264](https://github.com/puppetlabs/puppetlabs-mysql/pull/1264) ([treydock](https://github.com/treydock)) +- (MODULES-10114) Confine fact for only when mysql is in PATH [#1256](https://github.com/puppetlabs/puppetlabs-mysql/pull/1256) ([bFekete](https://github.com/bFekete)) + +## [v10.2.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.2.1) - 2019-10-31 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.2.0...v10.2.1) + +### Fixed + +- Fix mysql::sql task error message [#1243](https://github.com/puppetlabs/puppetlabs-mysql/pull/1243) ([alexjfisher](https://github.com/alexjfisher)) +- Fix xtrabackup regression introduced in #1207 [#1242](https://github.com/puppetlabs/puppetlabs-mysql/pull/1242) ([fraenki](https://github.com/fraenki)) +- Repair mysql_grant docs and diagnostics [#1237](https://github.com/puppetlabs/puppetlabs-mysql/pull/1237) ([qha](https://github.com/qha)) + +## [v10.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.2.0) - 2019-09-24 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.1.0...v10.2.0) + +### Added + +- FM-8406 add support on Debian10 [#1230](https://github.com/puppetlabs/puppetlabs-mysql/pull/1230) ([lionce](https://github.com/lionce)) +- Make backup success file path configurable [#1207](https://github.com/puppetlabs/puppetlabs-mysql/pull/1207) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB)) + +### Fixed + +- No package under FreeBSD [#1227](https://github.com/puppetlabs/puppetlabs-mysql/pull/1227) ([jas01](https://github.com/jas01)) +- Fix group on FreeBSD [#1226](https://github.com/puppetlabs/puppetlabs-mysql/pull/1226) ([jas01](https://github.com/jas01)) +- Don't run fact when you can't find mysqld [#1224](https://github.com/puppetlabs/puppetlabs-mysql/pull/1224) ([jstewart612](https://github.com/jstewart612)) +- Bugfix on Debian 9 : ruby_package_name must be ruby-mysql2 [#1223](https://github.com/puppetlabs/puppetlabs-mysql/pull/1223) ([leopoiroux](https://github.com/leopoiroux)) +- Fix errors for /bin/sh with the xtrabackup cron [#1222](https://github.com/puppetlabs/puppetlabs-mysql/pull/1222) ([baldurmen](https://github.com/baldurmen)) +- Fix/fix dependency issue in freebsd with log error file creation from 10.0.0 [#1221](https://github.com/puppetlabs/puppetlabs-mysql/pull/1221) ([rick-pri](https://github.com/rick-pri)) + +## [v10.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.1.0) - 2019-07-31 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.0.0...v10.1.0) + +### Added + +- Allow backup::mysqldump::time to accept monthday, month, weekday [#1214](https://github.com/puppetlabs/puppetlabs-mysql/pull/1214) ([malakai97](https://github.com/malakai97)) + +## [v10.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.0.0) - 2019-06-26 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v9.1.0...v10.0.0) + +### Added + +- add support for rh-mariadb102 [#1209](https://github.com/puppetlabs/puppetlabs-mysql/pull/1209) ([martin-schlossarek](https://github.com/martin-schlossarek)) +- Freebsd compat [#1208](https://github.com/puppetlabs/puppetlabs-mysql/pull/1208) ([kapouik](https://github.com/kapouik)) + +### Fixed + +- FM-7982 - update provisioner to docker_exp [#1205](https://github.com/puppetlabs/puppetlabs-mysql/pull/1205) ([lionce](https://github.com/lionce)) + +## [v9.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v9.1.0) - 2019-06-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v9.0.0...v9.1.0) + +### Added + +- Add option to specify $backupdir as a symlink target, for use with dm… [#1200](https://github.com/puppetlabs/puppetlabs-mysql/pull/1200) ([comport3](https://github.com/comport3)) +- (FM-8029) Add RedHat 8 support [#1199](https://github.com/puppetlabs/puppetlabs-mysql/pull/1199) ([eimlav](https://github.com/eimlav)) +- Allow own Xtrabackup script [#1189](https://github.com/puppetlabs/puppetlabs-mysql/pull/1189) ([SaschaDoering](https://github.com/SaschaDoering)) +- Litmus conversion [#1175](https://github.com/puppetlabs/puppetlabs-mysql/pull/1175) ([pmcmaw](https://github.com/pmcmaw)) + +### Fixed + +- (MODULES-6875,MODULES-7487) - Fix mariadb mysql_user password idempotency [#1195](https://github.com/puppetlabs/puppetlabs-mysql/pull/1195) ([alexjfisher](https://github.com/alexjfisher)) + +## [v9.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v9.0.0) - 2019-05-22 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.1.0...v9.0.0) + +### Added + +- Make incremental backups deactivable [#1188](https://github.com/puppetlabs/puppetlabs-mysql/pull/1188) ([SaschaDoering](https://github.com/SaschaDoering)) +- Allow multiple backupmethods [#1187](https://github.com/puppetlabs/puppetlabs-mysql/pull/1187) ([SaschaDoering](https://github.com/SaschaDoering)) + +### Changed +- pdksync - (MODULES-8444) - Raise lower Puppet bound [#1184](https://github.com/puppetlabs/puppetlabs-mysql/pull/1184) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- Fix the contribution guide URL [#1190](https://github.com/puppetlabs/puppetlabs-mysql/pull/1190) ([morremeyer](https://github.com/morremeyer)) +- (MODULES-8886) Revert removal of deepmerge function [#1181](https://github.com/puppetlabs/puppetlabs-mysql/pull/1181) ([eimlav](https://github.com/eimlav)) +- Fixed Changelog links for 8.1.0 [#1180](https://github.com/puppetlabs/puppetlabs-mysql/pull/1180) ([morremeyer](https://github.com/morremeyer)) + +## [8.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.1.0) - 2019-04-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.1...8.1.0) + +### Added + +- Rotate option for xtrabackup script [#1176](https://github.com/puppetlabs/puppetlabs-mysql/pull/1176) ([elfranne](https://github.com/elfranne)) + +### Fixed + +- (MODULES-6627) Remove unused --host flags from mysqlcaller [#1174](https://github.com/puppetlabs/puppetlabs-mysql/pull/1174) ([david22swan](https://github.com/david22swan)) +- Set correct packagename for ruby_mysql on Ubuntu 18.04 [#1163](https://github.com/puppetlabs/puppetlabs-mysql/pull/1163) ([datty](https://github.com/datty)) +- [MODULES-8779] Set proper python_package_name for RHEL/CentOS 8 [#1161](https://github.com/puppetlabs/puppetlabs-mysql/pull/1161) ([javierpena](https://github.com/javierpena)) +- fix install ordering for innodb data size [#1160](https://github.com/puppetlabs/puppetlabs-mysql/pull/1160) ([fe80](https://github.com/fe80)) + +## [8.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.0.1) - 2019-03-20 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.0...8.0.1) + +### Added + +- Add support for dynamic backupmethods/mariabackup [#1171](https://github.com/puppetlabs/puppetlabs-mysql/pull/1171) ([danquack](https://github.com/danquack)) + +### Fixed + +- (MODULES-8684) - Removing private tags from Puppet Types [#1170](https://github.com/puppetlabs/puppetlabs-mysql/pull/1170) ([david22swan](https://github.com/david22swan)) + +## [8.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.0.0) - 2019-01-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/7.0.0...8.0.0) + +### Added + +- (MODULES-3539) Allow @ in username [#1155](https://github.com/puppetlabs/puppetlabs-mysql/pull/1155) ([Fogelholk](https://github.com/Fogelholk)) +- (MODULES-8144) - Add support for SLES 15 [#1146](https://github.com/puppetlabs/puppetlabs-mysql/pull/1146) ([eimlav](https://github.com/eimlav)) +- Added support for RHSCL mysql versions and support for .mylogin.cnf for MySQL 5.6.6+ [#1061](https://github.com/puppetlabs/puppetlabs-mysql/pull/1061) ([DJMuggs](https://github.com/DJMuggs)) + +### Changed +- (MODULES-8193) - Removal of inbuilt deepmerge and dirname functions [#1145](https://github.com/puppetlabs/puppetlabs-mysql/pull/1145) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- (MODULES-8193) - Wrapper methods created for inbuilt 4.x functions [#1151](https://github.com/puppetlabs/puppetlabs-mysql/pull/1151) ([david22swan](https://github.com/david22swan)) +- pdksync - (FM-7655) Fix rubygems-update for ruby < 2.3 [#1150](https://github.com/puppetlabs/puppetlabs-mysql/pull/1150) ([tphoney](https://github.com/tphoney)) +- Add includedir for Gentoo [#1147](https://github.com/puppetlabs/puppetlabs-mysql/pull/1147) ([baurmatt](https://github.com/baurmatt)) +- add mysql_native_password for mariadb 10.2 in password_hash [#1117](https://github.com/puppetlabs/puppetlabs-mysql/pull/1117) ([mlk-89](https://github.com/mlk-89)) +- Removing query_cache ops that are no longer supported in MySQL >= 8.0 [#1107](https://github.com/puppetlabs/puppetlabs-mysql/pull/1107) ([ernstae](https://github.com/ernstae)) + +## [7.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/7.0.0) - 2018-10-25 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.2.0...7.0.0) + +### Added + +- (MODULES-7857) Support user creation on galera [#1130](https://github.com/puppetlabs/puppetlabs-mysql/pull/1130) ([MaxFedotov](https://github.com/MaxFedotov)) +- MySQL 8 compatibility in user management [#1092](https://github.com/puppetlabs/puppetlabs-mysql/pull/1092) ([zpetr](https://github.com/zpetr)) + +### Changed +- (MODULES-6923) remove staging module [#1115](https://github.com/puppetlabs/puppetlabs-mysql/pull/1115) ([tphoney](https://github.com/tphoney)) + +### Fixed + +- (MODULES-7487) Check authentication string for user password on MariaDB 10.2.16+ [#1135](https://github.com/puppetlabs/puppetlabs-mysql/pull/1135) ([gguillotte](https://github.com/gguillotte)) + +## [6.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.2.0) - 2018-09-28 [Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.1.0...6.2.0) ### Added -- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1127](https://github.com/puppetlabs/puppetlabs-mysql/pull/1127) ([tphoney](https://github.com/tphoney)) +- pdksync - (MODULES-6805) metadata.json shows support for puppet 6 [#1127](https://github.com/puppetlabs/puppetlabs-mysql/pull/1127) ([tphoney](https://github.com/tphoney)) ### Fixed -- \(maint\) - Change versioning comparison [\#1123](https://github.com/puppetlabs/puppetlabs-mysql/pull/1123) ([eimlav](https://github.com/eimlav)) +- (maint) - Change versioning comparison [#1123](https://github.com/puppetlabs/puppetlabs-mysql/pull/1123) ([eimlav](https://github.com/eimlav)) -## [6.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.1.0) (2018-09-13) +## [6.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.1.0) - 2018-09-13 [Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.0.0...6.1.0) ### Fixed -- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1114](https://github.com/puppetlabs/puppetlabs-mysql/pull/1114) ([pmcmaw](https://github.com/pmcmaw)) -- \(MODULES-6981\) Do not try to read ~root/.my.cnf when calling "mysqld -V" [\#1063](https://github.com/puppetlabs/puppetlabs-mysql/pull/1063) ([simondeziel](https://github.com/simondeziel)) +- pdksync - (MODULES-7705) - Bumping stdlib dependency from < 5.0.0 to < 6.0.0 [#1114](https://github.com/puppetlabs/puppetlabs-mysql/pull/1114) ([pmcmaw](https://github.com/pmcmaw)) +- (MODULES-6981) Do not try to read ~root/.my.cnf when calling "mysqld -V" [#1063](https://github.com/puppetlabs/puppetlabs-mysql/pull/1063) ([simondeziel](https://github.com/simondeziel)) -## [6.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.0.0) (2018-08-01) +## [6.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.0.0) - 2018-08-02 [Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.4.0...6.0.0) +### Added + +- (FM-5985) - Addition of support for Ubuntu 18.04 to mysql [#1104](https://github.com/puppetlabs/puppetlabs-mysql/pull/1104) ([david22swan](https://github.com/david22swan)) +- (MODULES-7439) - Implementing beaker-testmode_switcher [#1095](https://github.com/puppetlabs/puppetlabs-mysql/pull/1095) ([pmcmaw](https://github.com/pmcmaw)) +- Support for optional__args and prescript to mysqldump backup provider [#1083](https://github.com/puppetlabs/puppetlabs-mysql/pull/1083) ([eputnam](https://github.com/eputnam)) +- Allow empty user passwords [#1075](https://github.com/puppetlabs/puppetlabs-mysql/pull/1075) ([ThoTischner](https://github.com/ThoTischner)) +- Add user tls_options and grant options to mysql::db [#1065](https://github.com/puppetlabs/puppetlabs-mysql/pull/1065) ([edestecd](https://github.com/edestecd)) +- Use puppet4 functions-api [#1044](https://github.com/puppetlabs/puppetlabs-mysql/pull/1044) ([juliantodt](https://github.com/juliantodt)) + +### Changed +- [FM-6962] Removal of unsupported OS from mysql [#1086](https://github.com/puppetlabs/puppetlabs-mysql/pull/1086) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- (MODULES-7353) Enable service for Debian 9 [#1094](https://github.com/puppetlabs/puppetlabs-mysql/pull/1094) ([david22swan](https://github.com/david22swan)) +- Update locales test for Debian 9 [#1091](https://github.com/puppetlabs/puppetlabs-mysql/pull/1091) ([HelenCampbell](https://github.com/HelenCampbell)) +- [FM-7045] Fix to allow Debian 9 test's to run clean [#1088](https://github.com/puppetlabs/puppetlabs-mysql/pull/1088) ([david22swan](https://github.com/david22swan)) +- (MODULES-7198) Fix DROP USER IF EXISTS on mariadb [#1082](https://github.com/puppetlabs/puppetlabs-mysql/pull/1082) ([hunner](https://github.com/hunner)) + +## [5.4.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.4.0) - 2018-05-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.3.0...5.4.0) + +### Added + +- (PDOC-210) add Puppet Strings documentation [#1068](https://github.com/puppetlabs/puppetlabs-mysql/pull/1068) ([hunner](https://github.com/hunner)) +- (PDOC-210) add Puppet Strings documentation [#1062](https://github.com/puppetlabs/puppetlabs-mysql/pull/1062) ([eputnam](https://github.com/eputnam)) +- (MODULES-5618) Hide logging of password_hash changes in mysql::user [#993](https://github.com/puppetlabs/puppetlabs-mysql/pull/993) ([jhriggs](https://github.com/jhriggs)) +- Replaced 'DROP USER' with 'DROP USER IF EXISTS' [#942](https://github.com/puppetlabs/puppetlabs-mysql/pull/942) ([xelmido](https://github.com/xelmido)) + +### Fixed + +- (MODULES-6627) Removes unused --host flag from mysqlcaller [#1064](https://github.com/puppetlabs/puppetlabs-mysql/pull/1064) ([HelenCampbell](https://github.com/HelenCampbell)) +- fix archlinux compatibility [#1057](https://github.com/puppetlabs/puppetlabs-mysql/pull/1057) ([bastelfreak](https://github.com/bastelfreak)) +- changed input param option in export.json from sql to file [#1054](https://github.com/puppetlabs/puppetlabs-mysql/pull/1054) ([cgoswami](https://github.com/cgoswami)) +- PROCESS is now required [#958](https://github.com/puppetlabs/puppetlabs-mysql/pull/958) ([elmobp](https://github.com/elmobp)) + +## [5.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.3.0) - 2018-02-20 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.1...5.3.0) + +## [5.2.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.2.1) - 2018-02-02 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.0...5.2.1) + +## [5.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.2.0) - 2018-01-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.1.0...5.2.0) + +### Added + +- (MODULES-4794) Add paths for RHSC [#1039](https://github.com/puppetlabs/puppetlabs-mysql/pull/1039) ([hunner](https://github.com/hunner)) +- (MODULES-3623) Centralise MySQL calls... [#1036](https://github.com/puppetlabs/puppetlabs-mysql/pull/1036) ([hunner](https://github.com/hunner)) +- #puppethack allow undef value for bind-address [#1035](https://github.com/puppetlabs/puppetlabs-mysql/pull/1035) ([JvGinkel](https://github.com/JvGinkel)) +- Add Export database task [#1018](https://github.com/puppetlabs/puppetlabs-mysql/pull/1018) ([slenky](https://github.com/slenky)) +- Add support for `GRANTS FUNCTION` [#1005](https://github.com/puppetlabs/puppetlabs-mysql/pull/1005) ([joshuaspence](https://github.com/joshuaspence)) +- Allow authentication plugin to be changed [#1004](https://github.com/puppetlabs/puppetlabs-mysql/pull/1004) ([joshuaspence](https://github.com/joshuaspence)) + +### Changed +- (maint) - Removing Debian 9 [#1020](https://github.com/puppetlabs/puppetlabs-mysql/pull/1020) ([pmcmaw](https://github.com/pmcmaw)) + +## [5.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.1.0) - 2017-10-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.0.0...5.1.0) + +## [5.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.0.0) - 2017-10-05 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/4.0.1...5.0.0) + +### Added + +- Updating PO file to match strings in POT file and code base. [#1010](https://github.com/puppetlabs/puppetlabs-mysql/pull/1010) ([pmcmaw](https://github.com/pmcmaw)) + +### Fixed + +- refactor php_package_name default for Debian/Ubuntu [#969](https://github.com/puppetlabs/puppetlabs-mysql/pull/969) ([mmoll](https://github.com/mmoll)) + +## [4.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/4.0.1) - 2017-09-09 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/4.0.0...4.0.1) + +### Added + +- (MODULES-5528) mysql_install_db change to optional [#990](https://github.com/puppetlabs/puppetlabs-mysql/pull/990) ([HelenCampbell](https://github.com/HelenCampbell)) + +### Fixed + +- (MODULES-5602) remove superfluous backslashes from regular expressions [#989](https://github.com/puppetlabs/puppetlabs-mysql/pull/989) ([DavidS](https://github.com/DavidS)) + +## [4.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/4.0.0) - 2017-09-07 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.11.0...4.0.0) + ### Changed +- replace validate_* with datatypes in db.pp [#930](https://github.com/puppetlabs/puppetlabs-mysql/pull/930) ([bastelfreak](https://github.com/bastelfreak)) + +### Fixed + +- MODULES-5405 interpolation for puppet strings [#984](https://github.com/puppetlabs/puppetlabs-mysql/pull/984) ([tphoney](https://github.com/tphoney)) +- interpolation for ruby & puppet code. [#983](https://github.com/puppetlabs/puppetlabs-mysql/pull/983) ([tphoney](https://github.com/tphoney)) +- Updated pot file, decorated simple strings [#978](https://github.com/puppetlabs/puppetlabs-mysql/pull/978) ([tphoney](https://github.com/tphoney)) +- Fixing empty user/password issue [#972](https://github.com/puppetlabs/puppetlabs-mysql/pull/972) ([ajardan](https://github.com/ajardan)) +- (MODULES-4604) move name validation in mysql_grant type [#961](https://github.com/puppetlabs/puppetlabs-mysql/pull/961) ([eputnam](https://github.com/eputnam)) +- (MODULES-4115) Invalid parameter provider on Mysql_user[user@localhost] in mysql::db [#912](https://github.com/puppetlabs/puppetlabs-mysql/pull/912) ([ryanb-hc](https://github.com/ryanb-hc)) + +## [3.11.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.11.0) - 2017-05-08 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.10.0...3.11.0) + +### Added + +- (#4534) Add PROXY grant support to mysql_grant [#934](https://github.com/puppetlabs/puppetlabs-mysql/pull/934) ([jhriggs](https://github.com/jhriggs)) +- Add a file in /tmp to check when the last backup was successful [#907](https://github.com/puppetlabs/puppetlabs-mysql/pull/907) ([ampersand8](https://github.com/ampersand8)) + +### Fixed + +- Do not wait for mysql socket to open if service_ensure is stopped [#948](https://github.com/puppetlabs/puppetlabs-mysql/pull/948) ([sw0x2A](https://github.com/sw0x2A)) +- (MODULES-4743) mysql : cannot initialize database dir not empty [#945](https://github.com/puppetlabs/puppetlabs-mysql/pull/945) ([shawnferry](https://github.com/shawnferry)) +- Only install bzip2 if backupcompress [#933](https://github.com/puppetlabs/puppetlabs-mysql/pull/933) ([edestecd](https://github.com/edestecd)) +- Use gfind on solaris [#920](https://github.com/puppetlabs/puppetlabs-mysql/pull/920) ([marvin0815](https://github.com/marvin0815)) + +### Other + +- Enhancements to xtrabackup backup provider [#902](https://github.com/puppetlabs/puppetlabs-mysql/pull/902) ([fraenki](https://github.com/fraenki)) + +## [3.10.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.10.0) - 2016-11-07 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.9.0...3.10.0) + +### Added + +- Add support for setting tls options for mysql_user's [#896](https://github.com/puppetlabs/puppetlabs-mysql/pull/896) ([JAORMX](https://github.com/JAORMX)) +- MODULES-3907 Add MySQL/Percona 5.7 initialize on fresh deploy [#892](https://github.com/puppetlabs/puppetlabs-mysql/pull/892) ([QuentinMoss](https://github.com/QuentinMoss)) +- Add support for REQUIRE SSL|X509 option [#888](https://github.com/puppetlabs/puppetlabs-mysql/pull/888) ([edestecd](https://github.com/edestecd)) + +### Fixed + +- Revert "Add support for REQUIRE SSL|X509 option" [#895](https://github.com/puppetlabs/puppetlabs-mysql/pull/895) ([hunner](https://github.com/hunner)) +- fixes problem with package name change from php5-mysql to php-mysql on 16.04 [#889](https://github.com/puppetlabs/puppetlabs-mysql/pull/889) ([ppouliot](https://github.com/ppouliot)) + +### Other + +- Added parameter import_cat_cmd [#891](https://github.com/puppetlabs/puppetlabs-mysql/pull/891) ([jkroepke](https://github.com/jkroepke)) + +## [3.9.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.9.0) - 2016-09-06 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.8.0...3.9.0) + +### Added + +- (MODULES-3698) Updates defaults for SLES12 [#881](https://github.com/puppetlabs/puppetlabs-mysql/pull/881) ([bmjen](https://github.com/bmjen)) +- MODULES-3711 - Add limit to mysql server ID generated value [#872](https://github.com/puppetlabs/puppetlabs-mysql/pull/872) ([QuentinMoss](https://github.com/QuentinMoss)) +- parametrize xtradb package name [#860](https://github.com/puppetlabs/puppetlabs-mysql/pull/860) ([ndelic0](https://github.com/ndelic0)) +- add new backup dump parameter maxallowedpacket [#856](https://github.com/puppetlabs/puppetlabs-mysql/pull/856) ([cfasnacht](https://github.com/cfasnacht)) +- [MODULES-3441] Discover mysql version using facts [#852](https://github.com/puppetlabs/puppetlabs-mysql/pull/852) ([jtopper](https://github.com/jtopper)) + +### Fixed + +- revoking GRANT privilege fix [#880](https://github.com/puppetlabs/puppetlabs-mysql/pull/880) ([bodik](https://github.com/bodik)) +- Ensure that error log is writable by owner [#877](https://github.com/puppetlabs/puppetlabs-mysql/pull/877) ([runejuhl](https://github.com/runejuhl)) +- MODULES-3697 Changed puppet fail behaviour for mysql create user and grant if user name is longer than 16 chars [#871](https://github.com/puppetlabs/puppetlabs-mysql/pull/871) ([dn1s](https://github.com/dn1s)) +- (MODULES-3401) Fix for mysql version retrieval [#869](https://github.com/puppetlabs/puppetlabs-mysql/pull/869) ([HelenCampbell](https://github.com/HelenCampbell)) +- MODULES-3601 Move binary logging configuration to take place after pa… [#868](https://github.com/puppetlabs/puppetlabs-mysql/pull/868) ([QuentinMoss](https://github.com/QuentinMoss)) +- Resource fails when fqdn is not set. [#853](https://github.com/puppetlabs/puppetlabs-mysql/pull/853) ([ragonlan](https://github.com/ragonlan)) +- Fix global parameter usage in backup script [#840](https://github.com/puppetlabs/puppetlabs-mysql/pull/840) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB)) + +## [3.8.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.8.0) - 2016-05-31 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.7.0...3.8.0) + +### Added + +- Support mysql_install_db script on Gentoo [#838](https://github.com/puppetlabs/puppetlabs-mysql/pull/838) ([glorpen](https://github.com/glorpen)) +- (MODULES-2111) Add the system database to user related actions. [#830](https://github.com/puppetlabs/puppetlabs-mysql/pull/830) ([fvanboven](https://github.com/fvanboven)) +- Added bzip2 package support on mysqldump backup [#827](https://github.com/puppetlabs/puppetlabs-mysql/pull/827) ([lcrisci](https://github.com/lcrisci)) + +### Fixed + +- Revert "Use mariadb by default for Debian Jessie (#845)" [#847](https://github.com/puppetlabs/puppetlabs-mysql/pull/847) ([DavidS](https://github.com/DavidS)) +- Find MySQL 5.5 installation on CentOS [#842](https://github.com/puppetlabs/puppetlabs-mysql/pull/842) ([jjagodzinski](https://github.com/jjagodzinski)) +- Fixed an issue with Amazon linux major release 4 installation [#837](https://github.com/puppetlabs/puppetlabs-mysql/pull/837) ([megianni](https://github.com/megianni)) +- default group for logfiles on Debian/Ubuntu should be adm [#836](https://github.com/puppetlabs/puppetlabs-mysql/pull/836) ([fschndr](https://github.com/fschndr)) +- Check that /var/lib/mysql actually contains files. [#834](https://github.com/puppetlabs/puppetlabs-mysql/pull/834) ([jonnytdevops](https://github.com/jonnytdevops)) +- move out $options['mysqld']['log-error'] from service.pp into installdb.pp [#833](https://github.com/puppetlabs/puppetlabs-mysql/pull/833) ([ndelic0](https://github.com/ndelic0)) +- make sure we find mysqld on FreeBSD [#831](https://github.com/puppetlabs/puppetlabs-mysql/pull/831) ([fraenki](https://github.com/fraenki)) +- remove erroneous anchors to mysql::client from mysql::db [#829](https://github.com/puppetlabs/puppetlabs-mysql/pull/829) ([vicinus](https://github.com/vicinus)) +- Remove mysql regex when checking type [#828](https://github.com/puppetlabs/puppetlabs-mysql/pull/828) ([s-t-e-v-e-n-k](https://github.com/s-t-e-v-e-n-k)) +- Default mysqld_type should be "mysql" [#824](https://github.com/puppetlabs/puppetlabs-mysql/pull/824) ([ih84ds](https://github.com/ih84ds)) +- (FM-5050) Configure the base of includedir [#821](https://github.com/puppetlabs/puppetlabs-mysql/pull/821) ([DavidS](https://github.com/DavidS)) +- (MODULES-1256) Fix parameters on OpenSUSE 12 [#820](https://github.com/puppetlabs/puppetlabs-mysql/pull/820) ([hunner](https://github.com/hunner)) +- Remove mysql_table_exists() function [#815](https://github.com/puppetlabs/puppetlabs-mysql/pull/815) ([hunner](https://github.com/hunner)) +- Config before install [#813](https://github.com/puppetlabs/puppetlabs-mysql/pull/813) ([tomkrouper](https://github.com/tomkrouper)) +- Loosen MariaDB recognition to fix it on Debian 8 [#812](https://github.com/puppetlabs/puppetlabs-mysql/pull/812) ([koubas](https://github.com/koubas)) +- Fixed global parameters skipped [#811](https://github.com/puppetlabs/puppetlabs-mysql/pull/811) ([pashamesh](https://github.com/pashamesh)) +- Use mysql_install_db only with uniq defaults-extra-file [#809](https://github.com/puppetlabs/puppetlabs-mysql/pull/809) ([mmalchuk](https://github.com/mmalchuk)) + +## [3.7.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.7.0) - 2016-03-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.6.2...3.7.0) + +### Added + +- Ubuntu vivid should use systemd not upstart [#769](https://github.com/puppetlabs/puppetlabs-mysql/pull/769) ([gabriel403](https://github.com/gabriel403)) + +### Fixed + +- (#3028) Fix mysql_grant with MySQL ANSI_QUOTES mode [#796](https://github.com/puppetlabs/puppetlabs-mysql/pull/796) ([jhriggs](https://github.com/jhriggs)) +- Re-Add the ability to set a empty string as option parameter [#791](https://github.com/puppetlabs/puppetlabs-mysql/pull/791) ([roidelapluie](https://github.com/roidelapluie)) +- (MODULES-2676) Fixed new mysql_datadir provider on CentOS for MySQl 5.7.6 compatibility [#789](https://github.com/puppetlabs/puppetlabs-mysql/pull/789) ([elconas](https://github.com/elconas)) +- Fixing error when disabling service management and the service does not exist [#787](https://github.com/puppetlabs/puppetlabs-mysql/pull/787) ([obi11235](https://github.com/obi11235)) +- ensure if service restart to wait till mysql is up [#784](https://github.com/puppetlabs/puppetlabs-mysql/pull/784) ([vicinus](https://github.com/vicinus)) +- Fixes edge-case with dropping pre-existing users with grants [#779](https://github.com/puppetlabs/puppetlabs-mysql/pull/779) ([jmcclell](https://github.com/jmcclell)) + +## [3.6.2](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.6.2) - 2015-12-04 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.6.1...3.6.2) + +### Added + +- MODULES-2650 Add support for renamed password column [#760](https://github.com/puppetlabs/puppetlabs-mysql/pull/760) ([roman-mueller](https://github.com/roman-mueller)) + +### Fixed + +- Use temp cnf file instead of env variable. [#778](https://github.com/puppetlabs/puppetlabs-mysql/pull/778) ([mentat](https://github.com/mentat)) +- (MODULES-2767) fix mysql_table_exists: add check for args.size, fix rspec test [#777](https://github.com/puppetlabs/puppetlabs-mysql/pull/777) ([agadelshin](https://github.com/agadelshin)) +- (MODULES-2767) allow to check if table exists before grant [#776](https://github.com/puppetlabs/puppetlabs-mysql/pull/776) ([agadelshin](https://github.com/agadelshin)) +- (MODULES-2605) Use MYSQL_PWD to avoid mysqldump warnings. [#775](https://github.com/puppetlabs/puppetlabs-mysql/pull/775) ([abednarik](https://github.com/abednarik)) +- (MODULES-2787) Fixes for future parser [#773](https://github.com/puppetlabs/puppetlabs-mysql/pull/773) ([paco0x](https://github.com/paco0x)) +- (MODULES-2490) correct the daemon_dev_package_name for mariadb on redhat [#768](https://github.com/puppetlabs/puppetlabs-mysql/pull/768) ([DavidS](https://github.com/DavidS)) +- Fixes unique server_id within my.cnf Ticket/MODULES-2675 [#767](https://github.com/puppetlabs/puppetlabs-mysql/pull/767) ([jkarns87](https://github.com/jkarns87)) +- (MODULES-2683) fix version compare to properly suppress show_diff for… [#766](https://github.com/puppetlabs/puppetlabs-mysql/pull/766) ([DavidS](https://github.com/DavidS)) -- \[FM-6962\] Removal of unsupported OS from mysql [\#1086](https://github.com/puppetlabs/puppetlabs-mysql/pull/1086) ([david22swan](https://github.com/david22swan)) +### Other + +- Using mariadb in OpenSuSE >= 13.1. [#572](https://github.com/puppetlabs/puppetlabs-mysql/pull/572) ([sharumpe](https://github.com/sharumpe)) + +## [3.6.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.6.1) - 2015-09-22 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.6.0...3.6.1) + +### Fixed + +- Fix when not managing config file [#751](https://github.com/puppetlabs/puppetlabs-mysql/pull/751) ([mcanevet](https://github.com/mcanevet)) +- Fixes improper use of function 'warn' in backup manifest of server. [#749](https://github.com/puppetlabs/puppetlabs-mysql/pull/749) ([Herr-Herner](https://github.com/Herr-Herner)) + +## [3.6.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.6.0) - 2015-08-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.5.0...3.6.0) + +### Added + +- (MODULES-2340) Implement script functionality for xtrabackup provider [#744](https://github.com/puppetlabs/puppetlabs-mysql/pull/744) ([danzilio](https://github.com/danzilio)) + +### Fixed + +- (PUP-5021) depend on package title, not name [#746](https://github.com/puppetlabs/puppetlabs-mysql/pull/746) ([hunner](https://github.com/hunner)) +- #2030 Only establish dependency between service and package if package is managed. [#745](https://github.com/puppetlabs/puppetlabs-mysql/pull/745) ([jonnytdevops](https://github.com/jonnytdevops)) +- Fix show_diff already set on .my.cnf [#743](https://github.com/puppetlabs/puppetlabs-mysql/pull/743) ([michaeltchapman](https://github.com/michaeltchapman)) +- Ensure idempotency between Puppet runs [#742](https://github.com/puppetlabs/puppetlabs-mysql/pull/742) ([EmilienM](https://github.com/EmilienM)) +- Dont print root [#739](https://github.com/puppetlabs/puppetlabs-mysql/pull/739) ([hunner](https://github.com/hunner)) +- [#puppethack] do not require mysql::server when using mysql::db [#736](https://github.com/puppetlabs/puppetlabs-mysql/pull/736) ([igalic](https://github.com/igalic)) +- Remove default install root password if set [#682](https://github.com/puppetlabs/puppetlabs-mysql/pull/682) ([JCotton1123](https://github.com/JCotton1123)) + +## [3.5.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.5.0) - 2015-07-29 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.4.0...3.5.0) + +### Added + +- Add Solaris support to MySQL module [#729](https://github.com/puppetlabs/puppetlabs-mysql/pull/729) ([drewfisher314](https://github.com/drewfisher314)) +- Add helper to install puppet/pe/puppet-agent [#725](https://github.com/puppetlabs/puppetlabs-mysql/pull/725) ([hunner](https://github.com/hunner)) +- length check for usernames should take mysql version into consideration [#722](https://github.com/puppetlabs/puppetlabs-mysql/pull/722) ([igalic](https://github.com/igalic)) + +### Fixed + +- Don't explode if macaddress isn't set [#730](https://github.com/puppetlabs/puppetlabs-mysql/pull/730) ([binford2k](https://github.com/binford2k)) +- fix Evaluation Error with future parser [#728](https://github.com/puppetlabs/puppetlabs-mysql/pull/728) ([timogoebel](https://github.com/timogoebel)) +- (MODULES-2077) Fixes wrong dependency variable [#719](https://github.com/puppetlabs/puppetlabs-mysql/pull/719) ([Spredzy](https://github.com/Spredzy)) +- Fixed server package name so it isn't hardcoded to mysql [#718](https://github.com/puppetlabs/puppetlabs-mysql/pull/718) ([igalic](https://github.com/igalic)) + +## [3.4.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.4.0) - 2015-05-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.3.0...3.4.0) + +### Added + +- Added options for including/excluding triggers and routines to the mysql::server::backup module [#705](https://github.com/puppetlabs/puppetlabs-mysql/pull/705) ([stevesaliman](https://github.com/stevesaliman)) +- Adds default values for parameters and align assignments [#699](https://github.com/puppetlabs/puppetlabs-mysql/pull/699) ([melan](https://github.com/melan)) +- Added server_id fact [#676](https://github.com/puppetlabs/puppetlabs-mysql/pull/676) ([igalic](https://github.com/igalic)) +- Add OpenBSD support. [#567](https://github.com/puppetlabs/puppetlabs-mysql/pull/567) ([buzzdeee](https://github.com/buzzdeee)) + +### Fixed + +- update to proper defaults for freebsd [#712](https://github.com/puppetlabs/puppetlabs-mysql/pull/712) ([sethlyons](https://github.com/sethlyons)) +- (fix) - Change default for mysql::server::backup to ignore_triggers =… [#711](https://github.com/puppetlabs/puppetlabs-mysql/pull/711) ([cyberious](https://github.com/cyberious)) +- (fix) - Fix issue where fact is unknown at start - Resolve issue where if known and failed versioncmp would result in idempotency issue on second run [#709](https://github.com/puppetlabs/puppetlabs-mysql/pull/709) ([cyberious](https://github.com/cyberious)) +- MODULES-1981: Revoke and grant difference of old and new privileges [#706](https://github.com/puppetlabs/puppetlabs-mysql/pull/706) ([agadelshin](https://github.com/agadelshin)) +- Bugfix on Xtrabackup crons [#700](https://github.com/puppetlabs/puppetlabs-mysql/pull/700) ([mvisonneau](https://github.com/mvisonneau)) +- fix FreeBSD support for backups [#697](https://github.com/puppetlabs/puppetlabs-mysql/pull/697) ([fraenki](https://github.com/fraenki)) +- Fix regression introduced by adding OpenBSD support. [#691](https://github.com/puppetlabs/puppetlabs-mysql/pull/691) ([buzzdeee](https://github.com/buzzdeee)) +- Manage service only if managed [#688](https://github.com/puppetlabs/puppetlabs-mysql/pull/688) ([mremy](https://github.com/mremy)) +- mysql backup: fix regression in mysql_user call [#687](https://github.com/puppetlabs/puppetlabs-mysql/pull/687) ([igalic](https://github.com/igalic)) +- Only set up ordering between the config file and the service if we're managing the config file. [#672](https://github.com/puppetlabs/puppetlabs-mysql/pull/672) ([timmooney](https://github.com/timmooney)) + +### Other + +- (fix) - Check for mysql_verison before assuming that triggers are a valid permission [#708](https://github.com/puppetlabs/puppetlabs-mysql/pull/708) ([cyberious](https://github.com/cyberious)) + +## [3.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.3.0) - 2015-03-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.2.0...3.3.0) + +### Added + +- (MODULES-1804) Allow override of log-error [#678](https://github.com/puppetlabs/puppetlabs-mysql/pull/678) ([hunner](https://github.com/hunner)) +- Use backup providers [#649](https://github.com/puppetlabs/puppetlabs-mysql/pull/649) ([dveeden](https://github.com/dveeden)) +- (MODULES-1143) Add package_manage parameters [#617](https://github.com/puppetlabs/puppetlabs-mysql/pull/617) ([juniorsysadmin](https://github.com/juniorsysadmin)) + +### Fixed + +- PR 654 was incorrectly using stdlib dirname [#677](https://github.com/puppetlabs/puppetlabs-mysql/pull/677) ([underscorgan](https://github.com/underscorgan)) +- Fix bug in 578 [#671](https://github.com/puppetlabs/puppetlabs-mysql/pull/671) ([aldavud](https://github.com/aldavud)) +- Check for full path for log-bin to stop puppet from managing directory “." [#654](https://github.com/puppetlabs/puppetlabs-mysql/pull/654) ([NoodlesNZ](https://github.com/NoodlesNZ)) + +## [3.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.2.0) - 2015-02-10 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.1.0...3.2.0) + +### Added + +- Support authentication plugins [#645](https://github.com/puppetlabs/puppetlabs-mysql/pull/645) ([dveeden](https://github.com/dveeden)) +- Add type & provider for managing plugins [#641](https://github.com/puppetlabs/puppetlabs-mysql/pull/641) ([dveeden](https://github.com/dveeden)) +- Support for authentication plugins [#640](https://github.com/puppetlabs/puppetlabs-mysql/pull/640) ([dveeden](https://github.com/dveeden)) +- mysql_install_db freebsd support [#616](https://github.com/puppetlabs/puppetlabs-mysql/pull/616) ([takumin](https://github.com/takumin)) +- Add new parameters create_root_user and create_root_my_cnf. [#578](https://github.com/puppetlabs/puppetlabs-mysql/pull/578) ([franzs](https://github.com/franzs)) + +### Fixed + +- MODULES-1759: Remove dependency on stdlib >=4.1.0 [#661](https://github.com/puppetlabs/puppetlabs-mysql/pull/661) ([underscorgan](https://github.com/underscorgan)) +- Bugfix: increase minimum stdlib [#660](https://github.com/puppetlabs/puppetlabs-mysql/pull/660) ([hunner](https://github.com/hunner)) +- Make grant autorequire user [#658](https://github.com/puppetlabs/puppetlabs-mysql/pull/658) ([hunner](https://github.com/hunner)) +- Revert "(#MODULES-1058) root_password.pp cannot create /root/.my.cnf due... [#656](https://github.com/puppetlabs/puppetlabs-mysql/pull/656) ([cyberious](https://github.com/cyberious)) +- (MODULES-1731) Invalid parameter 'provider' removed from mysql_user instance. [#655](https://github.com/puppetlabs/puppetlabs-mysql/pull/655) ([rnelson0](https://github.com/rnelson0)) +- (#MODULES-1058) root_password.pp cannot create /root/.my.cnf due to depe... [#651](https://github.com/puppetlabs/puppetlabs-mysql/pull/651) ([lodgenbd](https://github.com/lodgenbd)) +- Return an empty string for an empty input. [#646](https://github.com/puppetlabs/puppetlabs-mysql/pull/646) ([dveeden](https://github.com/dveeden)) +- Revert "Support for authentication plugins" [#644](https://github.com/puppetlabs/puppetlabs-mysql/pull/644) ([cmurphy](https://github.com/cmurphy)) +- Make sure the example is somewhat secure [#638](https://github.com/puppetlabs/puppetlabs-mysql/pull/638) ([dveeden](https://github.com/dveeden)) +- Do the right thing when fqdn==localhost [#637](https://github.com/puppetlabs/puppetlabs-mysql/pull/637) ([dveeden](https://github.com/dveeden)) +- Future parser fix in params.pp [#632](https://github.com/puppetlabs/puppetlabs-mysql/pull/632) ([underscorgan](https://github.com/underscorgan)) +- under Debian 8 package name for ruby mysql biding is called ruby-mysql, ... [#629](https://github.com/puppetlabs/puppetlabs-mysql/pull/629) ([Zouuup](https://github.com/Zouuup)) +- ensure mysql-config-file and server package is in place before trying to... [#615](https://github.com/puppetlabs/puppetlabs-mysql/pull/615) ([KlavsKlavsen](https://github.com/KlavsKlavsen)) + +## [3.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.1.0) - 2014-12-16 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/3.0.0...3.1.0) ### Added -- \(FM-5985\) - Addition of support for Ubuntu 18.04 to mysql [\#1104](https://github.com/puppetlabs/puppetlabs-mysql/pull/1104) ([david22swan](https://github.com/david22swan)) -- \(MODULES-7439\) - Implementing beaker-testmode\_switcher [\#1095](https://github.com/puppetlabs/puppetlabs-mysql/pull/1095) ([pmcmaw](https://github.com/pmcmaw)) -- Support for optional\_\_args and prescript to mysqldump backup provider [\#1083](https://github.com/puppetlabs/puppetlabs-mysql/pull/1083) ([eputnam](https://github.com/eputnam)) -- Allow empty user passwords [\#1075](https://github.com/puppetlabs/puppetlabs-mysql/pull/1075) ([disappear89](https://github.com/disappear89)) -- Add user tls\_options and grant options to mysql::db [\#1065](https://github.com/puppetlabs/puppetlabs-mysql/pull/1065) ([edestecd](https://github.com/edestecd)) -- Use puppet4 functions-api [\#1044](https://github.com/puppetlabs/puppetlabs-mysql/pull/1044) ([juliantodt](https://github.com/juliantodt)) -- Replaced 'DROP USER' with 'DROP USER IF EXISTS' [\#942](https://github.com/puppetlabs/puppetlabs-mysql/pull/942) ([libertamohamed](https://github.com/libertamohamed)) - -### Fixed - -- \(MODULES-7353\) Enable service for Debian 9 [\#1094](https://github.com/puppetlabs/puppetlabs-mysql/pull/1094) ([david22swan](https://github.com/david22swan)) -- Update locales test for Debian 9 [\#1091](https://github.com/puppetlabs/puppetlabs-mysql/pull/1091) ([HelenCampbell](https://github.com/HelenCampbell)) -- \[FM-7045\] Fix to allow Debian 9 test's to run clean [\#1088](https://github.com/puppetlabs/puppetlabs-mysql/pull/1088) ([david22swan](https://github.com/david22swan)) -- \(MODULES-7198\) Fix DROP USER IF EXISTS on mariadb [\#1082](https://github.com/puppetlabs/puppetlabs-mysql/pull/1082) ([hunner](https://github.com/hunner)) - -## 5.4.0 - -### Added - -- \(PDOC-210\) Puppet Strings documentation [\#1068](https://github.com/puppetlabs/puppetlabs-mysql/pull/1068) ([hunner](https://github.com/hunner)) -- Compatibility for Alpine linux [\#1049](https://github.com/puppetlabs/puppetlabs-mysql/pull/1049) ([cisco87](https://github.com/cisco87)) - -### Fixed - -- \(MODULES-6627\) Removed unused --host flag from mysqlcaller [\#1064](https://github.com/puppetlabs/puppetlabs-mysql/pull/1064) ([HelenCampbell](https://github.com/HelenCampbell)) -- Fixed archlinux compatibility [\#1057](https://github.com/puppetlabs/puppetlabs-mysql/pull/1057) ([bastelfreak](https://github.com/bastelfreak)) -- Changed input param option in export.json from sql to file [\#1054](https://github.com/puppetlabs/puppetlabs-mysql/pull/1054) ([cgoswami](https://github.com/cgoswami)) - -## Supported Release [5.3.0] -### Summary -This release uses the PDK convert functionality which in return makes the module PDK compliant. It also includes a roll up of maintenance changes, a new task and support for `GRANTS FUNCTION`. - -### Added -- Add support for `GRANTS FUNCTION` ([MODULES-2075](https://tickets.puppet.com/browse/MODULES-2075)). -- Add Export database task. -- PDK Convert mysql ([MODULES-6454](https://tickets.puppet.com/browse/MODULES-6454)). - -### Changed -- Allow authentication plugin to be changed. -- Update mysql_user provider. -- Plugins don't exist before 5.5; password field name changed -- Fix helpful rubocops and disable hurtful cops. -- Addressing puppet-lint and rubocop errors -- Remove update bundler and add ignore .DS_Store -- Skip rubocop warning in task. -- Fix a typo in a classname in the changelog. - -## Supported Release [5.2.1] -### Summary -This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks. - -### Fixed -- Fix export and mysql tasks for arbitrary remote code - -## Supported Release [5.2.0] - -### Added -- Compatibility for puppet-staging 3.0.0 - -### Fixed -- Centralize all mysql command calls for providers -- Add paths to `mysql_datadir` provider for RedHat Software Collections - -## Supported Release [5.1.0] -### Summary -This release adds Tasks to the Mysql module. - -#### Added -- Adds the execute sql task. - -## Supported Release [5.0.0] -### Summary -This is a major release that adds support for string translation. Currently the only supported language besides -English is Japanese. - -#### Added -- Several gem dependencies required for translation. -- Wrapping of strings that require translation. Strings in ruby code are now wrapped with `_()` and strings in puppet code with `translate()`. -- Debian 9 support - -#### Changed -- The default php_package_name for Debian and Ubuntu to `php-mysql` - -## Supported Release 4.0.1 -### Summary -This is a small bugfix release that makes `mysql_install_db` optional and fixes some regular expression issues. - -#### Bugfixes -- ([MODULES-5528](https://tickets.puppet.com/browse/MODULES-5528)) Fixes the `mysql_install_db` command so that it is optional -- ([MODULES-5602](https://tickets.puppet.com/browse/MODULES-5602)) Removes superfluous backslashes in some regular expressions that were causing instability - -## Supported Release 4.0.0 -### Summary -This release sees the enablement of rubocop, also an update to the lib directory with rubocop fixes and several other changes and fixes. Also a bump to the Puppet version compatibility and several Puppet language updates. - -#### Added -- Updated README.md with example how to install MySQL Community Server 5.6 on Centos 7.3 -- Enabled Rubocop and addition of Rubocop fixes for /lib directory. - -#### Removed -- Dropped legacy tests for db.pp. - -#### Changed -- Replaced validate function calls with datatypes in db.pp. -- Bumped recommended puppet version to between 4.7.0 and 6.0.0. -- Conditionalize name validation in mysql_grant type. ([MODULES-4604](https://tickets.puppet.com/browse/MODULES-4604)) - -#### Fixed -- Removal of invalid parameter provider on Mysql_user[user@localhost] in mysql::db ([MODULES-4115](https://tickets.puppet.com/browse/MODULES-4115)) -- Fixed server_service_name for Debian/stretch. -- Spec fixes for Puppet 5. -- Test update for fix:create procedure, then grant ([MODULES-5390](https://tickets.puppet.com/browse/MODULES-5390)) -- Fixing empty user/password issue for xtrabackup. Now defaults as undef instead of ''. -- Remove unsupported Ubuntu versions ([MODULES-5501](https://tickets.puppet.com/browse/MODULES-5501)) - -## Supported Release 3.11.0 -### Summary -This release includes README and metadata translations to Japanese, as well as some enhancements and bugfixes. - -#### Added -- New flag for successful backups -- Solaris support improvements -- New parameter `optional_args` for extra innobackupex options -- Specify environment variables (e.g. https_proxy) for MySQLTuner download. -- Check to only install bzip2 if `$backupcompress` is `true` -- Debian 9 compatibility -- Japanese README - -#### Fixed -- Syntax errors -- Bug where error logs were being created before the datadir was initialized (MODULES-4743) - -## Supported Release 3.10.0 -### Summary -This release includes new features for setting TLS options on a mysql user, a new parameter to allow specifying tool to import sql files, as well as various bugfixes. - -#### Features -- (MODULES-3879) Adds `import_cat_cmd` parameter to specify the command to read sql files -- Adds support for setting `tls_options` in `mysql_user` - -#### Bugfixes -- (MODULES-3557) Adds Ubuntu 16.04 package names for language bindings -- (MODULES-3907) Adds MySQL/Percona 5.7 initialize on fresh deploy - -## Supported Release 3.9.0 -### Summary -This release adds Percona 5.7 support and compatibility with Ubuntu 16.04, in addition to various bugfixes. - -#### Features -- (MODULES-3441) Adds the `mysqld_version` fact -- (MODULES-3513) Adds a new backup dump parameter `maxallowedpacket` -- Adds new parameter `xtrabackup_package_name` to `mysql::backup::xtrabackup` class -- Adds ability to revoke GRANT privilege - -#### Bugfixes -- Fixes a bug where `mysql_user` fails if facter cannot retrieve fqdn. -- Fix global parameter usage in backup script -- Adds support for `puppet-staging` version `2.0.0` -- (MODULES-3601) Moves binary logging configuration to take place after package install -- (MODULES-3711) Add limit to mysql server ID generated value -- (MODULES-3698) Fixes defaults for SLES12 -- Updates user name length restrictions for MySQL version 5.7.8 and above. -- Fixes a bug where error log is not writable by owner - -## Supported Release 3.8.0 -### Summary -This release adds Percona 5.7 support and compatibility with Ubuntu 16.04, in addition to various bugfixes. - -#### Features -- Adds support for Percona 5.7 -- Adds support for Ubuntu 16.04 (Xenial) - -#### Known Limitations -- The mysqlbackup.sh script will not work on MySQL 5.7.0 and up. - -#### Bugfixes -- Use mysql_install_db only with uniq defaults-extra-file -- Updates mysqlbackup.sh to ensure backup directory exist -- Loosen MariaDB recognition to fix it on Debian 8 -- Allow mysql::backup::mysqldump to access root_group in tests -- Fixed problem with ignoring parameters from global configs -- Fixes ordering issue that initialized mysqld before config is set -- (MODULES-1256) Fix parameters on OpenSUSE 12 -- Fixes install errors on Debian-based OS by configuring the base of includedir -- Configure the configfile location for mariadb -- Default mysqld_type return value should be 'mysql' if another type is not detected -- Make sure that bzip2 is installed before setting up the cron tab job using mysqlbackup.sh -- Fixes path issue on FreeBSD -- Check that /var/lib/mysql actually contains files -- Removes mysql regex when checking type -- (MODULES-2111) Add the system database to user related actions -- Updates default group for logfiles on Debian-based OS to 'adm' -- Fixes an issue with Amazon linux major release 4 installation -- Fixes 'mysql_install_db' script support on Gentoo -- Removes erroneous anchors to mysql::client from mysql::db -- Adds path to be able to find MySQL 5.5 installation on CentOS - -## Supported Release 3.7.0 -### Summary - -A large release with several new features. Also includes a considerable amount of bugfixes, many around compatibility and improvements to current functionality. - -#### Features - -- Now uses mariadb in OpenSuSE >= 13.1. -- Switch to rspec-puppet-facts. -- Additional function to check if table exists before grant. -- Add ability to input password hash directly. -- Now checking major release instead of specific release. -- Debian 8 support. - -#### Bugfixes - -- Minor doc update. -- Fixes improper use of function `warn` in backup manifest of server. -- Fixes to Compatibility with PE 3.3. -- Fixes `when not managing config file` in `mysql_server_spec`. -- Improved user validation and munging. -- Fixes fetching the mysql_user password for MySQL >=5.7.6. -- Fixes unique server_id within my.cnf, the issue were the entire mac address was not being read in to generate the id. -- Corrects the daemon_dev_package_name for mariadb on redhat. -- Fix version compare to properly suppress show_diff for root password. -- Fixes to ensure compatibility with future parser. -- Solaris removed from PE in metadata as its not supported. -- Use MYSQL_PWD to avoid mysqldump warnings. -- Use temp cnf file instead of env variable which creates acceptance test failures. -- No longer hash passwords that are already hashed. -- Fix Gemfile to work with ruby 1.8.7. -- Fixed MySQL 5.7.6++ compatibility. -- Fixing error when disabling service management and the service does not exist. -- Ubuntu vivid should use systemd not upstart. -- Fixed new mysql_datadir provider on CentOS for MySQl 5.7.6 compatibility. -- Ensure if service restart to wait till mysql is up. -- Move all dependencies to not have them in case of service unmanaged. -- Re-Added the ability to set a empty string as option parameter. -- Fixes edge-case with dropping pre-existing users with grants. -- Fix logic for choosing rspec version. -- Refactored main acceptance suite. -- Skip idempotency tests on test cells that do have PUP-5016 unfixed. -- Fix tmpdir to be shared across examples. -- Update to current msync configs [006831f]. -- Fix mysql_grant with MySQL ANSI_QUOTES mode. -- Generate .my.cnf for all sections. - -## Supported Release 3.6.2 -### Summary - -Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. - -## 2015-09-22 - Supported Release 3.6.1 -### Summary -This is a security and bugfix release that fixes incorrect username truncation in the munge for the mysql_user type, incorrect function used in `mysql::server::backup` and fixes compatibility issues with PE 3.3.x. - -#### Bugfixes -- Loosen the regex in mysql_user munging so the username is not unintentionally truncated. -- Use `warning()` not `warn()` -- Metadata had inadvertantly dropped 3.3.x support -- Some 3.3.x compatibility issues in `mysqltuner` were corrected - -## 2015-08-10 - Supported Release 3.6.0 -### Summary -This release adds the ability to use mysql::db and `mysql_*` types against unmanaged or external mysql instances. - -#### Features -- Add ability to use mysql::db WITHOUT mysql::server (ie, externally) -- Add prescript attribute to mysql::server::backup for xtrabackup -- Add postscript ability to xtrabackup provider. - -#### Bugfixes -- Fix default root passwords blocking puppet on mysql 5.8 -- Fix service dependency when package_manage is false -- Fix selinux permissions on my.cnf - -## 2015-07-23 - Supported Release 3.5.0 -### Summary -A small release to add explicit support to newer Puppet versions and accumulated patches. - -#### Features/Improvements -- Start running tests against puppet 4 -- Support longer usernames on newer MariaDB versions -- Add parameters for Solaris 11 and 12 - -#### Bugfixes -- Fix references to the mysql-server package -- mysql_server_id doesn't throw and error on machines without macaddress - -## 2015-05-19 - Supported Release 3.4.0 -### Summary -This release includes the addition of extra facts, OpenBSD compatibility, and a number of other features, improvements and bug fixes. - -#### Features/Improvements -- Added server_id fact which includes mac address for better uniqueness -- Added OpenBSD compatibility, only for 'OpenBSD -current' (due to the recent switch to mariadb) -- Added a $mysql_group parameter, and use that instead of the $root_group parameter to define the group membership of the mysql error log file. -- Updated tests for rspec-puppet 2 and future parser -- Further acceptance testing improvements -- MODULES-1928 - allow log-error to be undef -- Split package installation and database install -- README wording improvements -- Added options for including/excluding triggers and routines -- Made the 'TRIGGER' privilege of mysqldump backups depend on whether or not we are actually backing up triggers -- Cleaned up the privilege assignment in the mysqldump backup script -- Add a fact for capturing the mysql version installed - -#### Bugfixes -- mysql backup: fix regression in mysql_user call -- Set service_ensure to undef, in the case of an unmanaged service -- README Typos fixed -- Bugfix on Xtrabackup crons -- Fixed a permission problem that was preventing triggers from being backed up -- MODULES-1981: Revoke and grant difference of old and new privileges -- Fix an issue were we assume triggers work -- Change default for mysql::server::backup to ignore_triggers = false - -#### Deprecations -mysql::server::old_root_password property - -## 2015-03-03 - Supported Release 3.3.0 -### Summary -This release includes major README updates, the addition of backup providers, and a fix for managing the log-bin directory. - -#### Features -- Add package_manage parameters to `mysql::server` and `mysql::client` (MODULES-1143) -- README improvements -- Add `mysqldump`, `mysqlbackup`, and `xtrabackup` backup providers. - -#### Bugfixes -- log-error overrides were not being properly used (MODULES-1804) -- check for full path for log-bin to stop puppet from managing file '.' - -## 2015-02-09 - Supported Release 3.2.0 -### Summary -This release includes several new features and bugfixes, including support for various plugins, making the output from mysql_password more consistent when input is empty and improved username validation. - -#### Features -- Add type and provider to manage plugins -- Add support for authentication plugins -- Add support for mysql_install_db on freebsd -- Add `create_root_user` and `create_root_my_cnf` parameters to `mysql::server` - -#### Bugfixes -- Remove dependency on stdlib >= 4.1.0 (MODULES-1759) -- Make grant autorequire user -- Remove invalid parameter 'provider' from mysql_user instance (MODULES-1731) -- Return empty string for empty input in mysql_password -- Fix `mysql::account_security` when fqdn==localhost -- Update username validation (MODULES-1520) -- Future parser fix in params.pp -- Fix package name for debian 8 -- Don't start the service until the server package is installed and the config file is in place -- Test fixes -- Lint fixes - -## 2014-12-16 - Supported Release 3.1.0 -### Summary - -This release includes several new features, including SLES12 support, and a number of bug fixes. - -#### Notes - -`mysql::server::mysqltuner` has been refactored to fetch the mysqltuner script from github by default. If you are running on a non-network-connected system, you will need to download that file and have it available to your node at a path specified by the `source` parameter to the `mysqltuner` class. - -#### Features -- Add support for install_options for all package resources (MODULES-1484) -- Add log-bin directory creation -- Allow mysql::db to import multiple files (MODULES-1338) -- SLES12 support -- Improved identifier quoting detections -- Reworked `mysql::server::mysqltuner` so that we are no longer packaging the script as it is licensed under the GPL. - -#### Bugfixes -- Fix regression in username validation -- Proper containment for mysql::client in mysql::db -- Support quoted usernames of length 15 and 16 chars - -## 2014-11-11 - Supported Release 3.0.0 -### Summary - -Added several new features including MariaDB support and future parser - -#### Backwards-incompatible Changes -* Remove the deprecated `database`, `database_user`, and `database_grant` resources. The correct resources to use are `mysql`, `mysql_user`, and `mysql_grant` respectively. - -#### Features -* Add MariaDB Support -* The mysqltuner perl script has been updated to 1.3.0 based on work at http://github.com/major/MySQLTuner-perl -* Add future parse support, fixed issues with undef to empty string -* Pass the backup credentials to 'SHOW DATABASES' -* Ability to specify the Includedir for `mysql::server` -* `mysql::db` now has an import\_timeout feature that defaults to 300 -* The `mysql` class has been removed -* `mysql::server` now takes an `override_options` hash that will affect the installation -* Ability to install both dev and client dev - -#### BugFix -* `mysql::server::backup` now passes `ensure` param to the nested `mysql_grant` -* `mysql::server::service` now properly requires the presence of the `log_error` file -* `mysql::config` now occurs before `mysql::server::install_db` correctly - -## 2014-07-15 - Supported Release 2.3.1 -### Summary - -This release merely updates metadata.json so the module can be uninstalled and -upgraded via the puppet module command. - -## 2014-05-14 - Supported Release 2.3.0 - -This release primarily adds support for RHEL7 and Ubuntu 14.04 but it -also adds a couple of new parameters to allow for further customization, -as well as ensuring backups can backup stored procedures properly. - -#### Features -Added `execpath` to allow a custom executable path for non-standard mysql installations. -Added `dbname` to mysql::db and use ensure_resource to create the resource. -Added support for RHEL7 and Fedora Rawhide. -Added support for Ubuntu 14.04. -Create a warning for if you disable SSL. -Ensure the error logfile is owned by MySQL. -Disable ssl on FreeBSD. -Add PROCESS privilege for backups. - -#### Bugfixes - -#### Known Bugs -* No known bugs - -## 2014-03-04 - Supported Release 2.2.3 -### Summary - -This is a supported release. This release removes a testing symlink that can -cause trouble on systems where /var is on a seperate filesystem from the -modulepath. - -#### Features -#### Bugfixes -#### Known Bugs -* No known bugs - -## 2014-03-04 - Supported Release 2.2.2 -### Summary -This is a supported release. Mostly comprised of enhanced testing, plus a -bugfix for Suse. - -#### Bugfixes -- PHP bindings on Suse -- Test fixes - -#### Known Bugs -* No known bugs - -## 2014-02-19 - Version 2.2.1 - -### Summary - -Minor release that repairs mysql_database{} so that it sees the correct -collation settings (it was only checking the global mysql ones, not the -actual database and constantly setting it over and over since January 22nd). - -Also fixes a bunch of tests on various platforms. - - -## 2014-02-13 - Version 2.2.0 - -### Summary - -#### Features -- Add `backupdirmode`, `backupdirowner`, `backupdirgroup` to - mysql::server::backup to allow customizing the mysqlbackupdir. -- Support multiple options of the same name, allowing you to - do 'replicate-do-db' => ['base1', 'base2', 'base3'] in order to get three - lines of replicate-do-db = base1, replicate-do-db = base2 etc. - -#### Bugfixes -- Fix `restart` so it actually stops mysql restarting if set to false. -- DRY out the defaults_file functionality in the providers. -- mysql_grant fixed to work with root@localhost/@. -- mysql_grant fixed for WITH MAX_QUERIES_PER_HOUR -- mysql_grant fixed so revoking all privileges accounts for GRANT OPTION -- mysql_grant fixed to remove duplicate privileges. -- mysql_grant fixed to handle PROCEDURES when removing privileges. -- mysql_database won't try to create existing databases, breaking replication. -- bind_address renamed bind-address in 'mysqld' options. -- key_buffer renamed to key_buffer_size. -- log_error renamed to log-error. -- pid_file renamed to pid-file. -- Ensure mysql::server::root_password runs before mysql::server::backup -- Fix options_override -> override_options in the README. -- Extensively rewrite the README to be accurate and awesome. -- Move to requiring stdlib 3.2.0, shipped in PE3.0 -- Add many new tests. - - -## 2013-11-13 - Version 2.1.0 - -### Summary - -The most important changes in 2.1.0 are improvements to the my.cnf creation, -as well as providers. Setting options to = true strips them to be just the -key name itself, which is required for some options. - -The provider updates fix a number of bugs, from lowercase privileges to -deprecation warnings. - -Last, the new hiera integration functionality should make it easier to -externalize all your grants, users, and, databases. Another great set of -community submissions helped to make this release. - -#### Features -- Some options can not take a argument. Gets rid of the '= true' when an -option is set to true. -- Easier hiera integration: Add hash parameters to mysql::server to allow -specifying grants, users, and databases. - -#### Bugfixes -- Fix an issue with lowercase privileges in mysql_grant{} causing them to be reapplied needlessly. -- Changed defaults-file to defaults-extra-file in providers. -- Ensure /root/.my.cnf is 0600 and root owned. -- database_user deprecation warning was incorrect. -- Add anchor pattern for client.pp -- Documentation improvements. -- Various test fixes. - - -## 2013-10-21 - Version 2.0.1 - -### Summary - -This is a bugfix release to handle an issue where unsorted mysql_grant{} -privileges could cause Puppet to incorrectly reapply the permissions on -each run. - -#### Bugfixes -- Mysql_grant now sorts privileges in the type and provider for comparison. -- Comment and test tweak for PE3.1. - - -## 2013-10-14 - Version 2.0.0 - -### Summary - -(Previously detailed in the changelog for 2.0.0-rc1) - -This module has been completely refactored and works significantly different. -The changes are broad and touch almost every piece of the module. - -See the README.md for full details of all changes and syntax. -Please remain on 1.0.0 if you don't have time to fully test this in dev. - -* mysql::server, mysql::client, and mysql::bindings are the primary interface -classes. -* mysql::server takes an `override_options` parameter to set my.cnf options, -with the hash format: { 'section' => { 'thing' => 'value' }} -* mysql attempts backwards compatibility by forwarding all parameters to -mysql::server. - - -## 2013-10-09 - Version 2.0.0-rc5 - -### Summary - -Hopefully the final rc! Further fixes to mysql_grant (stripping out the -cleverness so we match a much wider range of input.) - -#### Bugfixes -- Make mysql_grant accept '.*'@'.*' in terms of input for user@host. - - -## 2013-10-09 - Version 2.0.0-rc4 - -### Summary - -Bugfixes to mysql_grant and mysql_user form the bulk of this rc, as well as -ensuring that values in the override_options hash that contain a value of '' -are created as just "key" in the conf rather than "key =" or "key = false". - -#### Bugfixes -- Improve mysql_grant to work with IPv6 addresses (both long and short). -- Ensure @host users work as well as user@host users. -- Updated my.cnf template to support items with no values. - - -## 2013-10-07 - Version 2.0.0-rc3 - -### Summary -Fix mysql::server::monitor's use of mysql_user{}. - -#### Bugfixes -- Fix myql::server::monitor's use of mysql_user{} to grant the proper -permissions. Add specs as well. (Thanks to treydock!) - - -## 2013-10-03 - Version 2.0.0-rc2 - -### Summary -Bugfixes - -#### Bugfixes -- Fix a duplicate parameter in mysql::server - - -## 2013-10-03 - Version 2.0.0-rc1 - -### Summary - -This module has been completely refactored and works significantly different. -The changes are broad and touch almost every piece of the module. - -See the README.md for full details of all changes and syntax. -Please remain on 1.0.0 if you don't have time to fully test this in dev. - -* mysql::server, mysql::client, and mysql::bindings are the primary interface -classes. -* mysql::server takes an `override_options` parameter to set my.cnf options, -with the hash format: { 'section' => { 'thing' => 'value' }} -* mysql attempts backwards compatibility by forwarding all parameters to -mysql::server. - ---- -## 2013-09-23 - Version 1.0.0 - -### Summary - -This release introduces a number of new type/providers, to eventually -replace the database_ ones. The module has been converted to call the -new providers rather than the previous ones as they have a number of -fixes, additional options, and work with puppet resource. - -This 1.0.0 release precedes a large refactoring that will be released -almost immediately after as 2.0.0. - -#### Features -- Added mysql_grant, mysql_database, and mysql_user. -- Add `mysql::bindings` class and refactor all other bindings to be contained underneath mysql::bindings:: namespace. -- Added support to back up specified databases only with 'mysqlbackup' parameter. -- Add option to mysql::backup to set the backup script to perform a mysqldump on each database to its own file - -#### Bugfixes -- Update my.cnf.pass.erb to allow custom socket support -- Add environment variable for .my.cnf in mysql::db. -- Add HOME environment variable for .my.cnf to mysqladmin command when -(re)setting root password - ---- -## 2013-07-15 - Version 0.9.0 -#### Features -- Add `mysql::backup::backuprotate` parameter -- Add `mysql::backup::delete_before_dump` parameter -- Add `max_user_connections` attribute to `database_user` type - -#### Bugfixes -- Add client package dependency for `mysql::db` -- Remove duplicate `expire_logs_days` and `max_binlog_size` settings -- Make root's `.my.cnf` file path dynamic -- Update pidfile path for Suse variants -- Fixes for lint - -## 2013-07-05 - Version 0.8.1 -#### Bugfixes - - Fix a typo in the Fedora 19 support. - -## 2013-07-01 - Version 0.8.0 -#### Features - - mysql::perl class to install perl-DBD-mysql. - - minor improvements to the providers to improve reliability - - Install the MariaDB packages on Fedora 19 instead of MySQL. - - Add new `mysql` class parameters: - - `max_connections`: The maximum number of allowed connections. - - `manage_config_file`: Opt out of puppetized control of my.cnf. - - `ft_min_word_len`: Fine tune the full text search. - - `ft_max_word_len`: Fine tune the full text search. - - Add new `mysql` class performance tuning parameters: - - `key_buffer` - - `thread_stack` - - `thread_cache_size` - - `myisam-recover` - - `query_cache_limit` - - `query_cache_size` - - `max_connections` - - `tmp_table_size` - - `table_open_cache` - - `long_query_time` - - Add new `mysql` class replication parameters: - - `server_id` - - `sql_log_bin` - - `log_bin` - - `max_binlog_size` - - `binlog_do_db` - - `expire_logs_days` - - `log_bin_trust_function_creators` - - `replicate_ignore_table` - - `replicate_wild_do_table` - - `replicate_wild_ignore_table` - - `expire_logs_days` - - `max_binlog_size` - -#### Bugfixes - - No longer restart MySQL when /root/.my.cnf changes. - - Ensure mysql::config runs before any mysql::db defines. - -## 2013-06-26 - Version 0.7.1 -#### Bugfixes -- Single-quote password for special characters -- Update travis testing for puppet 3.2.x and missing Bundler gems - -## 2013-06-25 - Version 0.7.0 -This is a maintenance release for community bugfixes and exposing -configuration variables. - -* Add new `mysql` class parameters: - - `basedir`: The base directory mysql uses - - `bind_address`: The IP mysql binds to - - `client_package_name`: The name of the mysql client package - - `config_file`: The location of the server config file - - `config_template`: The template to use to generate my.cnf - - `datadir`: The directory MySQL's datafiles are stored - - `default_engine`: The default engine to use for tables - - `etc_root_password`: Whether or not to add the mysql root password to - /etc/my.cnf - - `java_package_name`: The name of the java package containing the java - connector - - `log_error`: Where to log errors - - `manage_service`: Boolean dictating if mysql::server should manage the - service - - `max_allowed_packet`: Maximum network packet size mysqld will accept - - `old_root_password`: Previous root user password - - `php_package_name`: The name of the phpmysql package to install - - `pidfile`: The location mysql will expect the pidfile to be - - `port`: The port mysql listens on - - `purge_conf_dir`: Value fed to recurse and purge parameters of the - /etc/mysql/conf.d resource - - `python_package_name`: The name of the python mysql package to install - - `restart`: Whether to restart mysqld - - `root_group`: Use specified group for root-owned files - - `root_password`: The root MySQL password to use - - `ruby_package_name`: The name of the ruby mysql package to install - - `ruby_package_provider`: The installation suite to use when installing the - ruby package - - `server_package_name`: The name of the server package to install - - `service_name`: The name of the service to start - - `service_provider`: The name of the service provider - - `socket`: The location of the MySQL server socket file - - `ssl_ca`: The location of the SSL CA Cert - - `ssl_cert`: The location of the SSL Certificate to use - - `ssl_key`: The SSL key to use - - `ssl`: Whether or not to enable ssl - - `tmpdir`: The directory MySQL's tmpfiles are stored -* Deprecate `mysql::package_name` parameter in favor of -`mysql::client_package_name` -* Fix local variable template deprecation -* Fix dependency ordering in `mysql::db` -* Fix ANSI quoting in queries -* Fix travis support (but still messy) -* Fix typos - -## 2013-01-11 - Version 0.6.1 -* Fix providers when /root/.my.cnf is absent - -## 2013-01-09 - Version 0.6.0 -* Add `mysql::server::config` define for specific config directives -* Add `mysql::php` class for php support -* Add `backupcompress` parameter to `mysql::backup` -* Add `restart` parameter to `mysql::config` -* Add `purge_conf_dir` parameter to `mysql::config` -* Add `manage_service` parameter to `mysql::server` -* Add syslog logging support via the `log_error` parameter -* Add initial SuSE support -* Fix remove non-localhost root user when fqdn != hostname -* Fix dependency in `mysql::server::monitor` -* Fix .my.cnf path for root user and root password -* Fix ipv6 support for users -* Fix / update various spec tests -* Fix typos -* Fix lint warnings - -## 2012-08-23 - Version 0.5.0 -* Add puppetlabs/stdlib as requirement -* Add validation for mysql privs in provider -* Add `pidfile` parameter to mysql::config -* Add `ensure` parameter to mysql::db -* Add Amazon linux support -* Change `bind_address` parameter to be optional in my.cnf template -* Fix quoting root passwords - -## 2012-07-24 - Version 0.4.0 -* Fix various bugs regarding database names -* FreeBSD support -* Allow specifying the storage engine -* Add a backup class -* Add a security class to purge default accounts - -## 2012-05-03 - Version 0.3.0 -* 14218 Query the database for available privileges -* Add mysql::java class for java connector installation -* Use correct error log location on different distros -* Fix set_mysql_rootpw to properly depend on my.cnf - -## 2012-04-11 - Version 0.2.0 - -## 2012-03-19 - William Van Hevelingen -* (#13203) Add ssl support (f7e0ea5) - -## 2012-03-18 - Nan Liu -* Travis ci before script needs success exit code. (0ea463b) - -## 2012-03-18 - Nan Liu -* Fix Puppet 2.6 compilation issues. (9ebbbc4) - -## 2012-03-16 - Nan Liu -* Add travis.ci for testing multiple puppet versions. (33c72ef) - -## 2012-03-15 - William Van Hevelingen -* (#13163) Datadir should be configurable (f353fc6) - -## 2012-03-16 - Nan Liu -* Document create_resources dependency. (558a59c) - -## 2012-03-16 - Nan Liu -* Fix spec test issues related to error message. (eff79b5) - -## 2012-03-16 - Nan Liu -* Fix mysql service on Ubuntu. (72da2c5) - -## 2012-03-16 - Dan Bode -* Add more spec test coverage (55e399d) - -## 2012-03-16 - Nan Liu -* (#11963) Fix spec test due to path changes. (1700349) - -## 2012-03-07 - François Charlier -* Add a test to check path for 'mysqld-restart' (b14c7d1) - -## 2012-03-07 - François Charlier -* Fix path for 'mysqld-restart' (1a9ae6b) - -## 2012-03-15 - Dan Bode -* Add rspec-puppet tests for mysql::config (907331a) - -## 2012-03-15 - Dan Bode -* Moved class dependency between sever and config to server (da62ad6) - -## 2012-03-14 - Dan Bode -* Notify mysql restart from set_mysql_rootpw exec (0832a2c) - -## 2012-03-15 - Nan Liu -* Add documentation related to osfamily fact. (8265d28) - -## 2012-03-14 - Dan Bode -* Mention osfamily value in failure message (e472d3b) - -## 2012-03-14 - Dan Bode -* Fix bug when querying for all database users (015490c) - -## 2012-02-09 - Nan Liu -* Major refactor of mysql module. (b1f90fd) - -## 2012-01-11 - Justin Ellison -* Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4) - -## 2012-01-11 - Justin Ellison -* Per @ghoneycutt, we should fail explicitly and explain why. (09af083) - -## 2012-01-11 - Justin Ellison -* Removing duplicate declaration (7513d03) - -## 2012-01-10 - Justin Ellison -* Use socket value from params class instead of hardcoding. (663e97c) - -## 2012-01-10 - Justin Ellison -* Instead of hardcoding the config file target, pull it from mysql::params (031a47d) - -## 2012-01-10 - Justin Ellison -* Moved $socket to within the case to toggle between distros. Added a $config_file variable to allow per-distro config file destinations. (360eacd) - -## 2012-01-10 - Justin Ellison -* Pretty sure this is a bug, 99% of Linux distros out there won't ever hit the default. (3462e6b) - -## 2012-02-09 - William Van Hevelingen -* Changed the README to use markdown (3b7dfeb) - -## 2012-02-04 - Daniel Black -* (#12412) mysqltuner.pl update (b809e6f) - -## 2011-11-17 - Matthias Pigulla -* (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1) - -## 2011-12-20 - Jeff McCune -* (minor) Fixup typos in Modulefile metadata (a0ed6a1) - -## 2011-12-19 - Carl Caum -* Only notify Exec to import sql if sql is given (0783c74) - -## 2011-12-19 - Carl Caum -* (#11508) Only load sql_scripts on DB creation (e3b9fd9) - -## 2011-12-13 - Justin Ellison -* Require not needed due to implicit dependencies (3058feb) - -## 2011-12-13 - Justin Ellison -* Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d) - -## 2011-06-03 - Dan Bode - 0.0.1 -* initial commit - -[5.4.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.3.0...5.4.0 -[5.3.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.1...5.3.0 -[5.2.1]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.0...5.2.1 -[5.2.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.1.0...5.2.0 -[5.1.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.0.0...5.1.0 -[5.0.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/4.0.1...5.0.0 +- (MODULES-1338) Allow mysql::db to import several files [#574](https://github.com/puppetlabs/puppetlabs-mysql/pull/574) ([Spredzy](https://github.com/Spredzy)) + +### Fixed + +- Remove mysqltuner, fetch with staging instead [#624](https://github.com/puppetlabs/puppetlabs-mysql/pull/624) ([underscorgan](https://github.com/underscorgan)) +- Fix issues introduced in puppetlabs/puppetlabs-mysql#612 [#623](https://github.com/puppetlabs/puppetlabs-mysql/pull/623) ([underscorgan](https://github.com/underscorgan)) +- Use puppet() instead of shell() to install module dependencies [#622](https://github.com/puppetlabs/puppetlabs-mysql/pull/622) ([underscorgan](https://github.com/underscorgan)) +- Reworked all identifier quoting detections [#612](https://github.com/puppetlabs/puppetlabs-mysql/pull/612) ([lavoiesl](https://github.com/lavoiesl)) +- Fix operating system release fact for SLES [#611](https://github.com/puppetlabs/puppetlabs-mysql/pull/611) ([cmurphy](https://github.com/cmurphy)) +- Fix support for SLES 12 [#610](https://github.com/puppetlabs/puppetlabs-mysql/pull/610) ([cmurphy](https://github.com/cmurphy)) +- Default to MariaDB for SLES 12 [#608](https://github.com/puppetlabs/puppetlabs-mysql/pull/608) ([cyberious](https://github.com/cyberious)) +- Proper containment for mysql::client in mysql::db [#605](https://github.com/puppetlabs/puppetlabs-mysql/pull/605) ([slamont](https://github.com/slamont)) +- Fix regression in username validation [#602](https://github.com/puppetlabs/puppetlabs-mysql/pull/602) ([MasonM](https://github.com/MasonM)) +- Create log-bin directory if it doesn't exist [#596](https://github.com/puppetlabs/puppetlabs-mysql/pull/596) ([NoodlesNZ](https://github.com/NoodlesNZ)) + +## [3.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/3.0.0) - 2014-11-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.3.1...3.0.0) + +### Added + +- [MODULES-1484] Add support for install_options for all package resources... [#591](https://github.com/puppetlabs/puppetlabs-mysql/pull/591) ([damonconway](https://github.com/damonconway)) +- Improve checks for MySQL user's name. [#588](https://github.com/puppetlabs/puppetlabs-mysql/pull/588) ([maxenced](https://github.com/maxenced)) +- Add support for Gentoo [#585](https://github.com/puppetlabs/puppetlabs-mysql/pull/585) ([dev-zero](https://github.com/dev-zero)) +- [MODULES-1333] Add explicit dependencies for mysql_database and mysql_user types [#571](https://github.com/puppetlabs/puppetlabs-mysql/pull/571) ([jtopper](https://github.com/jtopper)) +- (MODULES-552) Add capability to specify column_privileges [#570](https://github.com/puppetlabs/puppetlabs-mysql/pull/570) ([fnerdwq](https://github.com/fnerdwq)) +- (MODULES-1330) Change order of revokation. [#569](https://github.com/puppetlabs/puppetlabs-mysql/pull/569) ([fnerdwq](https://github.com/fnerdwq)) +- Parametrize !includedir [#509](https://github.com/puppetlabs/puppetlabs-mysql/pull/509) ([xbezdick](https://github.com/xbezdick)) + +### Fixed + +- Fix escaped backslashes in grants [#594](https://github.com/puppetlabs/puppetlabs-mysql/pull/594) ([skroll](https://github.com/skroll)) +- The old regex requires something after the 'host' part. Fix this. [#587](https://github.com/puppetlabs/puppetlabs-mysql/pull/587) ([maxenced](https://github.com/maxenced)) +- Oracle 7 uses mariadb [#582](https://github.com/puppetlabs/puppetlabs-mysql/pull/582) ([cmurphy](https://github.com/cmurphy)) +- Install bzip2 on RHEL 7 and Fedora hosts [#580](https://github.com/puppetlabs/puppetlabs-mysql/pull/580) ([cmurphy](https://github.com/cmurphy)) +- Ensure error log is present before trying to manage ownership [#579](https://github.com/puppetlabs/puppetlabs-mysql/pull/579) ([cmurphy](https://github.com/cmurphy)) +- Change sql param to default to undef instead of empty string [#577](https://github.com/puppetlabs/puppetlabs-mysql/pull/577) ([cmurphy](https://github.com/cmurphy)) +- future parser converts explicit undef to empty string [#568](https://github.com/puppetlabs/puppetlabs-mysql/pull/568) ([edestecd](https://github.com/edestecd)) +- mysql_database: prevent syntax error with collate=>'binary' [#565](https://github.com/puppetlabs/puppetlabs-mysql/pull/565) ([mmonaco](https://github.com/mmonaco)) +- Fix issue with puppet_module_install, removed and using updated method f... [#564](https://github.com/puppetlabs/puppetlabs-mysql/pull/564) ([cyberious](https://github.com/cyberious)) +- (MODULES-1287) Pass the backup credentials to 'SHOW DATABASES' [#559](https://github.com/puppetlabs/puppetlabs-mysql/pull/559) ([nhinds](https://github.com/nhinds)) +- Fixes manage_service feature [#558](https://github.com/puppetlabs/puppetlabs-mysql/pull/558) ([paramite](https://github.com/paramite)) +- Remove all the deprecated code. [#553](https://github.com/puppetlabs/puppetlabs-mysql/pull/553) ([apenney](https://github.com/apenney)) +- Prevent ERROR 1008 in mysql_database provider [#547](https://github.com/puppetlabs/puppetlabs-mysql/pull/547) ([rayl](https://github.com/rayl)) +- Make sure we actually notify the service. [#546](https://github.com/puppetlabs/puppetlabs-mysql/pull/546) ([igalic](https://github.com/igalic)) +- Fix problem with GRANT not recognizing backslash [#540](https://github.com/puppetlabs/puppetlabs-mysql/pull/540) ([jsosic](https://github.com/jsosic)) +- Grants for the backupuser should be conditional [#539](https://github.com/puppetlabs/puppetlabs-mysql/pull/539) ([stevesaliman](https://github.com/stevesaliman)) + +## [2.3.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.3.1) - 2014-07-18 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.3.0...2.3.1) + +## [2.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.3.0) - 2014-07-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.2.3...2.3.0) + +### Added + +- Install MySQL client and daemon dev libraries. [#510](https://github.com/puppetlabs/puppetlabs-mysql/pull/510) ([Aethylred](https://github.com/Aethylred)) +- Add quotes to backup password to be able to use more complex passwords. [#495](https://github.com/puppetlabs/puppetlabs-mysql/pull/495) ([mauerj](https://github.com/mauerj)) +- Allow to use different name for db resource other than db name [#489](https://github.com/puppetlabs/puppetlabs-mysql/pull/489) ([xcompass](https://github.com/xcompass)) + +### Fixed + +- Handle changing the datadir properly. [#536](https://github.com/puppetlabs/puppetlabs-mysql/pull/536) ([apenney](https://github.com/apenney)) +- Change grant provider to ignore grants for non existing users. [#530](https://github.com/puppetlabs/puppetlabs-mysql/pull/530) ([spil-jaak](https://github.com/spil-jaak)) +- (MODULES-1096) Fix double quote / single quote issue in params.pp. [#526](https://github.com/puppetlabs/puppetlabs-mysql/pull/526) ([spil-jaak](https://github.com/spil-jaak)) +- fix param client_package_ensure [#523](https://github.com/puppetlabs/puppetlabs-mysql/pull/523) ([davidmmiller](https://github.com/davidmmiller)) +- Require title of mysql_grant resource to match form user/table [#522](https://github.com/puppetlabs/puppetlabs-mysql/pull/522) ([cmurphy](https://github.com/cmurphy)) +- Change the package name in the manifest, too! [#513](https://github.com/puppetlabs/puppetlabs-mysql/pull/513) ([underscorgan](https://github.com/underscorgan)) +- Package rename in Ubuntu 14.04. [#512](https://github.com/puppetlabs/puppetlabs-mysql/pull/512) ([underscorgan](https://github.com/underscorgan)) +- Rhel7 fixes [#511](https://github.com/puppetlabs/puppetlabs-mysql/pull/511) ([underscorgan](https://github.com/underscorgan)) +- Improve this so it works on Ubuntu 14.04. [#507](https://github.com/puppetlabs/puppetlabs-mysql/pull/507) ([apenney](https://github.com/apenney)) +- lowercase hostname values in qualified usernames [#505](https://github.com/puppetlabs/puppetlabs-mysql/pull/505) ([larsks](https://github.com/larsks)) +- Replaced database_user with mysql_user [#501](https://github.com/puppetlabs/puppetlabs-mysql/pull/501) ([ryansechrest](https://github.com/ryansechrest)) +- User needs PROCESS privilege when doing file-per-database backup [#500](https://github.com/puppetlabs/puppetlabs-mysql/pull/500) ([nerdlich](https://github.com/nerdlich)) +- [BUG] [Critical] Removing extra space after slash in mysqlbackup.sh [#490](https://github.com/puppetlabs/puppetlabs-mysql/pull/490) ([seocam](https://github.com/seocam)) +- fix #487 mysql not starting if ssl is not disabled [#488](https://github.com/puppetlabs/puppetlabs-mysql/pull/488) ([globin](https://github.com/globin)) +- backup script test: Actually loop through a list [#479](https://github.com/puppetlabs/puppetlabs-mysql/pull/479) ([igalic](https://github.com/igalic)) +- handle mysql compiled without ssl [#477](https://github.com/puppetlabs/puppetlabs-mysql/pull/477) ([globin](https://github.com/globin)) +- mysqlbackup.sh should be able to find mysql [#457](https://github.com/puppetlabs/puppetlabs-mysql/pull/457) ([igalic](https://github.com/igalic)) + +## [2.2.3](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.2.3) - 2014-03-04 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.2.2...2.2.3) + +### Fixed + +- Replace the symlink with the actual file to resolve a PMT issue. [#484](https://github.com/puppetlabs/puppetlabs-mysql/pull/484) ([apenney](https://github.com/apenney)) + +## [2.2.2](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.2.2) - 2014-03-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.2.1...2.2.2) + +### Added + +- Add unsupported infrastructure for excluding OSes we can't test on. [#470](https://github.com/puppetlabs/puppetlabs-mysql/pull/470) ([apenney](https://github.com/apenney)) + +### Fixed + +- Last SLES fix, don't use the deprecated parameter name. [#469](https://github.com/puppetlabs/puppetlabs-mysql/pull/469) ([apenney](https://github.com/apenney)) +- This fixes: [#467](https://github.com/puppetlabs/puppetlabs-mysql/pull/467) ([apenney](https://github.com/apenney)) +- As we're deleting /etc/my.cnf, lets not restart MySQL in the middle [#466](https://github.com/puppetlabs/puppetlabs-mysql/pull/466) ([apenney](https://github.com/apenney)) +- Fix the case of this, ARGH. [#465](https://github.com/puppetlabs/puppetlabs-mysql/pull/465) ([apenney](https://github.com/apenney)) +- Make this work in SLES as well As RedHat. [#464](https://github.com/puppetlabs/puppetlabs-mysql/pull/464) ([apenney](https://github.com/apenney)) + +## [2.2.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.2.1) - 2014-02-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.2.0...2.2.1) + +### Fixed + +- Fix this test for Debian. This is a total hack for now. [#455](https://github.com/puppetlabs/puppetlabs-mysql/pull/455) ([apenney](https://github.com/apenney)) +- Fixes for Ubuntu/Debian. [#454](https://github.com/puppetlabs/puppetlabs-mysql/pull/454) ([apenney](https://github.com/apenney)) +- Repair this by ensuring calls to mysql include the database name. [#452](https://github.com/puppetlabs/puppetlabs-mysql/pull/452) ([apenney](https://github.com/apenney)) + +## [2.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.2.0) - 2014-02-13 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.1.0...2.2.0) + +### Added + +- Add check for puppet rpm before trying to install [#445](https://github.com/puppetlabs/puppetlabs-mysql/pull/445) ([Phil0xF7](https://github.com/Phil0xF7)) +- Add logic to ignore mysql.events [#435](https://github.com/puppetlabs/puppetlabs-mysql/pull/435) ([b4ldr](https://github.com/b4ldr)) +- option to specify a script that runs after backups [#413](https://github.com/puppetlabs/puppetlabs-mysql/pull/413) ([igalic](https://github.com/igalic)) +- Restart [#401](https://github.com/puppetlabs/puppetlabs-mysql/pull/401) ([apenney](https://github.com/apenney)) +- Support multiple lines of the same option [#398](https://github.com/puppetlabs/puppetlabs-mysql/pull/398) ([fridim](https://github.com/fridim)) +- Added [if not exists] to [create database] clause. [#397](https://github.com/puppetlabs/puppetlabs-mysql/pull/397) ([srinathman](https://github.com/srinathman)) +- Parameterize backup directory mode and ownership [#375](https://github.com/puppetlabs/puppetlabs-mysql/pull/375) ([ezheidtmann](https://github.com/ezheidtmann)) + +### Fixed + +- Fix this so it installs PE appropriately. [#447](https://github.com/puppetlabs/puppetlabs-mysql/pull/447) ([apenney](https://github.com/apenney)) +- mysql_deepmerge should treat underscore and dash equivalently, as mysql does [#428](https://github.com/puppetlabs/puppetlabs-mysql/pull/428) ([radford](https://github.com/radford)) +- Allow override_options set to undef to completely remove the corresponding key reverting to the mysql default [#427](https://github.com/puppetlabs/puppetlabs-mysql/pull/427) ([radford](https://github.com/radford)) +- Allow an option with a value of false to override something that mysql defaults to true rather than eliding it [#426](https://github.com/puppetlabs/puppetlabs-mysql/pull/426) ([radford](https://github.com/radford)) +- Actually use upstart on Ubuntu by fixing misspelled variable name [#425](https://github.com/puppetlabs/puppetlabs-mysql/pull/425) ([radford](https://github.com/radford)) +- fixed a problem with the mysql_database provider [#422](https://github.com/puppetlabs/puppetlabs-mysql/pull/422) ([stevesaliman](https://github.com/stevesaliman)) +- Remove duplicate service_provider description [#421](https://github.com/puppetlabs/puppetlabs-mysql/pull/421) ([lboynton](https://github.com/lboynton)) +- mysql_grant fixed to properly handle PROCEDURE grants [#412](https://github.com/puppetlabs/puppetlabs-mysql/pull/412) ([dgolja](https://github.com/dgolja)) +- my.cnf: typo fix (bind-address) + migrate key_buffer (deprecated) to key_buffer_size [#395](https://github.com/puppetlabs/puppetlabs-mysql/pull/395) ([doc75](https://github.com/doc75)) +- Mysql grant fixes [#391](https://github.com/puppetlabs/puppetlabs-mysql/pull/391) ([vicinus](https://github.com/vicinus)) +- Fix missing mysql::config when including mysql [#385](https://github.com/puppetlabs/puppetlabs-mysql/pull/385) ([liwo](https://github.com/liwo)) +- Type mysql_grant fixed, spec test created [#376](https://github.com/puppetlabs/puppetlabs-mysql/pull/376) ([w32-blaster](https://github.com/w32-blaster)) +- Fix having wildcards (%) in hostnames of grants [#366](https://github.com/puppetlabs/puppetlabs-mysql/pull/366) ([liwo](https://github.com/liwo)) + +### Other + +- changed log_error to log-error and pid_file to pid-file to match the mys... [#394](https://github.com/puppetlabs/puppetlabs-mysql/pull/394) ([danielfoglio](https://github.com/danielfoglio)) + +## [2.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.1.0) - 2013-11-13 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.0.1-rc1...2.1.0) + +### Added + +- added * for table name in title to match documented usage [#355](https://github.com/puppetlabs/puppetlabs-mysql/pull/355) ([tekenny](https://github.com/tekenny)) +- Add Anchor pattern to client.pp [#343](https://github.com/puppetlabs/puppetlabs-mysql/pull/343) ([Bit-Doctor](https://github.com/Bit-Doctor)) +- Adds example to set root password [#341](https://github.com/puppetlabs/puppetlabs-mysql/pull/341) ([spuder](https://github.com/spuder)) +- Further improvements to our matching - stop trying to guess what [#319](https://github.com/puppetlabs/puppetlabs-mysql/pull/319) ([apenney](https://github.com/apenney)) +- Improve mysql_grant to work with IPv6. [#308](https://github.com/puppetlabs/puppetlabs-mysql/pull/308) ([apenney](https://github.com/apenney)) +- Extend coverage to the contents of /etc/my.cnf. [#302](https://github.com/puppetlabs/puppetlabs-mysql/pull/302) ([apenney](https://github.com/apenney)) + +### Fixed + +- Method for loading .my.cnf file is changed from "defaults-file" to "defaults-extra-file" (mysql option) [#367](https://github.com/puppetlabs/puppetlabs-mysql/pull/367) ([w32-blaster](https://github.com/w32-blaster)) +- Some options can not take a argument. [#364](https://github.com/puppetlabs/puppetlabs-mysql/pull/364) ([jglenn9k](https://github.com/jglenn9k)) +- Fix the broken anchoring. [#358](https://github.com/puppetlabs/puppetlabs-mysql/pull/358) ([apenney](https://github.com/apenney)) +- fix for the fix: database -> database_user [#353](https://github.com/puppetlabs/puppetlabs-mysql/pull/353) ([igalic](https://github.com/igalic)) +- database_user gives the wrong deprecation warning [#345](https://github.com/puppetlabs/puppetlabs-mysql/pull/345) ([igalic](https://github.com/igalic)) +- Fix an issue with lowercase privileges. [#342](https://github.com/puppetlabs/puppetlabs-mysql/pull/342) ([apenney](https://github.com/apenney)) +- Fix ordering causing mysql_grant to reapply. [#332](https://github.com/puppetlabs/puppetlabs-mysql/pull/332) ([apenney](https://github.com/apenney)) +- Updated my.cnf template to support items with no values [#316](https://github.com/puppetlabs/puppetlabs-mysql/pull/316) ([tekenny](https://github.com/tekenny)) +- Previously we were matching to ensure that usernames matched [#312](https://github.com/puppetlabs/puppetlabs-mysql/pull/312) ([apenney](https://github.com/apenney)) +- Fix mysql::server::monitor mysql_grant privileges [#303](https://github.com/puppetlabs/puppetlabs-mysql/pull/303) ([treydock](https://github.com/treydock)) +- Duplicate parameter removed. [#298](https://github.com/puppetlabs/puppetlabs-mysql/pull/298) ([apenney](https://github.com/apenney)) + +## [2.0.1-rc1](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.0.1-rc1) - 2013-10-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/2.0.0-rc1...2.0.1-rc1) + +## [2.0.0-rc1](https://github.com/puppetlabs/puppetlabs-mysql/tree/2.0.0-rc1) - 2013-10-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/1.0.0...2.0.0-rc1) + +### Added + +- Add all the params here as undef to make it clear what the intent is. [#296](https://github.com/puppetlabs/puppetlabs-mysql/pull/296) ([apenney](https://github.com/apenney)) +- Add collation with the create statement [#291](https://github.com/puppetlabs/puppetlabs-mysql/pull/291) ([inkblot](https://github.com/inkblot)) +- Improvements to mysql_grant. [#276](https://github.com/puppetlabs/puppetlabs-mysql/pull/276) ([apenney](https://github.com/apenney)) +- Update mysqltuner.pp [#273](https://github.com/puppetlabs/puppetlabs-mysql/pull/273) ([davidcollom](https://github.com/davidcollom)) +- Support Fedora's rolling development "release", Rawhide [#241](https://github.com/puppetlabs/puppetlabs-mysql/pull/241) ([judge-red](https://github.com/judge-red)) + +### Changed +- Completely redesign the MySQL module. [#258](https://github.com/puppetlabs/puppetlabs-mysql/pull/258) ([apenney](https://github.com/apenney)) + +### Fixed + +- Use mysql::server::root_password instead of @options. [#288](https://github.com/puppetlabs/puppetlabs-mysql/pull/288) ([apenney](https://github.com/apenney)) +- Add 3.3, strip down the excludes. [#286](https://github.com/puppetlabs/puppetlabs-mysql/pull/286) ([apenney](https://github.com/apenney)) +- Fix mysql::client. [#285](https://github.com/puppetlabs/puppetlabs-mysql/pull/285) ([apenney](https://github.com/apenney)) +- Fixes issue #274 by using recursive hash merge. [#282](https://github.com/puppetlabs/puppetlabs-mysql/pull/282) ([jburnham](https://github.com/jburnham)) +- Removing the bindings compat stuff. [#280](https://github.com/puppetlabs/puppetlabs-mysql/pull/280) ([apenney](https://github.com/apenney)) +- Remove mysql::globals. [#278](https://github.com/puppetlabs/puppetlabs-mysql/pull/278) ([apenney](https://github.com/apenney)) + +## [1.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/1.0.0) - 2013-09-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.9.0...1.0.0) + +### Added + +- Add option so mysql::backup to dump each database to its own file [#253](https://github.com/puppetlabs/puppetlabs-mysql/pull/253) ([treydock](https://github.com/treydock)) +- Add HOME environment variable for .my.cnf to mysqladmin command [#245](https://github.com/puppetlabs/puppetlabs-mysql/pull/245) ([embeepea](https://github.com/embeepea)) +- Added support to back up specified databases only with 'mysqlbackup' [#244](https://github.com/puppetlabs/puppetlabs-mysql/pull/244) ([cfeskens](https://github.com/cfeskens)) +- Add environment variable for .my.cnf and specs [#243](https://github.com/puppetlabs/puppetlabs-mysql/pull/243) ([hunner](https://github.com/hunner)) +- Add compatibility classes to handle the backwards incompatible changes. [#237](https://github.com/puppetlabs/puppetlabs-mysql/pull/237) ([apenney](https://github.com/apenney)) + +### Changed +- WIP: database_user and database refactoring [#248](https://github.com/puppetlabs/puppetlabs-mysql/pull/248) ([apenney](https://github.com/apenney)) + +### Fixed + +- Fix this so we don't list dates or versions yet. [#238](https://github.com/puppetlabs/puppetlabs-mysql/pull/238) ([apenney](https://github.com/apenney)) +- Fix puppet 2.6 compatibility [#235](https://github.com/puppetlabs/puppetlabs-mysql/pull/235) ([ekohl](https://github.com/ekohl)) +- Refactor MySQL bindings and client packages. [#232](https://github.com/puppetlabs/puppetlabs-mysql/pull/232) ([apenney](https://github.com/apenney)) +- Update my.cnf.pass.erb to allow custom socket support [#227](https://github.com/puppetlabs/puppetlabs-mysql/pull/227) ([hunner](https://github.com/hunner)) + +## [0.9.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.9.0) - 2013-07-15 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.8.1...0.9.0) + +### Fixed + +- Remove redundant hard coded replication parameters [#224](https://github.com/puppetlabs/puppetlabs-mysql/pull/224) ([3flex](https://github.com/3flex)) +- include mysql_client package as a requirement for the db creation [#222](https://github.com/puppetlabs/puppetlabs-mysql/pull/222) ([wolfspyre](https://github.com/wolfspyre)) +- Fixes suggested by RubyMine (just playing around with it) [#219](https://github.com/puppetlabs/puppetlabs-mysql/pull/219) ([apenney](https://github.com/apenney)) + +## [0.8.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.8.1) - 2013-07-10 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.8.0...0.8.1) + +## [0.8.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.8.0) - 2013-07-10 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.7.0...0.8.0) + +### Added + +- Support max_user_connections in database_user [#215](https://github.com/puppetlabs/puppetlabs-mysql/pull/215) ([mbakke](https://github.com/mbakke)) +- Use $root_home for .my.cnf [#214](https://github.com/puppetlabs/puppetlabs-mysql/pull/214) ([paramite](https://github.com/paramite)) +- Add basic specs for database provider. [#211](https://github.com/puppetlabs/puppetlabs-mysql/pull/211) ([apenney](https://github.com/apenney)) +- add a maximum connection parameter and set the default to 1000 [#198](https://github.com/puppetlabs/puppetlabs-mysql/pull/198) ([mhellmic](https://github.com/mhellmic)) +- add mysql::perl helper class [#187](https://github.com/puppetlabs/puppetlabs-mysql/pull/187) ([rsrchboy](https://github.com/rsrchboy)) +- Implement character_set and other options [#167](https://github.com/puppetlabs/puppetlabs-mysql/pull/167) ([abraham1901](https://github.com/abraham1901)) +- handling of my.cnf config file is now optional [#132](https://github.com/puppetlabs/puppetlabs-mysql/pull/132) ([savar](https://github.com/savar)) + +### Fixed + +- Fixed PID file location for SLES 11 SP2. [#216](https://github.com/puppetlabs/puppetlabs-mysql/pull/216) ([vakuum](https://github.com/vakuum)) +- Cover Fedora 19's move from mysql to mariadb packages [#210](https://github.com/puppetlabs/puppetlabs-mysql/pull/210) ([judge-red](https://github.com/judge-red)) +- Database user refactor/tests [#208](https://github.com/puppetlabs/puppetlabs-mysql/pull/208) ([apenney](https://github.com/apenney)) +- (WIP) #20562: Minor fix for ordering [#186](https://github.com/puppetlabs/puppetlabs-mysql/pull/186) ([apenney](https://github.com/apenney)) +- Harden mysqlbackup.sh script [#170](https://github.com/puppetlabs/puppetlabs-mysql/pull/170) ([omalashenko](https://github.com/omalashenko)) +- Quote the password [#166](https://github.com/puppetlabs/puppetlabs-mysql/pull/166) ([ekohl](https://github.com/ekohl)) +- add ft_min_word_len and ft_max_word_len config options [#165](https://github.com/puppetlabs/puppetlabs-mysql/pull/165) ([leinaddm](https://github.com/leinaddm)) +- fixes #19744 - no restart on root/.my.cnf change [#162](https://github.com/puppetlabs/puppetlabs-mysql/pull/162) ([frimik](https://github.com/frimik)) + +## [0.7.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.7.0) - 2013-06-25 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.6.1...0.7.0) + +### Added + +- Parameterized max_allowed_packet my.conf config setting, because it is needed to setup puppet-dashboard. [#179](https://github.com/puppetlabs/puppetlabs-mysql/pull/179) ([msmithgu](https://github.com/msmithgu)) + +### Fixed + +- Update template for #179 [#201](https://github.com/puppetlabs/puppetlabs-mysql/pull/201) ([hunner](https://github.com/hunner)) +- make tmpdir configurable [#200](https://github.com/puppetlabs/puppetlabs-mysql/pull/200) ([hunner](https://github.com/hunner)) +- Fix SQL when ANSI_QUOTES is enabled in mysql config. [#199](https://github.com/puppetlabs/puppetlabs-mysql/pull/199) ([hunner](https://github.com/hunner)) +- change the distribution osfamily from Redhat into RedHat [#197](https://github.com/puppetlabs/puppetlabs-mysql/pull/197) ([mhellmic](https://github.com/mhellmic)) +- fix puppet warning default_engine [#188](https://github.com/puppetlabs/puppetlabs-mysql/pull/188) ([gimler](https://github.com/gimler)) +- fix variables in templates [#185](https://github.com/puppetlabs/puppetlabs-mysql/pull/185) ([ChrisRut](https://github.com/ChrisRut)) +- python_package_name parameter missing [#178](https://github.com/puppetlabs/puppetlabs-mysql/pull/178) ([wolfspyre](https://github.com/wolfspyre)) +- [Important] Fix default-storage-engine default value [#171](https://github.com/puppetlabs/puppetlabs-mysql/pull/171) ([ctrlaltdel](https://github.com/ctrlaltdel)) +- Refactor to put a knob on all parameters [#169](https://github.com/puppetlabs/puppetlabs-mysql/pull/169) ([wolfspyre](https://github.com/wolfspyre)) +- Puppet 2.6 fix [#163](https://github.com/puppetlabs/puppetlabs-mysql/pull/163) ([domcleal](https://github.com/domcleal)) +- Restrict the versions and add 3.1 [#155](https://github.com/puppetlabs/puppetlabs-mysql/pull/155) ([richardc](https://github.com/richardc)) +- Fix issue with redeclaration of database_user via mysql::db [#154](https://github.com/puppetlabs/puppetlabs-mysql/pull/154) ([pbrit](https://github.com/pbrit)) +- Update travis config file [#148](https://github.com/puppetlabs/puppetlabs-mysql/pull/148) ([blkperl](https://github.com/blkperl)) + +## [0.6.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.6.1) - 2013-01-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.6.0...0.6.1) + +### Fixed + +- Patch providers for absent my.cnf [#141](https://github.com/puppetlabs/puppetlabs-mysql/pull/141) ([hunner](https://github.com/hunner)) + +## [0.6.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.6.0) - 2013-01-09 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.5.0...0.6.0) + +### Added + +- Add php support [#137](https://github.com/puppetlabs/puppetlabs-mysql/pull/137) ([hunner](https://github.com/hunner)) +- Added SuSE support to puppetlabs-mysql [#136](https://github.com/puppetlabs/puppetlabs-mysql/pull/136) ([deadpoint](https://github.com/deadpoint)) +- add parameter to remove old files in conf.d dir [#131](https://github.com/puppetlabs/puppetlabs-mysql/pull/131) ([saz](https://github.com/saz)) +- allow logging via syslog [#130](https://github.com/puppetlabs/puppetlabs-mysql/pull/130) ([saz](https://github.com/saz)) +- Optionally manage the mysqld service [#122](https://github.com/puppetlabs/puppetlabs-mysql/pull/122) ([hunner](https://github.com/hunner)) +- Mysql::backup Compression Optional [#117](https://github.com/puppetlabs/puppetlabs-mysql/pull/117) ([hunner](https://github.com/hunner)) +- Add show view privilege for backup user [#108](https://github.com/puppetlabs/puppetlabs-mysql/pull/108) ([pbrit](https://github.com/pbrit)) +- new config define and a small bugfix [#93](https://github.com/puppetlabs/puppetlabs-mysql/pull/93) ([savar](https://github.com/savar)) + +### Fixed + +- Update manifests/server/monitor.pp [#134](https://github.com/puppetlabs/puppetlabs-mysql/pull/134) ([nikolavp](https://github.com/nikolavp)) +- fixed character-set detection regex [#133](https://github.com/puppetlabs/puppetlabs-mysql/pull/133) ([obilodeau](https://github.com/obilodeau)) +- account security should not fail if hostname == fqdn [#128](https://github.com/puppetlabs/puppetlabs-mysql/pull/128) ([bodepd](https://github.com/bodepd)) +- fix mysql bug [#126](https://github.com/puppetlabs/puppetlabs-mysql/pull/126) ([bodepd](https://github.com/bodepd)) +- Create /root/.my.cnf even when root passwd is not managed [#125](https://github.com/puppetlabs/puppetlabs-mysql/pull/125) ([bodepd](https://github.com/bodepd)) +- Root credentials [#123](https://github.com/puppetlabs/puppetlabs-mysql/pull/123) ([hunner](https://github.com/hunner)) +- Restart optional and minor doc fix [#115](https://github.com/puppetlabs/puppetlabs-mysql/pull/115) ([frimik](https://github.com/frimik)) +- Don't assign to hash after creation [#114](https://github.com/puppetlabs/puppetlabs-mysql/pull/114) ([dalen](https://github.com/dalen)) +- Update mysql::backup privs for #108 [#112](https://github.com/puppetlabs/puppetlabs-mysql/pull/112) ([hunner](https://github.com/hunner)) + +## [0.5.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.5.0) - 2012-08-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.4.0...0.5.0) + +### Added + +- Add bind address unset [#106](https://github.com/puppetlabs/puppetlabs-mysql/pull/106) ([hunner](https://github.com/hunner)) +- Added an option to specify db status. [#101](https://github.com/puppetlabs/puppetlabs-mysql/pull/101) ([martasd](https://github.com/martasd)) +- Add support for Amazon Linux. [#94](https://github.com/puppetlabs/puppetlabs-mysql/pull/94) ([hunner](https://github.com/hunner)) +- Add priv validation to database_grant provider [#91](https://github.com/puppetlabs/puppetlabs-mysql/pull/91) ([reidmv](https://github.com/reidmv)) +- Add a bunch of new parameters [#90](https://github.com/puppetlabs/puppetlabs-mysql/pull/90) ([emonty](https://github.com/emonty)) + +### Fixed + +- Change list passed into validate_re to a stringe [#105](https://github.com/puppetlabs/puppetlabs-mysql/pull/105) ([derekhiggins](https://github.com/derekhiggins)) +- Parameterized pidfile; critical for successful first restart [#102](https://github.com/puppetlabs/puppetlabs-mysql/pull/102) ([jkff](https://github.com/jkff)) +- Clarify how to grant specific privileges with database_grant [#100](https://github.com/puppetlabs/puppetlabs-mysql/pull/100) ([mcary](https://github.com/mcary)) +- Revert "Merge pull request #90 from emonty/master" [#97](https://github.com/puppetlabs/puppetlabs-mysql/pull/97) ([bodepd](https://github.com/bodepd)) +- Put that curly brace in the right place this time [#96](https://github.com/puppetlabs/puppetlabs-mysql/pull/96) ([branan](https://github.com/branan)) +- Add a missing curly brace [#95](https://github.com/puppetlabs/puppetlabs-mysql/pull/95) ([branan](https://github.com/branan)) +- Escape $root_password during execs. [#73](https://github.com/puppetlabs/puppetlabs-mysql/pull/73) ([razorsedge](https://github.com/razorsedge)) + +## [0.4.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.4.0) - 2012-07-24 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.3.0...0.4.0) + +### Added + +- Add enabled parameter to mysql::server [#81](https://github.com/puppetlabs/puppetlabs-mysql/pull/81) ([bodepd](https://github.com/bodepd)) +- Allow consumer to specify default storage engine for MySQL server. [#74](https://github.com/puppetlabs/puppetlabs-mysql/pull/74) ([jmchilton](https://github.com/jmchilton)) +- Added mysql::backup class. [#64](https://github.com/puppetlabs/puppetlabs-mysql/pull/64) ([razorsedge](https://github.com/razorsedge)) +- Added mysql::server::account_security class. [#63](https://github.com/puppetlabs/puppetlabs-mysql/pull/63) ([razorsedge](https://github.com/razorsedge)) + +### Fixed + +- add missing db param to database_grant [#83](https://github.com/puppetlabs/puppetlabs-mysql/pull/83) ([agerlic](https://github.com/agerlic)) +- escape database name [#82](https://github.com/puppetlabs/puppetlabs-mysql/pull/82) ([agerlic](https://github.com/agerlic)) +- Default types hacks not needed. [#76](https://github.com/puppetlabs/puppetlabs-mysql/pull/76) ([rdrgmnzs](https://github.com/rdrgmnzs)) +- Fixed regex of database user. [#71](https://github.com/puppetlabs/puppetlabs-mysql/pull/71) ([razorsedge](https://github.com/razorsedge)) + +## [0.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.3.0) - 2012-05-04 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/0.2.0...0.3.0) + +### Added + +- Allow wildcard host assignment with sql. [#68](https://github.com/puppetlabs/puppetlabs-mysql/pull/68) ([razorsedge](https://github.com/razorsedge)) +- Query the database for possible permissions [#65](https://github.com/puppetlabs/puppetlabs-mysql/pull/65) ([branan](https://github.com/branan)) +- Java [#61](https://github.com/puppetlabs/puppetlabs-mysql/pull/61) ([razorsedge](https://github.com/razorsedge)) + +### Fixed + +- (#14316) Make privileges case-insensitive [#69](https://github.com/puppetlabs/puppetlabs-mysql/pull/69) ([branan](https://github.com/branan)) +- I noticed the following message whilst provisioning using this module: [#60](https://github.com/puppetlabs/puppetlabs-mysql/pull/60) ([geogdog](https://github.com/geogdog)) +- set platform dependent error logfile location [#58](https://github.com/puppetlabs/puppetlabs-mysql/pull/58) ([derekhiggins](https://github.com/derekhiggins)) + +## [0.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/0.2.0) - 2012-04-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v0.0.1...0.2.0) + +### Added + +- (#13203) Add ssl support [#54](https://github.com/puppetlabs/puppetlabs-mysql/pull/54) ([blkperl](https://github.com/blkperl)) + +### Fixed + +- Fix mysql service on Ubuntu. [#50](https://github.com/puppetlabs/puppetlabs-mysql/pull/50) ([nanliu](https://github.com/nanliu)) +- (#13163) Datadir should be configurable [#47](https://github.com/puppetlabs/puppetlabs-mysql/pull/47) ([blkperl](https://github.com/blkperl)) +- Fix issues from nans massive pull request [#45](https://github.com/puppetlabs/puppetlabs-mysql/pull/45) ([bodepd](https://github.com/bodepd)) +- #11963 In the mysql module the Exec[mysqld-restart] should have more in path [#42](https://github.com/puppetlabs/puppetlabs-mysql/pull/42) ([fcharlier](https://github.com/fcharlier)) +- Refactor mysql module. [#41](https://github.com/puppetlabs/puppetlabs-mysql/pull/41) ([nanliu](https://github.com/nanliu)) +- (#12412) mysqltuner.pl update [#38](https://github.com/puppetlabs/puppetlabs-mysql/pull/38) ([grooverdan](https://github.com/grooverdan)) +- (#11508) Only load sql_scripts on DB creation [#28](https://github.com/puppetlabs/puppetlabs-mysql/pull/28) ([ccaum](https://github.com/ccaum)) +- Bug #11375: puppetlabs-mysql fails on CentOS/RHEL [#27](https://github.com/puppetlabs/puppetlabs-mysql/pull/27) ([justintime](https://github.com/justintime)) +## [v0.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v0.0.1) - 2011-12-13 -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/d28f0e0327d73dde80331494d2abb5562d0ff144...v0.0.1) diff -pruN 8.1.0-7/CODEOWNERS 15.0.0-3/CODEOWNERS --- 8.1.0-7/CODEOWNERS 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/CODEOWNERS 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,2 @@ +# Setting ownership to the modules team +* @puppetlabs/modules @alexjfisher @bastelfreak diff -pruN 8.1.0-7/CONTRIBUTING.md 15.0.0-3/CONTRIBUTING.md --- 8.1.0-7/CONTRIBUTING.md 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/CONTRIBUTING.md 2023-06-19 12:29:51.000000000 +0000 @@ -1,271 +1,3 @@ # Contributing to Puppet modules -So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing -that very thing while setting expectations around code quality as well as a few tips for making the -process as easy as possible. - -### Table of Contents - -1. [Getting Started](#getting-started) -1. [Commit Checklist](#commit-checklist) -1. [Submission](#submission) -1. [More about commits](#more-about-commits) -1. [Testing](#testing) - - [Running Tests](#running-tests) - - [Writing Tests](#writing-tests) -1. [Get Help](#get-help) - -## Getting Started - -- Fork the module repository on GitHub and clone to your workspace - -- Make your changes! - -## Commit Checklist - -### The Basics - -- [x] my commit is a single logical unit of work - -- [x] I have checked for unnecessary whitespace with "git diff --check" - -- [x] my commit does not include commented out code or unneeded files - -### The Content - -- [x] my commit includes tests for the bug I fixed or feature I added - -- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality - -- [x] my code passes existing test suites - -### The Commit Message - -- [x] the first line of my commit message includes: - - - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" - - - [x] a short description (50 characters is the soft limit, excluding ticket number(s)) - -- [x] the body of my commit message: - - - [x] is meaningful - - - [x] uses the imperative, present tense: "change", not "changed" or "changes" - - - [x] includes motivation for the change, and contrasts its implementation with the previous behavior - -## Submission - -### Pre-requisites - -- Make sure you have a [GitHub account](https://github.com/join) - -- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for. - -### Push and PR - -- Push your changes to your fork - -- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization - -## More about commits - - 1. Make separate commits for logically separate changes. - - Please break your commits down into logically consistent units - which include new or changed tests relevant to the rest of the - change. The goal of doing this is to make the diff easier to - read for whoever is reviewing your code. In general, the easier - your diff is to read, the more likely someone will be happy to - review it and get it into the code base. - - If you are going to refactor a piece of code, please do so as a - separate commit from your feature or bug fix changes. - - We also really appreciate changes that include tests to make - sure the bug is not re-introduced, and that the feature is not - accidentally broken. - - Describe the technical detail of the change(s). If your - description starts to get too long, that is a good sign that you - probably need to split up your commit into more finely grained - pieces. - - Commits which plainly describe the things which help - reviewers check the patch and future developers understand the - code are much more likely to be merged in with a minimum of - bike-shedding or requested changes. Ideally, the commit message - would include information, and be in a form suitable for - inclusion in the release notes for the version of Puppet that - includes them. - - Please also check that you are not introducing any trailing - whitespace or other "whitespace errors". You can do this by - running "git diff --check" on your changes before you commit. - - 2. Sending your patches - - To submit your changes via a GitHub pull request, we _highly_ - recommend that you have them on a topic branch, instead of - directly on "master". - It makes things much easier to keep track of, especially if - you decide to work on another thing before your first change - is merged in. - - GitHub has some pretty good - [general documentation](http://help.github.com/) on using - their site. They also have documentation on - [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/). - - In general, after pushing your topic branch up to your - repository on GitHub, you can switch to the branch in the - GitHub UI and click "Pull Request" towards the top of the page - in order to open a pull request. - - 3. Update the related JIRA issue. - - If there is a JIRA issue associated with the change you - submitted, then you should update the ticket to include the - location of your branch, along with any other commentary you - may wish to make. - -# Testing - -## Getting Started - -Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages, -or Gems, are required to build, develop, and test this software. - -Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to -install all dependencies needed for this project in the project root by running - -```shell -% bundle install --path .bundle/gems -Fetching gem metadata from https://rubygems.org/........ -Fetching gem metadata from https://rubygems.org/.. -Using rake (10.1.0) -Using builder (3.2.2) --- 8><-- many more --><8 -- -Using rspec-system-puppet (2.2.0) -Using serverspec (0.6.3) -Using rspec-system-serverspec (1.0.0) -Using bundler (1.3.5) -Your bundle is complete! -Use `bundle show [gemname]` to see where a bundled gem is installed. -``` - -NOTE: some systems may require you to run this command with sudo. - -If you already have those gems installed, make sure they are up-to-date: - -```shell -% bundle update -``` - -## Running Tests - -With all dependencies in place and up-to-date, run the tests: - -### Unit Tests - -```shell -% bundle exec rake spec -``` - -This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. -rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json), -rspec tests define them in [.fixtures.yml](./fixtures.yml). - -### Acceptance Tests - -Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under -[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test -scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system. - -Run the tests by issuing the following command - -```shell -% bundle exec rake spec_clean -% bundle exec rspec spec/acceptance -``` - -This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), -install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb) -and then run all the tests under [spec/acceptance](./spec/acceptance). - -## Writing Tests - -### Unit Tests - -When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a -catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] -but here's a tiny sample: - -Sample manifest: - -```puppet -file { "a test file": - ensure => present, - path => "/etc/sample", -} -``` - -Sample test: - -```ruby -it 'does a thing' do - expect(subject).to contain_file("a test file").with({:path => "/etc/sample"}) -end -``` - -### Acceptance Tests - -Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it -twice to check for idempotency or errors, then run expectations. - -```ruby -it 'does an end-to-end thing' do - pp = <<-EOF - file { 'a test file': - ensure => present, - path => "/etc/sample", - content => "test string", - } - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - -end - -describe file("/etc/sample") do - it { is_expected.to contain "test string" } -end - -``` - -# If you have commit access to the repository - -Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge -in your changes. The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that -all changes go through a code review process.** - -The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch. - -# Get Help - -### On the web -* [Puppet help messageboard](http://puppet.com/community/get-help) -* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing) -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) - -### On chat -* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli -* IRC (freenode) #puppet-dev, #voxpupuli - - -[rspec-puppet]: http://rspec-puppet.com/ -[rspec-puppet_docs]: http://rspec-puppet.com/documentation/ -[beaker]: https://github.com/puppetlabs/beaker -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec +Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need. diff -pruN 8.1.0-7/Gemfile 15.0.0-3/Gemfile --- 8.1.0-7/Gemfile 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/Gemfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -source ENV['GEM_SOURCE'] || 'https://rubygems.org' - -def location_for(place_or_version, fake_version = nil) - git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} - file_url_regex = %r{\Afile:\/\/(?.*)} - - if place_or_version && (git_url = place_or_version.match(git_url_regex)) - [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact - elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) - ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] - else - [place_or_version, { require: false }] - end -end - -ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments -minor_version = ruby_version_segments[0..1].join('.') - -group :development do - gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') - gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') - gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') - gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') - 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 "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-module-win-dev-r#{minor_version}", 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 -group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "beaker-testmode_switcher", require: false -end - -puppet_version = ENV['PUPPET_GEM_VERSION'] -facter_version = ENV['FACTER_GEM_VERSION'] -hiera_version = ENV['HIERA_GEM_VERSION'] - -gems = {} - -gems['puppet'] = location_for(puppet_version) - -# If facter or hiera versions have been specified via the environment -# variables - -gems['facter'] = location_for(facter_version) if facter_version -gems['hiera'] = location_for(hiera_version) if hiera_version - -if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} - # If we're using a Puppet gem on Windows which handles its own win32-xxx gem - # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). - gems['win32-dir'] = ['<= 0.4.9', require: false] - gems['win32-eventlog'] = ['<= 0.6.5', require: false] - gems['win32-process'] = ['<= 0.7.5', require: false] - gems['win32-security'] = ['<= 0.2.5', require: false] - gems['win32-service'] = ['0.8.8', require: false] -end - -gems.each do |gem_name, gem_params| - gem gem_name, *gem_params -end - -# Evaluate Gemfile.local and ~/.gemfile if they exist -extra_gemfiles = [ - "#{__FILE__}.local", - File.join(Dir.home, '.gemfile'), -] - -extra_gemfiles.each do |gemfile| - if File.file?(gemfile) && File.readable?(gemfile) - eval(File.read(gemfile), binding) - end -end -# vim: syntax=ruby diff -pruN 8.1.0-7/HISTORY.md 15.0.0-3/HISTORY.md --- 8.1.0-7/HISTORY.md 2018-09-13 14:14:13.000000000 +0000 +++ 15.0.0-3/HISTORY.md 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,354 @@ +## v11.0.3 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.2...v11.0.3) + +### Fixed + +- \(IAC-1430\) - Minor docs updating [\#1401](https://github.com/puppetlabs/puppetlabs-mysql/pull/1401) ([pmcmaw](https://github.com/pmcmaw)) + +## [v11.0.2](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.2) (2021-06-07) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.1...v11.0.2) + +### Fixed + +- \(bugfix\) - Pull python3-mysqldb in Debian Bullseye [\#1396](https://github.com/puppetlabs/puppetlabs-mysql/pull/1396) ([thomasgoirand](https://github.com/thomasgoirand)) +- Update xtrabackup package name for Ubuntu 20.04 [\#1387](https://github.com/puppetlabs/puppetlabs-mysql/pull/1387) ([rsynnest](https://github.com/rsynnest)) + +## [v11.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.1) (2021-04-19) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.0...v11.0.1) + +### Fixed + +- Fix: Puppet Unknown variable: 'mysql::params::exec\_path' [\#1378](https://github.com/puppetlabs/puppetlabs-mysql/pull/1378) ([JvGinkel](https://github.com/JvGinkel)) +- \(IAC-1497\) - Removal of unsupported `translate` dependency [\#1375](https://github.com/puppetlabs/puppetlabs-mysql/pull/1375) ([david22swan](https://github.com/david22swan)) +- \(MODULES-10926\) Fix Java binding package for Ubuntu 20.04 [\#1373](https://github.com/puppetlabs/puppetlabs-mysql/pull/1373) ([treydock](https://github.com/treydock)) + +## [v11.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.0) (2021-03-01) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.10.0...v11.0.0) + +### Changed + +- pdksync - \(MAINT\) Remove SLES 11 support [\#1370](https://github.com/puppetlabs/puppetlabs-mysql/pull/1370) ([sanfrancrisko](https://github.com/sanfrancrisko)) +- pdksync - \(MAINT\) Remove RHEL 5 family support [\#1369](https://github.com/puppetlabs/puppetlabs-mysql/pull/1369) ([sanfrancrisko](https://github.com/sanfrancrisko)) +- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#1366](https://github.com/puppetlabs/puppetlabs-mysql/pull/1366) ([carabasdaniel](https://github.com/carabasdaniel)) + +### Added + +- Support compression command and extension [\#1363](https://github.com/puppetlabs/puppetlabs-mysql/pull/1363) ([dploeger](https://github.com/dploeger)) + +## [v10.10.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.10.0) (2021-02-11) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.9.1...v10.10.0) + +### Added + +- Set default MySQL version for FreeBSD [\#1360](https://github.com/puppetlabs/puppetlabs-mysql/pull/1360) ([olevole](https://github.com/olevole)) + +## [v10.9.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.9.1) (2021-01-06) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.9.0...v10.9.1) + +### Fixed + +- Repair check of logbindir [\#1348](https://github.com/puppetlabs/puppetlabs-mysql/pull/1348) ([qha](https://github.com/qha)) + +## [v10.9.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.9.0) (2020-12-16) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.8.0...v10.9.0) + +### Added + +- \(FEAT\) Add support for Puppet 7 [\#1347](https://github.com/puppetlabs/puppetlabs-mysql/pull/1347) ([daianamezdrea](https://github.com/daianamezdrea)) +- \(IAC-996\) Removal of inappropriate terminology [\#1340](https://github.com/puppetlabs/puppetlabs-mysql/pull/1340) ([pmcmaw](https://github.com/pmcmaw)) + +## [v10.8.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.8.0) (2020-11-03) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.7.1...v10.8.0) + +### Added + +- Add compatibility for Amazon Linux 2 [\#1328](https://github.com/puppetlabs/puppetlabs-mysql/pull/1328) ([greno2](https://github.com/greno2)) + +### Fixed + +- \(IAC-1137\) Ensure curl package is installed for xtrabackup tests [\#1338](https://github.com/puppetlabs/puppetlabs-mysql/pull/1338) ([pmcmaw](https://github.com/pmcmaw)) +- \(MODULES-10788\) - fix for password prompt when creating mysql\_login\_path resource [\#1334](https://github.com/puppetlabs/puppetlabs-mysql/pull/1334) ([andeman](https://github.com/andeman)) +- \(MODULES-10790\) - Setting logbin results in error Unknown variable: 'managed\_dirs\_path' [\#1325](https://github.com/puppetlabs/puppetlabs-mysql/pull/1325) ([pmcmaw](https://github.com/pmcmaw)) +- Fix package for python bindings on Ubuntu 20.04 [\#1323](https://github.com/puppetlabs/puppetlabs-mysql/pull/1323) ([tobias-urdin](https://github.com/tobias-urdin)) + +## [v10.7.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.7.1) (2020-09-25) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.7.0...v10.7.1) + +### Fixed + +- \(IAC-1175\) Pin percona-release to version 1.0-22 for Debian 8 [\#1329](https://github.com/puppetlabs/puppetlabs-mysql/pull/1329) ([pmcmaw](https://github.com/pmcmaw)) +- \[MODULES-10773\] Fix for rh-mysql80 [\#1322](https://github.com/puppetlabs/puppetlabs-mysql/pull/1322) ([carabasdaniel](https://github.com/carabasdaniel)) + +## [v10.7.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.7.0) (2020-08-12) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.6.0...v10.7.0) + +### Added + +- pdksync - \(IAC-973\) - Update travis/appveyor to run on new default branch `main` [\#1316](https://github.com/puppetlabs/puppetlabs-mysql/pull/1316) ([david22swan](https://github.com/david22swan)) +- add package provider and source [\#1314](https://github.com/puppetlabs/puppetlabs-mysql/pull/1314) ([fe80](https://github.com/fe80)) + +### Fixed + +- Remove non printable characters [\#1315](https://github.com/puppetlabs/puppetlabs-mysql/pull/1315) ([elmobp](https://github.com/elmobp)) +- Remove control character from manifests/server.pp [\#1312](https://github.com/puppetlabs/puppetlabs-mysql/pull/1312) ([tomkrouper](https://github.com/tomkrouper)) + +## [v10.6.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.6.0) (2020-06-23) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.5.0...v10.6.0) + +### Added + +- Handle cron package from different module [\#1306](https://github.com/puppetlabs/puppetlabs-mysql/pull/1306) ([ashish1099](https://github.com/ashish1099)) +- \(IAC-746\) - Add ubuntu 20.04 support [\#1303](https://github.com/puppetlabs/puppetlabs-mysql/pull/1303) ([david22swan](https://github.com/david22swan)) +- \(MODULES-1550\) add new Feature MySQL login paths [\#1295](https://github.com/puppetlabs/puppetlabs-mysql/pull/1295) ([andeman](https://github.com/andeman)) + +### Fixed + +- Add managed\_dirs parameter [\#1305](https://github.com/puppetlabs/puppetlabs-mysql/pull/1305) ([evgenkisel](https://github.com/evgenkisel)) +- change split on whitespace to split on tab in mysql\_user [\#1233](https://github.com/puppetlabs/puppetlabs-mysql/pull/1233) ([koshatul](https://github.com/koshatul)) + +## [v10.5.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.5.0) (2020-05-13) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.4.0...v10.5.0) + +### Added + +- Support mariadb's ed25519-based authentication [\#1292](https://github.com/puppetlabs/puppetlabs-mysql/pull/1292) ([dciabrin](https://github.com/dciabrin)) +- Allow changing the mysql-config-file group-ownership [\#1284](https://github.com/puppetlabs/puppetlabs-mysql/pull/1284) ([unki](https://github.com/unki)) + +### Fixed + +- Remove legacy \(old API\) `mysql_password` function [\#1299](https://github.com/puppetlabs/puppetlabs-mysql/pull/1299) ([alexjfisher](https://github.com/alexjfisher)) +- Improve differences between generated mysql service id values [\#1293](https://github.com/puppetlabs/puppetlabs-mysql/pull/1293) ([ryaner](https://github.com/ryaner)) +- \(MODULES-10023\) Fix multiple xtrabackup regressions [\#1245](https://github.com/puppetlabs/puppetlabs-mysql/pull/1245) ([fraenki](https://github.com/fraenki)) +- Fix binarylog by allowing users to specify managed directories [\#1194](https://github.com/puppetlabs/puppetlabs-mysql/pull/1194) ([elfranne](https://github.com/elfranne)) + +## [v10.4.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.4.0) (2020-03-02) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.3.0...v10.4.0) + +### Added + +- Allow adapting MySQL configuration file's permissions mode [\#1278](https://github.com/puppetlabs/puppetlabs-mysql/pull/1278) ([unki](https://github.com/unki)) +- pdksync - \(FM-8581\) - Debian 10 added to travis and provision file refactored [\#1275](https://github.com/puppetlabs/puppetlabs-mysql/pull/1275) ([david22swan](https://github.com/david22swan)) +- Allow backupcompress for xtrabackup profile [\#1196](https://github.com/puppetlabs/puppetlabs-mysql/pull/1196) ([Spuffnduff](https://github.com/Spuffnduff)) +- Enable module to not use default options [\#1192](https://github.com/puppetlabs/puppetlabs-mysql/pull/1192) ([morremeyer](https://github.com/morremeyer)) + +## [v10.3.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.3.0) (2019-12-11) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.2.1...v10.3.0) + +### Added + +- \(FM-8677\) - Support added for CentOS 8 [\#1254](https://github.com/puppetlabs/puppetlabs-mysql/pull/1254) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- Fix java and ruby binding packages for Debian 10 [\#1264](https://github.com/puppetlabs/puppetlabs-mysql/pull/1264) ([treydock](https://github.com/treydock)) +- \(MODULES-10114\) Confine fact for only when mysql is in PATH [\#1256](https://github.com/puppetlabs/puppetlabs-mysql/pull/1256) ([bFekete](https://github.com/bFekete)) + +## [v10.2.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.2.1) (2019-10-30) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.2.0...v10.2.1) + +### Fixed + +- Fix mysql::sql task error message [\#1243](https://github.com/puppetlabs/puppetlabs-mysql/pull/1243) ([alexjfisher](https://github.com/alexjfisher)) +- Fix xtrabackup regression introduced in \#1207 [\#1242](https://github.com/puppetlabs/puppetlabs-mysql/pull/1242) ([fraenki](https://github.com/fraenki)) +- Repair mysql\_grant docs and diagnostics [\#1237](https://github.com/puppetlabs/puppetlabs-mysql/pull/1237) ([qha](https://github.com/qha)) + +## [v10.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.2.0) (2019-09-24) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.1.0...v10.2.0) + +### Added + +- FM-8406 add support on Debian10 [\#1230](https://github.com/puppetlabs/puppetlabs-mysql/pull/1230) ([lionce](https://github.com/lionce)) +- Make backup success file path configurable [\#1207](https://github.com/puppetlabs/puppetlabs-mysql/pull/1207) ([HT43-bqxFqB](https://github.com/HT43-bqxFqB)) + +### Fixed + +- No package under FreeBSD [\#1227](https://github.com/puppetlabs/puppetlabs-mysql/pull/1227) ([jas01](https://github.com/jas01)) +- Fix group on FreeBSD [\#1226](https://github.com/puppetlabs/puppetlabs-mysql/pull/1226) ([jas01](https://github.com/jas01)) +- Don't run fact when you can't find mysqld [\#1224](https://github.com/puppetlabs/puppetlabs-mysql/pull/1224) ([jstewart612](https://github.com/jstewart612)) +- Bugfix on Debian 9 : ruby\_package\_name must be ruby-mysql2 [\#1223](https://github.com/puppetlabs/puppetlabs-mysql/pull/1223) ([leopoiroux](https://github.com/leopoiroux)) +- Fix errors for /bin/sh with the xtrabackup cron [\#1222](https://github.com/puppetlabs/puppetlabs-mysql/pull/1222) ([baldurmen](https://github.com/baldurmen)) +- Fix/fix dependency issue in freebsd with log error file creation from 10.0.0 [\#1221](https://github.com/puppetlabs/puppetlabs-mysql/pull/1221) ([rick-pri](https://github.com/rick-pri)) + +## [v10.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.1.0) (2019-07-30) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v10.0.0...v10.1.0) + +### Added + +- Allow backup::mysqldump::time to accept monthday, month, weekday [\#1214](https://github.com/puppetlabs/puppetlabs-mysql/pull/1214) ([malakai97](https://github.com/malakai97)) + +## [v10.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v10.0.0) (2019-06-26) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v9.1.0...v10.0.0) + +### Added + +- add support for rh-mariadb102 [\#1209](https://github.com/puppetlabs/puppetlabs-mysql/pull/1209) ([martin-schlossarek](https://github.com/martin-schlossarek)) +- Freebsd compat [\#1208](https://github.com/puppetlabs/puppetlabs-mysql/pull/1208) ([kapouik](https://github.com/kapouik)) + +### Fixed + +- FM-7982 - update provisioner to docker\_exp [\#1205](https://github.com/puppetlabs/puppetlabs-mysql/pull/1205) ([lionce](https://github.com/lionce)) + +## [v9.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v9.1.0) (2019-06-10) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v9.0.0...v9.1.0) + +### Added + +- Add option to specify $backupdir as a symlink target, for use with dm… [\#1200](https://github.com/puppetlabs/puppetlabs-mysql/pull/1200) ([comport3](https://github.com/comport3)) +- \(FM-8029\) Add RedHat 8 support [\#1199](https://github.com/puppetlabs/puppetlabs-mysql/pull/1199) ([eimlav](https://github.com/eimlav)) +- Allow own Xtrabackup script [\#1189](https://github.com/puppetlabs/puppetlabs-mysql/pull/1189) ([SaschaDoering](https://github.com/SaschaDoering)) +- Litmus conversion [\#1175](https://github.com/puppetlabs/puppetlabs-mysql/pull/1175) ([pmcmaw](https://github.com/pmcmaw)) + +### Fixed + +- \(MODULES-6875,MODULES-7487\) - Fix mariadb mysql\_user password idempotency [\#1195](https://github.com/puppetlabs/puppetlabs-mysql/pull/1195) ([alexjfisher](https://github.com/alexjfisher)) + +## [v9.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v9.0.0) (2019-05-21) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.1.0...v9.0.0) + +### Changed + +- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#1184](https://github.com/puppetlabs/puppetlabs-mysql/pull/1184) ([david22swan](https://github.com/david22swan)) + +### Added + +- Make incremental backups deactivable [\#1188](https://github.com/puppetlabs/puppetlabs-mysql/pull/1188) ([SaschaDoering](https://github.com/SaschaDoering)) +- Allow multiple backupmethods [\#1187](https://github.com/puppetlabs/puppetlabs-mysql/pull/1187) ([SaschaDoering](https://github.com/SaschaDoering)) + +### Fixed + +- Fix the contribution guide URL [\#1190](https://github.com/puppetlabs/puppetlabs-mysql/pull/1190) ([mauricemeyer](https://github.com/mauricemeyer)) +- \(MODULES-8886\) Revert removal of deepmerge function [\#1181](https://github.com/puppetlabs/puppetlabs-mysql/pull/1181) ([eimlav](https://github.com/eimlav)) +- Fixed Changelog links for 8.1.0 [\#1180](https://github.com/puppetlabs/puppetlabs-mysql/pull/1180) ([mauricemeyer](https://github.com/mauricemeyer)) + +## [8.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.1.0) (2019-04-03) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.1...8.1.0) + +### Added + +- Rotate option for xtrabackup script [\#1176](https://github.com/puppetlabs/puppetlabs-mysql/pull/1176) ([elfranne](https://github.com/elfranne)) +- Add support for dynamic backupmethods/mariabackup [\#1171](https://github.com/puppetlabs/puppetlabs-mysql/pull/1171) ([danquack](https://github.com/danquack)) + +### Fixed + +- \(MODULES-6627\) Remove unused --host flags from mysqlcaller [\#1174](https://github.com/puppetlabs/puppetlabs-mysql/pull/1174) ([david22swan](https://github.com/david22swan)) +- Set correct packagename for ruby\_mysql on Ubuntu 18.04 [\#1163](https://github.com/puppetlabs/puppetlabs-mysql/pull/1163) ([datty](https://github.com/datty)) +- \[MODULES-8779\] Set proper python\_package\_name for RHEL/CentOS 8 [\#1161](https://github.com/puppetlabs/puppetlabs-mysql/pull/1161) ([javierpena](https://github.com/javierpena)) +- fix install ordering for innodb data size [\#1160](https://github.com/puppetlabs/puppetlabs-mysql/pull/1160) ([fe80](https://github.com/fe80)) + +## [8.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.0.1) (2019-03-20) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.0...8.0.1) + +### Fixed + +- \(MODULES-8684\) - Removing private tags from Puppet Types [\#1170](https://github.com/puppetlabs/puppetlabs-mysql/pull/1170) ([david22swan](https://github.com/david22swan)) + +## [8.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/8.0.0) (2019-01-18) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/7.0.0...8.0.0) + +### Changed + +- \(MODULES-8193\) - Removal of inbuilt deepmerge and dirname functions [\#1145](https://github.com/puppetlabs/puppetlabs-mysql/pull/1145) ([david22swan](https://github.com/david22swan)) + +### Added + +- \(MODULES-3539\) Allow @ in username [\#1155](https://github.com/puppetlabs/puppetlabs-mysql/pull/1155) ([Fogelholk](https://github.com/Fogelholk)) +- \(MODULES-8144\) - Add support for SLES 15 [\#1146](https://github.com/puppetlabs/puppetlabs-mysql/pull/1146) ([eimlav](https://github.com/eimlav)) +- Added support for RHSCL mysql versions and support for .mylogin.cnf for MySQL 5.6.6+ [\#1061](https://github.com/puppetlabs/puppetlabs-mysql/pull/1061) ([DJMuggs](https://github.com/DJMuggs)) + +### Fixed + +- \(MODULES-8193\) - Wrapper methods created for inbuilt 4.x functions [\#1151](https://github.com/puppetlabs/puppetlabs-mysql/pull/1151) ([david22swan](https://github.com/david22swan)) +- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1150](https://github.com/puppetlabs/puppetlabs-mysql/pull/1150) ([tphoney](https://github.com/tphoney)) +- Add includedir for Gentoo [\#1147](https://github.com/puppetlabs/puppetlabs-mysql/pull/1147) ([baurmatt](https://github.com/baurmatt)) +- add mysql\_native\_password for mariadb 10.2 in password\_hash [\#1117](https://github.com/puppetlabs/puppetlabs-mysql/pull/1117) ([mlk-89](https://github.com/mlk-89)) +- Removing query\_cache ops that are no longer supported in MySQL \>= 8.0 [\#1107](https://github.com/puppetlabs/puppetlabs-mysql/pull/1107) ([ernstae](https://github.com/ernstae)) + +## [7.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/7.0.0) (2018-10-25) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.2.0...7.0.0) + +### Changed + +- \(MODULES-6923\) remove staging module [\#1115](https://github.com/puppetlabs/puppetlabs-mysql/pull/1115) ([tphoney](https://github.com/tphoney)) + +### Added + +- \(MODULES-7857\) Support user creation on galera [\#1130](https://github.com/puppetlabs/puppetlabs-mysql/pull/1130) ([MaxFedotov](https://github.com/MaxFedotov)) +- MySQL 8 compatibility in user management [\#1092](https://github.com/puppetlabs/puppetlabs-mysql/pull/1092) ([zpetr](https://github.com/zpetr)) + +### Fixed + +- \(MODULES-7487\) Check authentication string for user password on MariaDB 10.2.16+ [\#1135](https://github.com/puppetlabs/puppetlabs-mysql/pull/1135) ([gguillotte](https://github.com/gguillotte)) + +## [6.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.2.0) (2018-09-27) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.1.0...6.2.0) + +### Added + +- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1127](https://github.com/puppetlabs/puppetlabs-mysql/pull/1127) ([tphoney](https://github.com/tphoney)) + +### Fixed + +- \(maint\) - Change versioning comparison [\#1123](https://github.com/puppetlabs/puppetlabs-mysql/pull/1123) ([eimlav](https://github.com/eimlav)) + +## [6.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.1.0) (2018-09-13) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.0.0...6.1.0) + +### Fixed + +- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1114](https://github.com/puppetlabs/puppetlabs-mysql/pull/1114) ([pmcmaw](https://github.com/pmcmaw)) +- \(MODULES-6981\) Do not try to read ~root/.my.cnf when calling "mysqld -V" [\#1063](https://github.com/puppetlabs/puppetlabs-mysql/pull/1063) ([simondeziel](https://github.com/simondeziel)) + +## [6.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.0.0) (2018-08-01) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.4.0...6.0.0) + +### Changed + +- \[FM-6962\] Removal of unsupported OS from mysql [\#1086](https://github.com/puppetlabs/puppetlabs-mysql/pull/1086) ([david22swan](https://github.com/david22swan)) + +### Added + +- \(FM-5985\) - Addition of support for Ubuntu 18.04 to mysql [\#1104](https://github.com/puppetlabs/puppetlabs-mysql/pull/1104) ([david22swan](https://github.com/david22swan)) +- \(MODULES-7439\) - Implementing beaker-testmode\_switcher [\#1095](https://github.com/puppetlabs/puppetlabs-mysql/pull/1095) ([pmcmaw](https://github.com/pmcmaw)) +- Support for optional\_\_args and prescript to mysqldump backup provider [\#1083](https://github.com/puppetlabs/puppetlabs-mysql/pull/1083) ([eputnam](https://github.com/eputnam)) +- Allow empty user passwords [\#1075](https://github.com/puppetlabs/puppetlabs-mysql/pull/1075) ([ThoTischner](https://github.com/ThoTischner)) +- Add user tls\_options and grant options to mysql::db [\#1065](https://github.com/puppetlabs/puppetlabs-mysql/pull/1065) ([edestecd](https://github.com/edestecd)) +- Use puppet4 functions-api [\#1044](https://github.com/puppetlabs/puppetlabs-mysql/pull/1044) ([juliantodt](https://github.com/juliantodt)) +- Replaced 'DROP USER' with 'DROP USER IF EXISTS' [\#942](https://github.com/puppetlabs/puppetlabs-mysql/pull/942) ([libertamohamed](https://github.com/libertamohamed)) + +### Fixed + +- \(MODULES-7353\) Enable service for Debian 9 [\#1094](https://github.com/puppetlabs/puppetlabs-mysql/pull/1094) ([david22swan](https://github.com/david22swan)) +- Update locales test for Debian 9 [\#1091](https://github.com/puppetlabs/puppetlabs-mysql/pull/1091) ([HelenCampbell](https://github.com/HelenCampbell)) +- \[FM-7045\] Fix to allow Debian 9 test's to run clean [\#1088](https://github.com/puppetlabs/puppetlabs-mysql/pull/1088) ([david22swan](https://github.com/david22swan)) +- \(MODULES-7198\) Fix DROP USER IF EXISTS on mariadb [\#1082](https://github.com/puppetlabs/puppetlabs-mysql/pull/1082) ([hunner](https://github.com/hunner)) + ## 5.4.0 ### Added @@ -892,3 +1243,9 @@ configuration variables. [5.2.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.1.0...5.2.0 [5.1.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.0.0...5.1.0 [5.0.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/4.0.1...5.0.0 + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff -pruN 8.1.0-7/MAINTAINERS.md 15.0.0-3/MAINTAINERS.md --- 8.1.0-7/MAINTAINERS.md 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/MAINTAINERS.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -## Maintenance - -Maintainers: - - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com` - -Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `mysql`. diff -pruN 8.1.0-7/README.md 15.0.0-3/README.md --- 8.1.0-7/README.md 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/README.md 2023-06-19 12:29:51.000000000 +0000 @@ -14,6 +14,7 @@ * [Install Percona server on CentOS](#install-percona-server-on-centos) * [Install MariaDB on Ubuntu](#install-mariadb-on-ubuntu) * [Install Plugins](#install-plugins) + * [Use Percona XtraBackup](#use-percona-xtrabackup) 4. [Reference - An under-the-hood peek at what the module is doing and how](REFERENCE.md) 5. [Limitations - OS compatibility, etc.](#limitations) 6. [Development - Guide for contributing to the module](#development) @@ -30,18 +31,22 @@ This module manages both the installatio To install a server with the default options: -`include '::mysql::server'`. +`include mysql::server`. To customize options, such as the root password or `/etc/my.cnf` settings, you must also pass in an override hash: ```puppet -class { '::mysql::server': +class { 'mysql::server': root_password => 'strongpassword', remove_default_accounts => true, - override_options => $override_options + restart => true, + override_options => $override_options, } ``` +Nota bene: Configuration changes will only be applied to the running +MySQL server if you pass true as restart to mysql::server. + See [**Customize Server Options**](#customize-server-options) below for examples of the hash structure for $override_options. ## Usage @@ -56,13 +61,13 @@ To define server options, structure a ha $override_options = { 'section' => { 'item' => 'thing', - } + }, } ``` For options that you would traditionally represent in this format: -``` +```ini [section] thing = X ``` @@ -77,13 +82,13 @@ If an option needs multiple instances, p $override_options = { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2'], - } + }, } ``` produces -```puppet +```ini [mysqld] replicate-do-db = base1 replicate-do-db = base2 @@ -91,6 +96,13 @@ 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. + +By default, the puppet won't reload/restart mysqld when you change an existing +configuration. If you want to do that, you can set +`mysql::server::reload_on_config_change` to true. + ### Create a database To create a database with a user and some assigned privileges: @@ -131,14 +143,14 @@ If you have installed the mysql client i ```puppet mysql::db { 'mydb': - user => 'myuser', - password => 'mypass', - host => 'localhost', - grant => ['SELECT', 'UPDATE'], - sql => '/path/to/sqlfile.gz', - import_cat_cmd => 'zcat', - import_timeout => 900, - mysql_exec_path => '/opt/rh/rh-myql57/root/bin' + user => 'myuser', + password => 'mypass', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], + sql => ['/path/to/sqlfile.gz'], + import_cat_cmd => 'zcat', + import_timeout => 900, + mysql_exec_path => '/opt/rh/rh-myql57/root/bin', } ``` @@ -146,11 +158,29 @@ mysql::db { 'mydb': To add custom MySQL configuration, place additional files into `includedir`. This allows you to override settings or add additional ones, which is helpful if you don't use `override_options` in `mysql::server`. The `includedir` location is by default set to `/etc/mysql/conf.d`. +### Managing Root Passwords + +If you want the password managed by puppet for `127.0.0.1` and `::1` as an end user you would need to explicitly manage them with additional manifest entries. For example: + +```puppet +mysql_user { '[root@127.0.0.1]': + ensure => present, + password_hash => mysql::password($mysql::server::root_password), +} + +mysql_user { 'root@::1': + ensure => present, + password_hash => mysql::password($mysql::server::root_password), +} +``` + +**Note:** This module is not designed to carry out additional DNS and aliasing. + ### Work with an existing server To instantiate databases and users on an existing MySQL server, you need a `.my.cnf` file in `root`'s home directory. This file must specify the remote server address and credentials. For example: -```puppet +```ini [client] user=root host=localhost @@ -176,6 +206,37 @@ mysql::db { 'mydb': If required, the password can also be an empty string to allow connections without an password. +### Create login paths + +This feature works only for the MySQL Community Edition >= 5.6.6. + +A login path is a set of options (host, user, password, port and socket) that specify which MySQL server to connect to and which account to authenticate as. The authentication credentials and the other options are stored in an encrypted login file named .mylogin.cnf typically under the users home directory. + +More information about MySQL login paths: https://dev.mysql.com/doc/refman/8.0/en/mysql-config-editor.html. + +Some example for login paths: + +```puppet +mysql_login_path { 'client': + owner => root, + host => 'localhost', + user => 'root', + password => Sensitive('secure'), + socket => '/var/run/mysqld/mysqld.sock', + ensure => present, +} + +mysql_login_path { 'remote_db': + owner => root, + host => '10.0.0.1', + user => 'network', + password => Sensitive('secure'), + port => 3306, + ensure => present, +} +``` +See examples/mysql_login_path.pp for further examples. + ### Install Percona server on CentOS This example shows how to do a minimal installation of a Percona server on a @@ -195,7 +256,7 @@ yumrepo { 'percona': gpgcheck => 1, } -class {'mysql::server': +class { 'mysql::server': package_name => 'Percona-Server-server-57', service_name => 'mysql', config_file => '/etc/my.cnf', @@ -209,26 +270,26 @@ class {'mysql::server': mysqld_safe => { log-error => '/var/log/mysqld.log', }, - } + }, } # Note: Installing Percona-Server-server-57 also installs Percona-Server-client-57. # This shows how to install the Percona MySQL client on its own -class {'mysql::client': - package_name => 'Percona-Server-client-57' +class { 'mysql::client': + package_name => 'Percona-Server-client-57', } # These packages are normally installed along with Percona-Server-server-57 # If you needed to install the bindings, however, you could do so with this code class { 'mysql::bindings': - client_dev_package_name => 'Percona-Server-shared-57', - client_dev => true, - daemon_dev_package_name => 'Percona-Server-devel-57', - daemon_dev => true, - perl_enable => true, - perl_package_name => 'perl-DBD-MySQL', - python_enable => true, - python_package_name => 'MySQL-python', + client_dev_package_name => 'Percona-Server-shared-57', + client_dev => true, + daemon_dev_package_name => 'Percona-Server-devel-57', + daemon_dev => true, + perl_enable => true, + perl_package_name => 'perl-DBD-MySQL', + python_enable => true, + python_package_name => 'MySQL-python', } # Dependencies definition @@ -246,7 +307,7 @@ 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. @@ -254,11 +315,11 @@ In this example, we'll use the latest st include apt apt::source { 'mariadb': - location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu', - release => $::lsbdistcodename, + location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.3/ubuntu', + release => $::facts['os']['codename'], repos => 'main', key => { - id => '199369E5404BD5FC7D2FE43BCBCB082A1BB943DB', + id => '177F4010FE56CA3336300305F1656F24C74CD1D8', server => 'hkp://keyserver.ubuntu.com:80', }, include => { @@ -270,7 +331,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. @@ -279,10 +340,10 @@ All the values set here are an example o Specify the version of the package you want with the `package_ensure` parameter. ```puppet -class {'::mysql::server': +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 => { @@ -292,14 +353,14 @@ class {'::mysql::server': mysqld_safe => { 'log-error' => '/var/log/mysql/mariadb.log', }, - } + }, } # Dependency management. Only use that part if you are installing the repository # as shown in the Preliminary step of this example. Apt::Source['mariadb'] ~> Class['apt::update'] -> -Class['::mysql::server'] +Class['mysql::server'] ``` @@ -310,16 +371,16 @@ This example shows how to install the Ma Specify the version of the package you want with the `package_ensure` parameter. ```puppet -class {'::mysql::client': +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, } # Dependency management. Only use that part if you are installing the repository as shown in the Preliminary step of this example. Apt::Source['mariadb'] ~> Class['apt::update'] -> -Class['::mysql::client'] +Class['mysql::client'] ``` ### Install MySQL Community server on CentOS @@ -334,7 +395,7 @@ You can install MySQL Community Server o In Puppet: ```puppet -include ::mysql::server +include mysql::server create_resources(yumrepo, hiera('yumrepo', {})) @@ -385,6 +446,93 @@ mysql::server::db: ### Install Plugins Plugins can be installed by using the `mysql_plugin` defined type. See `examples/mysql_plugin.pp` for futher examples. + +### Use Percona XtraBackup + +This example shows how to configure MySQL backups with Percona XtraBackup. This sets up a weekly cronjob to perform a full backup and additional daily cronjobs for incremental backups. Each backup will create a new directory. A cleanup job will automatically remove backups that are older than 15 days. + +```puppet +yumrepo { 'percona': + descr => 'CentOS $releasever - Percona', + baseurl => 'http://repo.percona.com/release/$releasever/RPMS/$basearch', + gpgkey => 'https://www.percona.com/downloads/RPM-GPG-KEY-percona https://repo.percona.com/yum/PERCONA-PACKAGING-KEY', + enabled => 1, + gpgcheck => 1, +} + +class { 'mysql::server::backup': + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', + provider => 'xtrabackup', + backuprotate => 15, + execpath => '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin', + time => ['23', '15'], +} +``` + +If the daily or weekly backup was successful, then the empty file `/tmp/mysqlbackup_success` is created, which makes it easy to monitor the status of the database backup. + +After two weeks the backup directory should look similar to the example below. + +``` +/tmp/backups/2019-11-10_full +/tmp/backups/2019-11-11_23-15-01 +/tmp/backups/2019-11-13_23-15-01 +/tmp/backups/2019-11-13_23-15-02 +/tmp/backups/2019-11-14_23-15-01 +/tmp/backups/2019-11-15_23-15-02 +/tmp/backups/2019-11-16_23-15-01 +/tmp/backups/2019-11-17_full +/tmp/backups/2019-11-18_23-15-01 +/tmp/backups/2019-11-19_23-15-01 +/tmp/backups/2019-11-20_23-15-02 +/tmp/backups/2019-11-21_23-15-01 +/tmp/backups/2019-11-22_23-15-02 +/tmp/backups/2019-11-23_23-15-01 +``` + +A drawback of using incremental backups is the need to keep at least 7 days of backups, otherwise the full backups is removed early and consecutive incremental backups will fail. Furthermore an incremental backups becomes obsolete once the required full backup was removed. + +The next example uses XtraBackup with incremental backups disabled. In this case the daily cronjob will always perform a full backup. + +```puppet +class { 'mysql::server::backup': + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', + provider => 'xtrabackup', + incremental_backups => false, + backuprotate => 5, + execpath => '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin', + time => ['23', '15'], +} +``` + +The next example shows how to use mariabackup (a fork of xtrabackup) as a backup provider. +Note that on most Linux/BSD distributions, this will require setting `backupmethod_package => 'mariadb-backup'` in the `mysql::server::backup` declaration in order to override the default xtrabackup package (`percona-xtrabackup`). + +```puppet +class { 'mysql::server': + package_name => 'mariadb-server', + package_ensure => '1:10.3.21+maria~xenial', + service_name => 'mysqld', + root_password => 'AVeryStrongPasswordUShouldEncrypt!', +} + +class { 'mysql::server::backup': + backupuser => 'mariabackup', + backuppassword => 'AVeryStrongPasswordUShouldEncrypt!', + provider => 'xtrabackup', + backupmethod => 'mariabackup', + backupmethod_package => 'mariadb-backup', + backupdir => '/tmp/backups', + backuprotate => 15, + execpath => '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin', + time => ['23', '15'], +} +``` + ## Reference ### Classes @@ -392,8 +540,6 @@ Plugins can be installed by using the `m #### Public classes * [`mysql::server`](#mysqlserver): Installs and configures MySQL. -* [`mysql::server::monitor`](#mysqlservermonitor): Sets up a monitoring user. -* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): Installs MySQL tuner script. * [`mysql::server::backup`](#mysqlserverbackup): Sets up MySQL backups via cron. * [`mysql::bindings`](#mysqlbindings): Installs various MySQL language bindings. * [`mysql::client`](#mysqlclient): Installs MySQL client (for non-servers). @@ -482,11 +628,11 @@ When the `/root/.mylogin.cnf` exists the This is required if `create_root_user` and `create_root_login_file` are true. If `root_password` is 'UNSET', then `create_root_user` and `create_root_login_file` are assumed to be false --- that is, the MySQL root user and `/root/.mylogin.cnf` are not created. ```puppet -class { '::mysql::server': -root_password => 'password', -create_root_my_cnf => false, -create_root_login_file => true, -login_file => "puppet:///modules/${module_name}/mylogin.cnf", +class { 'mysql::server': + root_password => 'password', + create_root_my_cnf => false, + create_root_login_file => true, + login_file => 'puppet:///modules/${module_name}/mylogin.cnf', } ``` @@ -512,31 +658,20 @@ The MySQL module has an example task tha ## Limitations -For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/master/metadata.json) +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. ## Development +We are experimenting with a new tool for running acceptance tests. Its name is [puppet_litmus](https://github.com/puppetlabs/puppet_litmus) this replaces beaker as the test runner. To run the acceptance tests follow the [instructions](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html) from the Litmus documentation. + Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. -Check out our the complete [module contribution guide](https://docs.puppetlabs.com/forge/contributing.html). +Check out our the complete [module contribution guide](https://puppet.com/docs/puppet/latest/contributing.html). ### Authors -This module is based on work by David Schmitt. The following contributors have contributed to this module (beyond Puppet Labs): - -* Larry Ludwig -* Christian G. Warden -* Daniel Black -* Justin Ellison -* Lowe Schmidt -* Matthias Pigulla -* William Van Hevelingen -* Michael Arnold -* Chris Weyl -* Daniël van Eeden -* Jan-Otto Kröpke -* Timothy Sven Nelson +This module is based on work by David Schmitt. Thank you to all of our [contributors](https://github.com/puppetlabs/puppetlabs-mysql/graphs/contributors). diff -pruN 8.1.0-7/REFERENCE.md 15.0.0-3/REFERENCE.md --- 8.1.0-7/REFERENCE.md 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/REFERENCE.md 2023-06-19 12:29:51.000000000 +0000 @@ -1,24 +1,23 @@ # Reference + ## Table of Contents -**Classes** +### Classes -_Public Classes_ +#### Public Classes -* [`mysql::bindings`](#mysqlbindings): Parent class for MySQL bindings. -* [`mysql::client`](#mysqlclient): Installs and configures the MySQL client. -* [`mysql::server`](#mysqlserver): Installs and configures the MySQL server. -* [`mysql::server::backup`](#mysqlserverbackup): Create and manage a MySQL backup. -* [`mysql::server::monitor`](#mysqlservermonitor): This is a helper class to add a monitoring user to the database -* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): Manage the MySQLTuner package. +* [`mysql::bindings`](#mysql--bindings): Parent class for MySQL bindings. +* [`mysql::client`](#mysql--client): Installs and configures the MySQL client. +* [`mysql::server`](#mysql--server): Installs and configures the MySQL server. +* [`mysql::server::backup`](#mysql--server--backup): Create and manage a MySQL backup. -_Private Classes_ +#### Private Classes * `mysql::backup::mysqlbackup`: Manage the mysqlbackup client. * `mysql::backup::mysqldump`: "Provider" for mysqldump -* `mysql::backup::xtrabackup`: "Provider" for Percona XtraBackup or MariaBackup +* `mysql::backup::xtrabackup`: "Provider" for Percona XtraBackup/MariaBackup * `mysql::bindings::client_dev`: Private class for installing client development bindings * `mysql::bindings::daemon_dev`: Private class for installing daemon development bindings * `mysql::bindings::java`: Private class for installing java language bindings. @@ -29,45 +28,51 @@ _Private Classes_ * `mysql::client::install`: Private class for MySQL client install. * `mysql::params`: Params class. * `mysql::server::account_security`: Private class for ensuring localhost accounts do not exist -* `mysql::server::binarylog`: Binary log configuration requires the mysql user to be present. This must be done after package install * `mysql::server::config`: Private class for MySQL server configuration. * `mysql::server::install`: Private class for managing MySQL package. * `mysql::server::installdb`: Builds initial databases on installation. +* `mysql::server::managed_dirs`: Binary log configuration requires the mysql user to be present. This must be done after package install. * `mysql::server::providers`: Convenience class to call each of the three providers with the corresponding hashes provided in mysql::server. * `mysql::server::root_password`: Private class for managing the root password * `mysql::server::service`: Private class for managing the MySQL service -**Defined types** +### Defined types -* [`mysql::db`](#mysqldb): Create and configure a MySQL database. +* [`mysql::db`](#mysql--db): Create and configure a MySQL database. -**Resource types** +### Resource types -_Public Resource types_ +#### Public Resource types * [`mysql_grant`](#mysql_grant): @summary Manage a MySQL user's rights. +* [`mysql_login_path`](#mysql_login_path): Manage a MySQL login path. * [`mysql_plugin`](#mysql_plugin): Manage MySQL plugins. * [`mysql_user`](#mysql_user): @summary Manage a MySQL user. This includes management of users password as well as privileges. -_Private Resource types_ +#### Private Resource types * `mysql_database`: Manage a MySQL database. * `mysql_datadir`: Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above). -**Functions** +### Functions + +* [`mysql::normalise_and_deepmerge`](#mysql--normalise_and_deepmerge): Recursively merges two or more hashes together, normalises keys with differing use of dashes and underscores. +* [`mysql::password`](#mysql--password): Hash a string as mysql's "PASSWORD()" function would do it +* [`mysql::strip_hash`](#mysql--strip_hash): When given a hash this function strips out all blank entries. +* [`mysql_password`](#mysql_password): DEPRECATED. Use the namespaced function [`mysql::password`](#mysqlpassword) instead. -* [`mysql::password`](#mysqlpassword): Hash a string as mysql's "PASSWORD()" function would do it -* [`mysql::strip_hash`](#mysqlstrip_hash): When given a hash this function strips out all blank entries. -* [`mysql_password`](#mysql_password): Hash a string as mysql's "PASSWORD()" function would do it +### Data types -**Tasks** +* [`Mysql::Options`](#Mysql--Options): A hash of options structured like the override_options, but not merged with the default options. + +### Tasks * [`export`](#export): Allows you to backup your database to local file. * [`sql`](#sql): Allows you to execute arbitary SQL ## Classes -### mysql::bindings +### `mysql::bindings` Parent class for MySQL bindings. @@ -86,241 +91,278 @@ class { 'mysql::bindings': #### Parameters -The following parameters are available in the `mysql::bindings` class. +The following parameters are available in the `mysql::bindings` class: -##### `install_options` +* [`install_options`](#-mysql--bindings--install_options) +* [`java_enable`](#-mysql--bindings--java_enable) +* [`perl_enable`](#-mysql--bindings--perl_enable) +* [`php_enable`](#-mysql--bindings--php_enable) +* [`python_enable`](#-mysql--bindings--python_enable) +* [`ruby_enable`](#-mysql--bindings--ruby_enable) +* [`client_dev`](#-mysql--bindings--client_dev) +* [`daemon_dev`](#-mysql--bindings--daemon_dev) +* [`java_package_ensure`](#-mysql--bindings--java_package_ensure) +* [`java_package_name`](#-mysql--bindings--java_package_name) +* [`java_package_provider`](#-mysql--bindings--java_package_provider) +* [`perl_package_ensure`](#-mysql--bindings--perl_package_ensure) +* [`perl_package_name`](#-mysql--bindings--perl_package_name) +* [`perl_package_provider`](#-mysql--bindings--perl_package_provider) +* [`php_package_ensure`](#-mysql--bindings--php_package_ensure) +* [`php_package_name`](#-mysql--bindings--php_package_name) +* [`php_package_provider`](#-mysql--bindings--php_package_provider) +* [`python_package_ensure`](#-mysql--bindings--python_package_ensure) +* [`python_package_name`](#-mysql--bindings--python_package_name) +* [`python_package_provider`](#-mysql--bindings--python_package_provider) +* [`ruby_package_ensure`](#-mysql--bindings--ruby_package_ensure) +* [`ruby_package_name`](#-mysql--bindings--ruby_package_name) +* [`ruby_package_provider`](#-mysql--bindings--ruby_package_provider) +* [`client_dev_package_ensure`](#-mysql--bindings--client_dev_package_ensure) +* [`client_dev_package_name`](#-mysql--bindings--client_dev_package_name) +* [`client_dev_package_provider`](#-mysql--bindings--client_dev_package_provider) +* [`daemon_dev_package_ensure`](#-mysql--bindings--daemon_dev_package_ensure) +* [`daemon_dev_package_name`](#-mysql--bindings--daemon_dev_package_name) +* [`daemon_dev_package_provider`](#-mysql--bindings--daemon_dev_package_provider) -Data type: `Any` +##### `install_options` + +Data type: `Optional[Array[String[1]]]` Passes `install_options` array to managed package resources. You must pass the [appropriate options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) for the package manager(s). Default value: `undef` -##### `java_enable` +##### `java_enable` -Data type: `Any` +Data type: `Boolean` Specifies whether `::mysql::bindings::java` should be included. Valid values are `true`, `false`. Default value: `false` -##### `perl_enable` +##### `perl_enable` -Data type: `Any` +Data type: `Boolean` Specifies whether `mysql::bindings::perl` should be included. Valid values are `true`, `false`. Default value: `false` -##### `php_enable` +##### `php_enable` -Data type: `Any` +Data type: `Boolean` Specifies whether `mysql::bindings::php` should be included. Valid values are `true`, `false`. Default value: `false` -##### `python_enable` +##### `python_enable` -Data type: `Any` +Data type: `Boolean` Specifies whether `mysql::bindings::python` should be included. Valid values are `true`, `false`. Default value: `false` -##### `ruby_enable` +##### `ruby_enable` -Data type: `Any` +Data type: `Boolean` Specifies whether `mysql::bindings::ruby` should be included. Valid values are `true`, `false`. Default value: `false` -##### `client_dev` +##### `client_dev` -Data type: `Any` +Data type: `Boolean` Specifies whether `::mysql::bindings::client_dev` should be included. Valid values are `true`', `false`. Default value: `false` -##### `daemon_dev` +##### `daemon_dev` -Data type: `Any` +Data type: `Boolean` Specifies whether `::mysql::bindings::daemon_dev` should be included. Valid values are `true`, `false`. Default value: `false` -##### `java_package_ensure` +##### `java_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `java_enable => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `java_enable => true`. -Default value: $mysql::params::java_package_ensure +Default value: `$mysql::params::java_package_ensure` -##### `java_package_name` +##### `java_package_name` -Data type: `Any` +Data type: `String[1]` The name of the Java package to install. Only applies if `java_enable => true`. -Default value: $mysql::params::java_package_name +Default value: `$mysql::params::java_package_name` -##### `java_package_provider` +##### `java_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to install the Java package. Only applies if `java_enable => true`. -Default value: $mysql::params::java_package_provider +Default value: `$mysql::params::java_package_provider` -##### `perl_package_ensure` +##### `perl_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `perl_enable => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `perl_enable => true`. -Default value: $mysql::params::perl_package_ensure +Default value: `$mysql::params::perl_package_ensure` -##### `perl_package_name` +##### `perl_package_name` -Data type: `Any` +Data type: `String[1]` The name of the Perl package to install. Only applies if `perl_enable => true`. -Default value: $mysql::params::perl_package_name +Default value: `$mysql::params::perl_package_name` -##### `perl_package_provider` +##### `perl_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to install the Perl package. Only applies if `perl_enable => true`. -Default value: $mysql::params::perl_package_provider +Default value: `$mysql::params::perl_package_provider` -##### `php_package_ensure` +##### `php_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `php_enable => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `php_enable => true`. -Default value: $mysql::params::php_package_ensure +Default value: `$mysql::params::php_package_ensure` -##### `php_package_name` +##### `php_package_name` -Data type: `Any` +Data type: `String[1]` The name of the PHP package to install. Only applies if `php_enable => true`. -Default value: $mysql::params::php_package_name +Default value: `$mysql::params::php_package_name` -##### `php_package_provider` +##### `php_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to install the PHP package. Only applies if `php_enable => true`. -Default value: $mysql::params::php_package_provider +Default value: `$mysql::params::php_package_provider` -##### `python_package_ensure` +##### `python_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `python_enable => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `python_enable => true`. -Default value: $mysql::params::python_package_ensure +Default value: `$mysql::params::python_package_ensure` -##### `python_package_name` +##### `python_package_name` -Data type: `Any` +Data type: `String[1]` The name of the Python package to install. Only applies if `python_enable => true`. -Default value: $mysql::params::python_package_name +Default value: `$mysql::params::python_package_name` -##### `python_package_provider` +##### `python_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to install the Python package. Only applies if `python_enable => true`. -Default value: $mysql::params::python_package_provider +Default value: `$mysql::params::python_package_provider` -##### `ruby_package_ensure` +##### `ruby_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `ruby_enable => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `ruby_enable => true`. -Default value: $mysql::params::ruby_package_ensure +Default value: `$mysql::params::ruby_package_ensure` -##### `ruby_package_name` +##### `ruby_package_name` -Data type: `Any` +Data type: `String[1]` The name of the Ruby package to install. Only applies if `ruby_enable => true`. -Default value: $mysql::params::ruby_package_name +Default value: `$mysql::params::ruby_package_name` -##### `ruby_package_provider` +##### `ruby_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` What provider should be used to install the package. -Default value: $mysql::params::ruby_package_provider +Default value: `$mysql::params::ruby_package_provider` -##### `client_dev_package_ensure` +##### `client_dev_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `client_dev => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `client_dev => true`. -Default value: $mysql::params::client_dev_package_ensure +Default value: `$mysql::params::client_dev_package_ensure` -##### `client_dev_package_name` +##### `client_dev_package_name` -Data type: `Any` +Data type: `Optional[String[1]]` The name of the client_dev package to install. Only applies if `client_dev => true`. -Default value: $mysql::params::client_dev_package_name +Default value: `$mysql::params::client_dev_package_name` -##### `client_dev_package_provider` +##### `client_dev_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to install the client_dev package. Only applies if `client_dev => true`. -Default value: $mysql::params::client_dev_package_provider +Default value: `$mysql::params::client_dev_package_provider` -##### `daemon_dev_package_ensure` +##### `daemon_dev_package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `daemon_dev => true`. +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +Only applies if `daemon_dev => true`. -Default value: $mysql::params::daemon_dev_package_ensure +Default value: `$mysql::params::daemon_dev_package_ensure` -##### `daemon_dev_package_name` +##### `daemon_dev_package_name` -Data type: `Any` +Data type: `String[1]` The name of the daemon_dev package to install. Only applies if `daemon_dev => true`. -Default value: $mysql::params::daemon_dev_package_name +Default value: `$mysql::params::daemon_dev_package_name` -##### `daemon_dev_package_provider` +##### `daemon_dev_package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`. -Default value: $mysql::params::daemon_dev_package_provider +Default value: `$mysql::params::daemon_dev_package_provider` -### mysql::client +### `mysql::client` Installs and configures the MySQL client. @@ -338,49 +380,73 @@ class {'::mysql::client': #### Parameters -The following parameters are available in the `mysql::client` class. +The following parameters are available in the `mysql::client` class: -##### `bindings_enable` +* [`bindings_enable`](#-mysql--client--bindings_enable) +* [`install_options`](#-mysql--client--install_options) +* [`package_ensure`](#-mysql--client--package_ensure) +* [`package_manage`](#-mysql--client--package_manage) +* [`package_name`](#-mysql--client--package_name) +* [`package_provider`](#-mysql--client--package_provider) +* [`package_source`](#-mysql--client--package_source) -Data type: `Any` +##### `bindings_enable` + +Data type: `Boolean` Whether to automatically install all bindings. Valid values are `true`, `false`. Default to `false`. -Default value: $mysql::params::bindings_enable +Default value: `$mysql::params::bindings_enable` -##### `install_options` +##### `install_options` -Data type: `Any` +Data type: `Optional[Array[String[1]]]` Array of install options for managed package resources. You must pass the appropriate options for the package manager. Default value: `undef` -##### `package_ensure` +##### `package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` Whether the MySQL package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. -Default value: $mysql::params::client_package_ensure +Default value: `$mysql::params::client_package_ensure` -##### `package_manage` +##### `package_manage` -Data type: `Any` +Data type: `Boolean` Whether to manage the MySQL client package. Defaults to `true`. -Default value: $mysql::params::client_package_manage +Default value: `$mysql::params::client_package_manage` -##### `package_name` +##### `package_name` -Data type: `Any` +Data type: `String[1]` The name of the MySQL client package to install. -Default value: $mysql::params::client_package_name +Default value: `$mysql::params::client_package_name` + +##### `package_provider` + +Data type: `Optional[String[1]]` + +Specify the provider of the package. Optional. Valid value is a String. + +Default value: `undef` + +##### `package_source` + +Data type: `Optional[String[1]]` + +Specify the path to the package source. Optional. Valid value is a String + +Default value: `undef` -### mysql::server +### `mysql::server` Installs and configures the MySQL server. @@ -399,241 +465,344 @@ class { '::mysql::server': #### Parameters -The following parameters are available in the `mysql::server` class. +The following parameters are available in the `mysql::server` class: -##### `config_file` +* [`config_file`](#-mysql--server--config_file) +* [`config_file_mode`](#-mysql--server--config_file_mode) +* [`includedir`](#-mysql--server--includedir) +* [`install_options`](#-mysql--server--install_options) +* [`manage_config_file`](#-mysql--server--manage_config_file) +* [`options`](#-mysql--server--options) +* [`override_options`](#-mysql--server--override_options) +* [`package_ensure`](#-mysql--server--package_ensure) +* [`package_manage`](#-mysql--server--package_manage) +* [`package_name`](#-mysql--server--package_name) +* [`package_provider`](#-mysql--server--package_provider) +* [`package_source`](#-mysql--server--package_source) +* [`purge_conf_dir`](#-mysql--server--purge_conf_dir) +* [`remove_default_accounts`](#-mysql--server--remove_default_accounts) +* [`restart`](#-mysql--server--restart) +* [`root_group`](#-mysql--server--root_group) +* [`managed_dirs`](#-mysql--server--managed_dirs) +* [`mysql_group`](#-mysql--server--mysql_group) +* [`mycnf_owner`](#-mysql--server--mycnf_owner) +* [`mycnf_group`](#-mysql--server--mycnf_group) +* [`root_password`](#-mysql--server--root_password) +* [`service_enabled`](#-mysql--server--service_enabled) +* [`service_manage`](#-mysql--server--service_manage) +* [`service_name`](#-mysql--server--service_name) +* [`service_provider`](#-mysql--server--service_provider) +* [`create_root_user`](#-mysql--server--create_root_user) +* [`create_root_my_cnf`](#-mysql--server--create_root_my_cnf) +* [`create_root_login_file`](#-mysql--server--create_root_login_file) +* [`login_file`](#-mysql--server--login_file) +* [`users`](#-mysql--server--users) +* [`grants`](#-mysql--server--grants) +* [`databases`](#-mysql--server--databases) +* [`reload_on_config_change`](#-mysql--server--reload_on_config_change) +* [`enabled`](#-mysql--server--enabled) +* [`manage_service`](#-mysql--server--manage_service) +* [`old_root_password`](#-mysql--server--old_root_password) -Data type: `Any` +##### `config_file` + +Data type: `String[1]` The location, as a path, of the MySQL configuration file. -Default value: $mysql::params::config_file +Default value: `$mysql::params::config_file` -##### `includedir` +##### `config_file_mode` -Data type: `Any` +Data type: `String[1]` + +The MySQL configuration file's permissions mode. + +Default value: `'0644'` + +##### `includedir` + +Data type: `Optional[String]` The location, as a path, of !includedir for custom configuration overrides. -Default value: $mysql::params::includedir +Default value: `$mysql::params::includedir` -##### `install_options` +##### `install_options` -Data type: `Any` +Data type: `Optional[Array[String[1]]]` Passes [install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) array to managed package resources. You must pass the appropriate options for the specified package manager Default value: `undef` -##### `install_secret_file` +##### `manage_config_file` -Data type: `Any` +Data type: `Variant[Boolean, String[1]]` -Path to secret file containing temporary root password. +Whether the MySQL configuration file should be managed. Valid values are `true`, `false`. Defaults to `true`. -Default value: $mysql::params::install_secret_file +Default value: `true` -##### `manage_config_file` +##### `options` -Data type: `Any` +Data type: `Mysql::Options` -Whether the MySQL configuration file should be managed. Valid values are `true`, `false`. Defaults to `true`. +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. -Default value: $mysql::params::manage_config_file +Default value: `{}` -##### `override_options` +##### `override_options` -Data type: `Any` +Data type: `Hash` Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file: See above for usage details. -Default value: {} +Default value: `{}` -##### `package_ensure` +##### `package_ensure` -Data type: `Any` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` Whether the package exists or should be a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Defaults to 'present'. -Default value: $mysql::params::server_package_ensure +Default value: `'present'` -##### `package_manage` +##### `package_manage` -Data type: `Any` +Data type: `Boolean` Whether to manage the MySQL server package. Defaults to `true`. -Default value: $mysql::params::server_package_manage +Default value: `true` -##### `package_name` +##### `package_name` -Data type: `Any` +Data type: `String[1]` The name of the MySQL server package to install. -Default value: $mysql::params::server_package_name +Default value: `$mysql::params::server_package_name` -##### `purge_conf_dir` +##### `package_provider` -Data type: `Any` +Data type: `Optional[String[1]]` + +Define a specific provider for package install. + +Default value: `undef` + +##### `package_source` + +Data type: `Optional[String[1]]` + +The location of the package source (require for some package provider) + +Default value: `undef` + +##### `purge_conf_dir` + +Data type: `Variant[Boolean, String[1]]` Whether the `includedir` directory should be purged. Valid values are `true`, `false`. Defaults to `false`. -Default value: $mysql::params::purge_conf_dir +Default value: `false` -##### `remove_default_accounts` +##### `remove_default_accounts` -Data type: `Any` +Data type: `Variant[Boolean, String[1]]` Specifies whether to automatically include `mysql::server::account_security`. Valid values are `true`, `false`. Defaults to `false`. Default value: `false` -##### `restart` +##### `restart` -Data type: `Any` +Data type: `Variant[Boolean, String[1]]` Whether the service should be restarted when things change. Valid values are `true`, `false`. Defaults to `false`. -Default value: $mysql::params::restart +Default value: `false` -##### `root_group` +##### `root_group` -Data type: `Any` +Data type: `String[1]` The name of the group used for root. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). -Default value: $mysql::params::root_group +Default value: `$mysql::params::root_group` -##### `mysql_group` +##### `managed_dirs` -Data type: `Any` +Data type: `Optional[Array[String[1]]]` + +An array containing all directories to be managed. + +Default value: `$mysql::params::managed_dirs` + +##### `mysql_group` + +Data type: `String[1]` The name of the group of the MySQL daemon user. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). -Default value: $mysql::params::mysql_group +Default value: `$mysql::params::mysql_group` -##### `root_password` +##### `mycnf_owner` -Data type: `Any` +Data type: `Optional[String[1]]` -The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. This is required if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. +Name or user-id who owns the mysql-config-file. -Default value: $mysql::params::root_password +Default value: `undef` -##### `service_enabled` +##### `mycnf_group` -Data type: `Any` +Data type: `Optional[String[1]]` + +Name or group-id which owns the mysql-config-file. + +Default value: `undef` + +##### `root_password` + +Data type: `Variant[String, Sensitive[String]]` + +The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. This is required +if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and +`create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. +Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old +password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. + +Default value: `'UNSET'` + +##### `service_enabled` + +Data type: `Variant[Boolean, String[1]]` Specifies whether the service should be enabled. Valid values are `true`, `false`. Defaults to `true`. -Default value: $mysql::params::server_service_enabled +Default value: `true` -##### `service_manage` +##### `service_manage` -Data type: `Any` +Data type: `Variant[Boolean, String[1]]` Specifies whether the service should be managed. Valid values are `true`, `false`. Defaults to `true`. -Default value: $mysql::params::server_service_manage +Default value: `true` -##### `service_name` +##### `service_name` -Data type: `Any` +Data type: `String[1]` The name of the MySQL server service. Defaults are OS dependent, defined in 'params.pp'. -Default value: $mysql::params::server_service_name +Default value: `$mysql::params::server_service_name` -##### `service_provider` +##### `service_provider` -Data type: `Any` +Data type: `Optional[String[1]]` The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. -Default value: $mysql::params::server_service_provider +Default value: `$mysql::params::server_service_provider` -##### `create_root_user` +##### `create_root_user` -Data type: `Any` +Data type: `Boolean` -Whether root user should be created. Valid values are `true`, `false`. Defaults to `true`. This is useful for a cluster setup with Galera. The root user has to be created only once. You can set this parameter true on one node and set it to false on the remaining nodes. +Whether root user should be created. Valid values are `true`, `false`. Defaults to `true`. +This is useful for a cluster setup with Galera. The root user has to be created only once. +You can set this parameter true on one node and set it to false on the remaining nodes. -Default value: $mysql::params::create_root_user +Default value: `true` -##### `create_root_my_cnf` +##### `create_root_my_cnf` -Data type: `Any` +Data type: `Boolean` -Whether to create `/root/.my.cnf`. Valid values are `true`, `false`. Defaults to `true`. `create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. +Whether to create `/root/.my.cnf`. Valid values are `true`, `false`. Defaults to `true`. +`create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. +You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. -Default value: $mysql::params::create_root_my_cnf +Default value: `true` -##### `users` +##### `create_root_login_file` -Data type: `Any` +Data type: `Boolean` -Optional hash of users to create, which are passed to [mysql_user](#mysql_user). +Whether to create a login file for root. Valid values are 'true', 'false'. -Default value: {} +Default value: `false` -##### `grants` +##### `login_file` -Data type: `Any` +Data type: `Optional[String[1]]` -Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). +Specify the login file. -Default value: {} +Default value: `undef` -##### `databases` +##### `users` -Data type: `Any` +Data type: `Hash` -Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). +Optional hash of users to create, which are passed to [mysql_user](#mysql_user). -Default value: {} +Default value: `{}` -##### `enabled` +##### `grants` -Data type: `Any` +Data type: `Hash` -_Deprecated_ +Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). -Default value: `undef` +Default value: `{}` -##### `manage_service` +##### `databases` -Data type: `Any` +Data type: `Hash` -_Deprecated_ +Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). -Default value: `undef` +Default value: `{}` -##### `old_root_password` +##### `reload_on_config_change` -Data type: `Any` +Data type: `Boolean` -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. +By default, a my.cnf change won't reload/restart the database. Turn this flag to true to enable it -Default value: `undef` +Default value: `false` -##### `create_root_login_file` +##### `enabled` -Data type: `Any` +Data type: `Optional[Variant[String[1], Boolean]]` +_Deprecated_ +Default value: `undef` -Default value: $mysql::params::create_root_login_file +##### `manage_service` -##### `login_file` +Data type: `Optional[Variant[String[1], Boolean]]` -Data type: `Any` +_Deprecated_ + +Default value: `undef` + +##### `old_root_password` +Data type: `Optional[Variant[String, Sensitive[String]]]` +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. -Default value: $mysql::params::login_file +Default value: `undef` -### mysql::server::backup +### `mysql::server::backup` Create and manage a MySQL backup. @@ -643,270 +812,312 @@ Create and manage a MySQL backup. ```puppet class { 'mysql::server': - root_password => 'password' + root_password => 'password' } class { 'mysql::server::backup': - backupuser => 'myuser', - backuppassword => 'mypassword', - backupdir => '/tmp/backups', + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', +} +``` + +##### Create a basic MySQL backup using mariabackup: + +```puppet +class { 'mysql::server': + root_password => 'password' +} +class { 'mysql::server::backup': + backupmethod => 'mariabackup', + backupmethod_package => 'mariadb-backup' + provider => 'xtrabackup', + backupdir => '/tmp/backups', } ``` #### Parameters -The following parameters are available in the `mysql::server::backup` class. +The following parameters are available in the `mysql::server::backup` class: -##### `backupuser` +* [`backupuser`](#-mysql--server--backup--backupuser) +* [`backuppassword`](#-mysql--server--backup--backuppassword) +* [`backupdir`](#-mysql--server--backup--backupdir) +* [`backupdirmode`](#-mysql--server--backup--backupdirmode) +* [`backupdirowner`](#-mysql--server--backup--backupdirowner) +* [`backupdirgroup`](#-mysql--server--backup--backupdirgroup) +* [`backupcompress`](#-mysql--server--backup--backupcompress) +* [`backupmethod`](#-mysql--server--backup--backupmethod) +* [`backup_success_file_path`](#-mysql--server--backup--backup_success_file_path) +* [`backuprotate`](#-mysql--server--backup--backuprotate) +* [`ignore_events`](#-mysql--server--backup--ignore_events) +* [`delete_before_dump`](#-mysql--server--backup--delete_before_dump) +* [`backupdatabases`](#-mysql--server--backup--backupdatabases) +* [`file_per_database`](#-mysql--server--backup--file_per_database) +* [`include_routines`](#-mysql--server--backup--include_routines) +* [`include_triggers`](#-mysql--server--backup--include_triggers) +* [`incremental_backups`](#-mysql--server--backup--incremental_backups) +* [`ensure`](#-mysql--server--backup--ensure) +* [`time`](#-mysql--server--backup--time) +* [`prescript`](#-mysql--server--backup--prescript) +* [`postscript`](#-mysql--server--backup--postscript) +* [`execpath`](#-mysql--server--backup--execpath) +* [`provider`](#-mysql--server--backup--provider) +* [`maxallowedpacket`](#-mysql--server--backup--maxallowedpacket) +* [`optional_args`](#-mysql--server--backup--optional_args) +* [`install_cron`](#-mysql--server--backup--install_cron) +* [`compression_command`](#-mysql--server--backup--compression_command) +* [`compression_extension`](#-mysql--server--backup--compression_extension) +* [`backupmethod_package`](#-mysql--server--backup--backupmethod_package) +* [`excludedatabases`](#-mysql--server--backup--excludedatabases) -Data type: `Any` +##### `backupuser` -MySQL user with backup administrator privileges. +Data type: `Optional[String[1]]` + +MySQL user to create with backup administrator privileges. Default value: `undef` -##### `backuppassword` +##### `backuppassword` -Data type: `Any` +Data type: `Optional[Variant[String, Sensitive[String]]]` -Password for `backupuser`. +Password to create for `backupuser`. Default value: `undef` -##### `backupdir` +##### `backupdir` -Data type: `Any` +Data type: `Optional[String[1]]` Directory to store backup. Default value: `undef` -##### `backupdirmode` +##### `backupdirmode` -Data type: `Any` +Data type: `String[1]` Permissions applied to the backup directory. This parameter is passed directly to the file resource. -Default value: '0700' +Default value: `'0700'` -##### `backupdirowner` +##### `backupdirowner` -Data type: `Any` +Data type: `String[1]` Owner for the backup directory. This parameter is passed directly to the file resource. -Default value: 'root' +Default value: `'root'` -##### `backupdirgroup` +##### `backupdirgroup` -Data type: `Any` +Data type: `String[1]` Group owner for the backup directory. This parameter is passed directly to the file resource. -Default value: 'root' +Default value: `$mysql::params::root_group` -##### `backupcompress` +##### `backupcompress` -Data type: `Any` +Data type: `Boolean` -Whether or not to compress the backup (when using the mysqldump provider) +Whether or not to compress the backup (when using the mysqldump or xtrabackup provider) Default value: `true` -##### `backuprotate` +##### `backupmethod` -Data type: `Any` +Data type: `Optional[String[1]]` + +The execution binary for backing up. ex. mysqldump, xtrabackup, mariabackup + +Default value: `undef` + +##### `backup_success_file_path` + +Data type: `String[1]` + +Specify a path where upon successfull backup a file should be created for checking purposes. + +Default value: `'/tmp/mysqlbackup_success'` + +##### `backuprotate` + +Data type: `Variant[String[1], Integer]` Backup rotation interval in 24 hour periods. -Default value: 30 +Default value: `30` -##### `ignore_events` +##### `ignore_events` -Data type: `Any` +Data type: `Boolean` Ignore the mysql.event table. Default value: `true` -##### `delete_before_dump` +##### `delete_before_dump` -Data type: `Any` +Data type: `Boolean` -Whether to delete old .sql files before backing up. Setting to true deletes old files before backing up, while setting to false deletes them after backup. +Whether to delete old .sql files before backing up. +Setting to true deletes old files before backing up, while setting to false deletes them after backup. Default value: `false` -##### `backupdatabases` +##### `backupdatabases` -Data type: `Any` +Data type: `Array[String[1]]` -Databases to backup (if using xtrabackup provider). +Databases to backup (required if using xtrabackup provider). By default `[]` will back up all databases. -Default value: [] +Default value: `[]` -##### `file_per_database` +##### `file_per_database` -Data type: `Any` +Data type: `Boolean` Use file per database mode creating one file per database backup. Default value: `false` -##### `include_routines` +##### `include_routines` -Data type: `Any` +Data type: `Boolean` Dump stored routines (procedures and functions) from dumped databases when doing a `file_per_database` backup. Default value: `false` -##### `include_triggers` +##### `include_triggers` -Data type: `Any` +Data type: `Boolean` Dump triggers for each dumped table when doing a `file_per_database` backup. Default value: `false` -##### `ensure` +##### `incremental_backups` -Data type: `Any` +Data type: `Boolean` +A flag to activate/deactivate incremental backups. Currently only supported by the xtrabackup provider. +Default value: `true` -Default value: 'present' +##### `ensure` -##### `time` +Data type: `Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]` -Data type: `Any` + + +Default value: `'present'` + +##### `time` + +Data type: `Variant[Array[String[1]], Array[Integer]]` An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05) or ['3', '45'] (i.e., 03:45) for HH:MM times. -Default value: ['23', '5'] +Default value: `['23', '5']` -##### `prescript` +##### `prescript` -Data type: `Any` +Data type: `Variant[Boolean, String[1], Array[String[1]]]` A script that is executed before the backup begins. Default value: `false` -##### `postscript` +##### `postscript` -Data type: `Any` +Data type: `Variant[Boolean, String[1], Array[String[1]]]` -A script that is executed when the backup is finished. This could be used to sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files. +A script that is executed when the backup is finished. This could be used to sync the backup to a central store. +This script can be either a single line that is directly executed or a number of lines supplied as an array. +It could also be one or more externally managed (executable) files. Default value: `false` -##### `execpath` +##### `execpath` -Data type: `Any` +Data type: `String[1]` Allows you to set a custom PATH should your MySQL installation be non-standard places. Defaults to `/usr/bin:/usr/sbin:/bin:/sbin`. -Default value: '/usr/bin:/usr/sbin:/bin:/sbin' +Default value: `'/usr/bin:/usr/sbin:/bin:/sbin'` -##### `provider` +##### `provider` -Data type: `Any` +Data type: `Enum['xtrabackup', 'mysqldump', 'mysqlbackup']` -Sets the server backup implementation. Valid values are: +Sets the server backup implementation. Valid values are: xtrabackup, mysqldump, mysqlbackup -Default value: 'mysqldump' +Default value: `'mysqldump'` -##### `maxallowedpacket` +##### `maxallowedpacket` -Data type: `Any` +Data type: `String[1]` Defines the maximum SQL statement size for the backup dump script. The default value is 1MB, as this is the default MySQL Server value. -Default value: '1M' +Default value: `'1M'` -##### `optional_args` - -Data type: `Any` +##### `optional_args` -Specifies an array of optional arguments which should be passed through to the backup tool. (Supported by the xtrabackup and mysqldump providers.) +Data type: `Array[String[1]]` -Default value: [] +Specifies an array of optional arguments which should be passed through to the backup tool. +(Supported by the xtrabackup and mysqldump providers.) -### mysql::server::monitor - -This is a helper class to add a monitoring user to the database - -#### Parameters +Default value: `[]` -The following parameters are available in the `mysql::server::monitor` class. +##### `install_cron` -##### `mysql_monitor_username` +Data type: `Boolean` -Data type: `Any` - -The username to create for MySQL monitoring. - -Default value: '' - -##### `mysql_monitor_password` - -Data type: `Any` +Manage installation of cron package -The password to create for MySQL monitoring. - -Default value: '' - -##### `mysql_monitor_hostname` - -Data type: `Any` - -The hostname from which the monitoring user requests are allowed access. - -Default value: '' - -### mysql::server::mysqltuner - -Manage the MySQLTuner package. - -#### Parameters - -The following parameters are available in the `mysql::server::mysqltuner` class. +Default value: `true` -##### `ensure` +##### `compression_command` -Data type: `Any` +Data type: `Optional[String[1]]` -Ensures that the resource exists. Valid values are 'present', 'absent'. Defaults to 'present'. +Configure the command used to compress the backup (when using the mysqldump provider). Make sure the command exists +on the target system. Packages for it are NOT automatically installed. -Default value: 'present' +Default value: `undef` -##### `version` +##### `compression_extension` -Data type: `Any` +Data type: `Optional[String[1]]` -The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'. +Configure the file extension for the compressed backup (when using the mysqldump provider) -Default value: 'v1.3.0' +Default value: `undef` -##### `source` +##### `backupmethod_package` -Data type: `Any` +Data type: `String[1]` -Source path for the mysqltuner package. +The package which provides the binary specified by the backupmethod parameter. -Default value: `undef` +Default value: `$mysql::params::xtrabackup_package_name` -##### `tuner_location` +##### `excludedatabases` -Data type: `Any` +Data type: `Array[String]` -Destination for the mysqltuner package. +Give a list of excluded databases when using file_per_database, e.g.: [ 'information_schema', 'performance_schema' ] -Default value: '/usr/local/bin/mysqltuner' +Default value: `[]` ## Defined types -### mysql::db +### `mysql::db` Create and configure a MySQL database. @@ -925,127 +1136,152 @@ mysql::db { 'mydb': #### Parameters -The following parameters are available in the `mysql::db` defined type. +The following parameters are available in the `mysql::db` defined type: -##### `user` +* [`name`](#-mysql--db--name) +* [`user`](#-mysql--db--user) +* [`password`](#-mysql--db--password) +* [`tls_options`](#-mysql--db--tls_options) +* [`dbname`](#-mysql--db--dbname) +* [`charset`](#-mysql--db--charset) +* [`collate`](#-mysql--db--collate) +* [`host`](#-mysql--db--host) +* [`grant`](#-mysql--db--grant) +* [`grant_options`](#-mysql--db--grant_options) +* [`sql`](#-mysql--db--sql) +* [`enforce_sql`](#-mysql--db--enforce_sql) +* [`ensure`](#-mysql--db--ensure) +* [`import_timeout`](#-mysql--db--import_timeout) +* [`import_cat_cmd`](#-mysql--db--import_cat_cmd) +* [`mysql_exec_path`](#-mysql--db--mysql_exec_path) + +##### `name` + +The name of the database to create. Database names must: + * be longer than 64 characters. + * not contain / \ or . characters. + * not contain characters that are not permitted in file names. + * not end with space characters. -Data type: `Any` +##### `user` + +Data type: `String[1]` The user for the database you're creating. -##### `password` +##### `password` -Data type: `Any` +Data type: `Variant[String, Sensitive[String]]` The password for $user for the database you're creating. -##### `tls_options` +##### `tls_options` -Data type: `Any` +Data type: `Optional[Array[String[1]]]` The tls_options for $user for the database you're creating. Default value: `undef` -##### `dbname` +##### `dbname` -Data type: `Any` +Data type: `String` The name of the database to create. -Default value: $name +Default value: `$name` -##### `charset` +##### `charset` -Data type: `Any` +Data type: `String[1]` -The character set for the database. +The character set for the database. Must have the same value as collate to avoid corrective changes. See https://dev.mysql.com/doc/refman/8.0/en/charset-mysql.html for charset and collation pairs. -Default value: 'utf8' +Default value: `'utf8'` -##### `collate` +##### `collate` -Data type: `Any` +Data type: `String[1]` -The collation for the database. +The collation for the database. Must have the same value as charset to avoid corrective changes. See https://dev.mysql.com/doc/refman/8.0/en/charset-mysql.html for charset and collation pairs. -Default value: 'utf8_general_ci' +Default value: `'utf8_general_ci'` -##### `host` +##### `host` -Data type: `Any` +Data type: `String[1]` The host to use as part of user@host for grants. -Default value: 'localhost' +Default value: `'localhost'` -##### `grant` +##### `grant` -Data type: `Any` +Data type: `Variant[String[1], Array[String[1]]]` The privileges to be granted for user@host on the database. -Default value: 'ALL' +Default value: `'ALL'` -##### `grant_options` +##### `grant_options` -Data type: `Any` +Data type: `Optional[Variant[String[1], Array[String[1]]]]` The grant_options for the grant for user@host on the database. Default value: `undef` -##### `sql` +##### `sql` -Data type: `Optional[Variant[Array, Hash, String]]` +Data type: `Optional[Array]` -The path to the sqlfile you want to execute. This can be single file specified as string, or it can be an array of strings. +The path to the sqlfile you want to execute. This can be an array containing one or more file paths. Default value: `undef` -##### `enforce_sql` +##### `enforce_sql` -Data type: `Any` +Data type: `Boolean` Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. Default value: `false` -##### `ensure` +##### `ensure` Data type: `Enum['absent', 'present']` Specifies whether to create the database. Valid values are 'present', 'absent'. Defaults to 'present'. -Default value: 'present' +Default value: `'present'` -##### `import_timeout` +##### `import_timeout` -Data type: `Any` +Data type: `Integer` Timeout, in seconds, for loading the sqlfiles. Defaults to 300. -Default value: 300 +Default value: `300` -##### `import_cat_cmd` +##### `import_cat_cmd` -Data type: `Any` +Data type: `Enum['cat', 'zcat', 'bzcat']` Command to read the sqlfile for importing the database. Useful for compressed sqlfiles. For example, you can use 'zcat' for .gz files. -Default value: 'cat' +Default value: `'cat'` -##### `mysql_exec_path` - -Data type: `Any` +##### `mysql_exec_path` +Data type: `Optional[String]` +Specify the path in which mysql has been installed if done in the non-standard bin/sbin path. -Default value: $mysql::params::exec_path +Default value: `undef` ## Resource types -### mysql_grant +### `mysql_grant` @summary Manage a MySQL user's rights. @@ -1056,11 +1292,15 @@ The following properties are available i ##### `ensure` -Valid values: present, absent +Valid values: `present`, `absent` The basic property that the resource should be in. -Default value: present +Default value: `present` + +##### `options` + +Options to grant. ##### `privileges` @@ -1068,7 +1308,7 @@ Privileges for user ##### `table` -Valid values: %r{.*\..*}, %r{^[0-9a-zA-Z$_]*@[\w%\.:\-/]*$} +Valid values: `%r{.*\..*}`, `%r{^[0-9a-zA-Z$_]*@[\w%.:\-/]*$}` Table to apply privileges to. @@ -1076,21 +1316,122 @@ Table to apply privileges to. User to operate on. -##### `options` - -Options to grant. - #### Parameters The following parameters are available in the `mysql_grant` type. -##### `name` +* [`name`](#-mysql_grant--name) +* [`provider`](#-mysql_grant--provider) + +##### `name` namevar Name to describe the grant. -### mysql_plugin +##### `provider` + +The specific backend to use for this `mysql_grant` resource. You will seldom need to specify this --- Puppet will +usually discover the appropriate provider for your platform. + +### `mysql_login_path` + +This type provides Puppet with the capabilities to store authentication credentials in an obfuscated login path file +named .mylogin.cnf created with the mysql_config_editor utility. Supports only MySQL Community Edition > v5.6.6. + +* **See also** + * https://dev.mysql.com/doc/refman/8.0/en/mysql-config-editor.html + +#### Examples + +##### + +```puppet +mysql_login_path { 'local_socket': + owner => 'root', + host => 'localhost', + user => 'root', + password => Sensitive('secure'), + socket => '/var/run/mysql/mysql.sock', + ensure => present, +} + +mysql_login_path { 'local_tcp': + owner => 'root', + host => '127.0.0.1', + user => 'root', + password => Sensitive('more_secure'), + port => 3306, + ensure => present, +} +``` + +#### Properties + +The following properties are available in the `mysql_login_path` type. + +##### `ensure` + +Data type: `Enum[present, absent]` + +Whether this resource should be present or absent on the target system. + +##### `host` + +Data type: `Optional[String]` + +Host name to be entered into the login path. + +##### `password` + +Data type: `Optional[Sensitive[String[1]]]` + +Password to be entered into login path + +##### `port` + +Data type: `Optional[Integer[0,65535]]` + +Port number to be entered into login path. + +##### `socket` + +Data type: `Optional[String]` + +Socket path to be entered into login path + +##### `user` + +Data type: `Optional[String]` + +Username to be entered into the login path. + +#### Parameters + +The following parameters are available in the `mysql_login_path` type. + +* [`name`](#-mysql_login_path--name) +* [`owner`](#-mysql_login_path--owner) + +##### `name` + +namevar + +Data type: `String` + +Name of the login path you want to manage. + +##### `owner` + +namevar + +Data type: `String` + +The user to whom the logon path should belong. + +Default value: `root` + +### `mysql_plugin` Manage MySQL plugins. @@ -1110,15 +1451,15 @@ The following properties are available i ##### `ensure` -Valid values: present, absent +Valid values: `present`, `absent` The basic property that the resource should be in. -Default value: present +Default value: `present` ##### `soname` -Valid values: %r{^\w+\.\w+$} +Valid values: `%r{^\w+\.\w+$}` The name of the library @@ -1126,13 +1467,21 @@ The name of the library The following parameters are available in the `mysql_plugin` type. -##### `name` +* [`name`](#-mysql_plugin--name) +* [`provider`](#-mysql_plugin--provider) + +##### `name` namevar The name of the MySQL plugin to manage. -### mysql_user +##### `provider` + +The specific backend to use for this `mysql_plugin` resource. You will seldom need to specify this --- Puppet will +usually discover the appropriate provider for your platform. + +### `mysql_user` @summary Manage a MySQL user. This includes management of users password as well as privileges. @@ -1143,47 +1492,47 @@ The following properties are available i ##### `ensure` -Valid values: present, absent +Valid values: `present`, `absent` The basic property that the resource should be in. -Default value: present +Default value: `present` -##### `password_hash` +##### `max_connections_per_hour` -Valid values: %r{\w*} +Valid values: `%r{\d+}` -The password hash of the user. Use mysql_password() for creating such a hash. +Max connections per hour for the user. 0 means no (or global) limit. -##### `plugin` +##### `max_queries_per_hour` -Valid values: %r{\w+} +Valid values: `%r{\d+}` -The authentication plugin of the user. +Max queries per hour for the user. 0 means no (or global) limit. -##### `max_user_connections` +##### `max_updates_per_hour` -Valid values: %r{\d+} +Valid values: `%r{\d+}` -Max concurrent connections for the user. 0 means no (or global) limit. +Max updates per hour for the user. 0 means no (or global) limit. -##### `max_connections_per_hour` +##### `max_user_connections` -Valid values: %r{\d+} +Valid values: `%r{\d+}` -Max connections per hour for the user. 0 means no (or global) limit. +Max concurrent connections for the user. 0 means no (or global) limit. -##### `max_queries_per_hour` +##### `password_hash` -Valid values: %r{\d+} +Valid values: `%r{\w*}` -Max queries per hour for the user. 0 means no (or global) limit. +The password hash of the user. Use mysql::password() for creating such a hash. -##### `max_updates_per_hour` +##### `plugin` -Valid values: %r{\d+} +Valid values: `%r{\w+}` -Max updates per hour for the user. 0 means no (or global) limit. +The authentication plugin of the user. ##### `tls_options` @@ -1193,34 +1542,95 @@ Options to that set the TLS-related REQU The following parameters are available in the `mysql_user` type. -##### `name` +* [`name`](#-mysql_user--name) +* [`provider`](#-mysql_user--provider) + +##### `name` namevar The name of the user. This uses the 'username@hostname' or username@hostname. +##### `provider` + +The specific backend to use for this `mysql_user` resource. You will seldom need to specify this --- Puppet will usually +discover the appropriate provider for your platform. + ## Functions -### mysql::password +### `mysql::normalise_and_deepmerge` + +Type: Ruby 4.x API + +- When there is a duplicate key that is a hash, they are recursively merged. +- When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." +- When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), the rightmost style will win. + +#### Examples + +##### + +```puppet +$hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } } +$hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } } +$merged_hash = mysql::normalise_and_deepmerge($hash1, $hash2) +# The resulting hash is equivalent to: +# $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } +``` + +#### `mysql::normalise_and_deepmerge(Any *$args)` + +- When there is a duplicate key that is a hash, they are recursively merged. +- When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." +- When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), the rightmost style will win. + +Returns: `Any` hash +The given hash normalised + +##### Examples + +###### + +```puppet +$hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } } +$hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } } +$merged_hash = mysql::normalise_and_deepmerge($hash1, $hash2) +# The resulting hash is equivalent to: +# $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } +``` + +##### `*args` + +Data type: `Any` + +Hash to be normalised + +### `mysql::password` Type: Ruby 4.x API Hash a string as mysql's "PASSWORD()" function would do it -#### `mysql::password(String $password)` +#### `mysql::password(Variant[String, Sensitive[String]] $password, Optional[Boolean] $sensitive)` -The mysql::password function. +Hash a string as mysql's "PASSWORD()" function would do it -Returns: `String` hash +Returns: `Variant[String, Sensitive[String]]` hash The mysql password hash from the clear text password. ##### `password` -Data type: `String` +Data type: `Variant[String, Sensitive[String]]` Plain text password. -### mysql::strip_hash +##### `sensitive` + +Data type: `Optional[Boolean]` + +If the mysql password hash should be of datatype Sensitive[String] + +### `mysql::strip_hash` Type: Ruby 4.x API @@ -1239,27 +1649,41 @@ Data type: `Hash` Hash to be stripped -### mysql_password +### `mysql_password` -Type: Ruby 3.x API +Type: Ruby 4.x API -Hash a string as mysql's "PASSWORD()" function would do it +DEPRECATED. Use the namespaced function [`mysql::password`](#mysqlpassword) instead. -#### `mysql_password(String $password)` +#### `mysql_password(Variant[String, Sensitive[String]] $password, Optional[Boolean] $sensitive)` The mysql_password function. -Returns: `String` the mysql password hash from the clear text password. +Returns: `Variant[String, Sensitive[String]]` The mysql password hash from the 4.x function mysql::password. ##### `password` -Data type: `String` +Data type: `Variant[String, Sensitive[String]]` Plain text password. +##### `sensitive` + +Data type: `Optional[Boolean]` + +If the mysql password hash should be of datatype Sensitive[String] + +## Data types + +### `Mysql::Options` + +Use this if you don’t want your options merged with the default options. + +Alias of `Hash[String, Hash]` + ## Tasks -### export +### `export` Allows you to backup your database to local file. @@ -1291,7 +1715,7 @@ Data type: `String[1]` Path to file you want backup to -### sql +### `sql` Allows you to execute arbitary SQL diff -pruN 8.1.0-7/Rakefile 15.0.0-3/Rakefile --- 8.1.0-7/Rakefile 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/Rakefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-syntax/tasks/puppet-syntax' -require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? -require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? -require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any? -require 'puppet_pot_generator/rake_tasks' - -def changelog_user - return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = nil || JSON.load(File.read('metadata.json'))['author'] - raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? - puts "GitHubChangelogGenerator user:#{returnVal}" - returnVal -end - -def changelog_project - return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = nil || JSON.load(File.read('metadata.json'))['name'] - raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? - puts "GitHubChangelogGenerator project:#{returnVal}" - returnVal -end - -def changelog_future_release - return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version'] - raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? - puts "GitHubChangelogGenerator future_release:#{returnVal}" - returnVal -end - -PuppetLint.configuration.send('disable_relative') - -if Bundler.rubygems.find_name('github_changelog_generator').any? - GitHubChangelogGenerator::RakeTask.new :changelog do |config| - raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? - config.user = "#{changelog_user}" - config.project = "#{changelog_project}" - config.future_release = "#{changelog_future_release}" - config.exclude_labels = ['maintenance'] - config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." - config.add_pr_wo_labels = true - config.issues = false - config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" - config.configure_sections = { - "Changed" => { - "prefix" => "### Changed", - "labels" => ["backwards-incompatible"], - }, - "Added" => { - "prefix" => "### Added", - "labels" => ["feature", "enhancement"], - }, - "Fixed" => { - "prefix" => "### Fixed", - "labels" => ["bugfix"], - }, - } - end -else - desc 'Generate a Changelog from GitHub' - task :changelog do - raise <= Gem::Version.new('2.2.2')" -EOM - end -end - diff -pruN 8.1.0-7/checksums.json 15.0.0-3/checksums.json --- 8.1.0-7/checksums.json 2019-04-03 12:49:55.000000000 +0000 +++ 15.0.0-3/checksums.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -{ - "CHANGELOG.md": "e6d2bbbfff997fa081a8663a44b9d769", - "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", - "Gemfile": "4f7f09c68dcb8976fcf410726373a72c", - "HISTORY.md": "202fb76908e67e272549113e70da44a9", - "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", - "MAINTAINERS.md": "d1a8a0cb1736b23f3143b685e0d034b0", - "NOTICE": "61151e454f47a0df587642c792385533", - "README.md": "9893833ed69476a420e520ef23f838e5", - "REFERENCE.md": "6a3b55e40333af7dda3008bbdf0901f8", - "Rakefile": "6fb1d589ccbf158b96a29cf1e38372a6", - "TODO": "88ca4024a37992b46c34cb46e4ac39e6", - "examples/backup.pp": "a61c6f34f153a323209faf25948737f5", - "examples/bindings.pp": "35a8387f5c55fa2e479c513a67918674", - "examples/java.pp": "0ad9de4f9f2c049642bcf08124757085", - "examples/mysql_database.pp": "107ee8793f7b4a12cfca32eddccc6bbd", - "examples/mysql_db.pp": "55d2d603f9fb8ab3c8a781d08119aa69", - "examples/mysql_grant.pp": "cd42336a6c7b2d27f5d5d6d0e310ee1a", - "examples/mysql_plugin.pp": "3be416bd610ccc563517c1378c726463", - "examples/mysql_user.pp": "ec5182bfb57a9e7a8ba44ad8aff82ac9", - "examples/perl.pp": "454f14dc4492fcf04afbe81b2776917e", - "examples/python.pp": "355a7e1ea3978a8fd290b5bc28b63808", - "examples/ruby.pp": "a6ae0381aacc5a8d2c403e606c6df0f0", - "examples/server/account_security.pp": "375442b7886c01b42fbf75a1fcb31822", - "examples/server/config.pp": "659b7c40e9b55634721b3c33a8c6da98", - "examples/server.pp": "72e22552a95b9a5e4a349dbfc13639dc", - "lib/facter/mysql_server_id.rb": "8074e28063136191d064de5bbd23d823", - "lib/facter/mysql_version.rb": "9e8e89de386bbbd74bac1c24c388ed61", - "lib/facter/mysqld_version.rb": "a865c82a1bbe4fc49998d17038eaaa11", - "lib/puppet/functions/mysql/password.rb": "5da041193b56f44dd4c43141433ca495", - "lib/puppet/functions/mysql/strip_hash.rb": "014e9cce7d1995145fa49242d6a1430c", - "lib/puppet/parser/functions/mysql_password.rb": "c4d522919ce8d270a5d3d2ccf060ecd1", - "lib/puppet/provider/mysql.rb": "fd1f12eabac17aee77fe7d3d2843cf20", - "lib/puppet/provider/mysql_database/mysql.rb": "12e6bfef70486ed4d8a4e731bfde89fa", - "lib/puppet/provider/mysql_datadir/mysql.rb": "aa72daf1732dadd9d5caa6c6ff696414", - "lib/puppet/provider/mysql_grant/mysql.rb": "e0a96951629bc906d45c8bc73f0d16d5", - "lib/puppet/provider/mysql_plugin/mysql.rb": "d0043d2fec34ab9d9839ecb2f5e6f494", - "lib/puppet/provider/mysql_user/mysql.rb": "9ce968d7a78b0119e3bdfeb8c284517f", - "lib/puppet/type/mysql_database.rb": "a52d622db5cb4e9978c57d445e7d63f7", - "lib/puppet/type/mysql_datadir.rb": "003e20fbccdfabbf46e62dfbfc41781b", - "lib/puppet/type/mysql_grant.rb": "815e2337380279cd55e374a4ed8ac0ca", - "lib/puppet/type/mysql_plugin.rb": "5786a52bf1ca04a9300831add3f4dbad", - "lib/puppet/type/mysql_user.rb": "86d77c52c8bab20a7b5e2a84e1220467", - "locales/config.yaml": "2fa67bcbae3c1f47b447359558142bb4", - "locales/ja/puppetlabs-mysql.po": "2cf26b43a97d4444f0af6e542b140a84", - "locales/puppetlabs-mysql.pot": "0bc1d574fc470daa825d2052b901f1c2", - "manifests/backup/mysqlbackup.pp": "a01546a40775c83b37f79a5e5d9af74d", - "manifests/backup/mysqldump.pp": "cb479fe6ecbb73fc79da9bc46a7d4cae", - "manifests/backup/xtrabackup.pp": "c1eb0fa25a9991b494a1ec0c6fd4ecfc", - "manifests/bindings/client_dev.pp": "22caac5dc87099f19e930c045bd3b8ab", - "manifests/bindings/daemon_dev.pp": "835f8b31d04dc4e274554ebc521bfae4", - "manifests/bindings/java.pp": "594bed2948731d4707837f149a6a34dc", - "manifests/bindings/perl.pp": "1db6a303f85d294e60437425d69e6e21", - "manifests/bindings/php.pp": "fd2f05eb16fb26dcb6856368b32e0d8e", - "manifests/bindings/python.pp": "6f21841a99e131cbbed991cd3b224b45", - "manifests/bindings/ruby.pp": "4e15dc048a88fff9d4dda51149444474", - "manifests/bindings.pp": "a082c3fb3bb814a0953ec7beda9f0786", - "manifests/client/install.pp": "26c737ee4b0ce3a4529dbf3368dd56d5", - "manifests/client.pp": "178235b85d2984e7b6245b3419eb9c58", - "manifests/db.pp": "74d31157579a8b41218c6d8de8149b21", - "manifests/params.pp": "361b93aee486dd73df9d2f89543df276", - "manifests/server/account_security.pp": "e8547d61232dab8399fc1c026678f0e8", - "manifests/server/backup.pp": "d886e7a1120b2249e45ef8a69d09456a", - "manifests/server/binarylog.pp": "26117dc41eb385181e9b997d98ae1758", - "manifests/server/config.pp": "0eeaf180307330258598df1723ed9374", - "manifests/server/install.pp": "e00ad8cd4292540d6556c63a82bcf923", - "manifests/server/installdb.pp": "320b2242006cbd4d3f537b07df054f97", - "manifests/server/monitor.pp": "3303efac7f345000b5d49ce8c807a513", - "manifests/server/mysqltuner.pp": "4011f744a433063c85c55de43c3040d6", - "manifests/server/providers.pp": "1ff9ff9f003b061c3a6a184c01ca734e", - "manifests/server/root_password.pp": "56a34e41d4d1f7818675579abc76d10b", - "manifests/server/service.pp": "0e37b66b3d68d734cccf6e18c50238e2", - "manifests/server.pp": "50a47a7707c86afe0653624ba76a87c1", - "metadata.json": "dc4df981c83c1a6401f0caa4c47aa884", - "readmes/README_ja_JP.md": "f5adf27788eb36c2c1e19a10440f739a", - "readmes/REFERENCE_ja_JP.md": "e9df3acc508f15970e9231b58be26901", - "spec/acceptance/locales_spec.rb": "efacf7cb9a568d11f1b7fc68df880d94", - "spec/acceptance/mysql_backup_spec.rb": "fd8017e9bc58ecd798c407074e7dfb05", - "spec/acceptance/mysql_db_spec.rb": "22e9f936dca53fd1b4b2bbe5d5d89961", - "spec/acceptance/mysql_helper.rb": "5f9f41b66022b99b4630ba9b581e68cf", - "spec/acceptance/mysql_server_spec.rb": "46f64827245e59f8b374430a706df77c", - "spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd", - "spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39", - "spec/acceptance/nodesets/default.yml": "b42da5a1ea0c964567ba7495574b8808", - "spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae", - "spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df", - "spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58", - "spec/acceptance/sql_task_spec.rb": "1f811ea1404b556a870be637dc43b49e", - "spec/acceptance/types/mysql_database_spec.rb": "6ebabe55fc07debf95b314d7a6889505", - "spec/acceptance/types/mysql_grant_spec.rb": "acaa270a0f778d3bd8e06836141fac6e", - "spec/acceptance/types/mysql_plugin_spec.rb": "cca7bdeef979081ed0be3fb801e8bfbf", - "spec/acceptance/types/mysql_user_spec.rb": "cbbbc765768c47cf40b754bfe7cc0ae0", - "spec/classes/graceful_failures_spec.rb": "b87bf88de1903d81765ea2823e30b13f", - "spec/classes/mycnf_template_spec.rb": "41a4593b53d5ad9416f96d1c695efa0c", - "spec/classes/mysql_bindings_spec.rb": "cc74d765e235c986be88dc23b68bcc85", - "spec/classes/mysql_client_spec.rb": "da69cadaa56676ab232317c0b2255ec5", - "spec/classes/mysql_server_account_security_spec.rb": "fa9089b55ba0839a601e1b487d6f6958", - "spec/classes/mysql_server_backup_spec.rb": "7a9c32443ee2c80e87554d953feeae63", - "spec/classes/mysql_server_monitor_spec.rb": "1e028eeb613ab7baa6d8ae2c9cf7366f", - "spec/classes/mysql_server_mysqltuner_spec.rb": "7fb608f515d9a0cc9efa8683fe9608e8", - "spec/classes/mysql_server_spec.rb": "b39d692016bb1bfb63c61bbc777bfbbb", - "spec/default_facts.yml": "d4442f09ee2f33f2d55f078d0ee2634f", - "spec/defines/mysql_db_spec.rb": "fba7016688860d20891fd74f0782c54c", - "spec/functions/mysql_password_spec.rb": "1a2b0cc8ef0b8e9b71e8c9211e8a2c2f", - "spec/functions/mysql_strip_hash_spec.rb": "40c9eccc3b09ca20ed7ce35930affe21", - "spec/spec_helper.rb": "b1068564b10d9033da49b2aaccc63db2", - "spec/spec_helper_acceptance.rb": "d43ff9281ea08ec00dd6b6782af4b36b", - "spec/spec_helper_local.rb": "572d87438363ac1be58a01cbcfab24c5", - "spec/unit/facter/mysql_server_id_spec.rb": "f34e0c0cba144771006cb9fbbada3e70", - "spec/unit/facter/mysql_version_spec.rb": "0e555c398b189e20648ae6a037d106f6", - "spec/unit/facter/mysqld_version_spec.rb": "7af40a2b38b996684752b49f2cb64ec6", - "spec/unit/puppet/functions/mysql_password_spec.rb": "82214310a621f86813dee0dfecaf27ca", - "spec/unit/puppet/provider/mysql_database/mysql_spec.rb": "05ab36956e6807e9e7056b61c2de05f1", - "spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb": "033d476b84e766a455b7bfd403a67c2d", - "spec/unit/puppet/provider/mysql_user/mysql_spec.rb": "fd0434a5096d7083457600e72e3eda00", - "spec/unit/puppet/type/mysql_database_spec.rb": "8e790bec45c59bc48544d7ac446b2f25", - "spec/unit/puppet/type/mysql_grant_spec.rb": "f6aafaffed76df6cad9466defb30e34b", - "spec/unit/puppet/type/mysql_plugin_spec.rb": "c4bfe6319219c10142667af520e09e2b", - "spec/unit/puppet/type/mysql_user_spec.rb": "4fce87af644041f0c5e44a5a43c21410", - "tasks/export.json": "81c6eee3500d31843221da03e75a9f7b", - "tasks/export.rb": "bed98c19b371cef7f4b1a54d273842de", - "tasks/sql.json": "f57ad96a8079e6729ff7557f9ac6fa62", - "tasks/sql.rb": "b6428a942317640b2b23d2776faac505", - "templates/meb.cnf.erb": "b6422b19ee97b8a2883bfac44fdc0292", - "templates/my.cnf.erb": "535d2ff37fea6b11ad928224965143d3", - "templates/my.cnf.pass.erb": "11f80afb0993a436f074a43f70733999", - "templates/mysqlbackup.sh.erb": "347b546390a8798d781a08794479c4ac", - "templates/xtrabackup.sh.erb": "72876e2416d8f48acc5f2bcce1d7d400" -} \ No newline at end of file diff -pruN 8.1.0-7/data/common.yaml 15.0.0-3/data/common.yaml --- 8.1.0-7/data/common.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/data/common.yaml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1 @@ +--- {} diff -pruN 8.1.0-7/debian/changelog 15.0.0-3/debian/changelog --- 8.1.0-7/debian/changelog 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/changelog 2025-07-23 08:42:20.000000000 +0000 @@ -1,3 +1,41 @@ +puppet-module-puppetlabs-mysql (15.0.0-3) unstable; urgency=medium + + * Fix autopkgtest "mariadb is responsive" (Closes: #1108800). + + -- Thomas Goirand Wed, 23 Jul 2025 10:42:20 +0200 + +puppet-module-puppetlabs-mysql (15.0.0-2) unstable; urgency=medium + + * Team upload. + * d/control: tighten stdlib module dependency + + -- Jérôme Charaoui Sun, 25 Feb 2024 12:29:02 -0500 + +puppet-module-puppetlabs-mysql (15.0.0-1) unstable; urgency=medium + + * Team upload. + + [Jérôme Charaoui] + * New upstream version 15.0.0 + * d/install: add new module data, types directories + * d/patches: + - drop ssl directives patch, merged upstream + + refresh fix-client_dev_package_name.patch + + adjust fix-creation-of-var-log-mysql.patch + * d/control: + - drop obsolete dependencies + + puppet is now puppet-agent + + bump dh-compat to 13 + + bump Standards-Version, no changes needed + * d/tests: reorganize tests + + [lintian-brush] + * Set upstream metadata fields: Bug-Database, Bug-Submit. + * Remove obsolete field Name from debian/upstream/metadata + (already present in machine-readable debian/copyright). + + -- Jérôme Charaoui Sat, 24 Feb 2024 14:34:38 -0500 + puppet-module-puppetlabs-mysql (8.1.0-7) unstable; urgency=medium * Add fix-creation-of-var-log-mysql.patch. diff -pruN 8.1.0-7/debian/control 15.0.0-3/debian/control --- 8.1.0-7/debian/control 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/control 2025-07-23 08:42:20.000000000 +0000 @@ -7,8 +7,8 @@ Uploaders: Section: admin Priority: optional Build-Depends: - debhelper-compat (= 11), -Standards-Version: 4.1.4 + debhelper-compat (= 13), +Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/puppet-team/puppet-module-puppetlabs-mysql Vcs-Git: https://salsa.debian.org/puppet-team/puppet-module-puppetlabs-mysql.git @@ -17,10 +17,8 @@ Homepage: https://forge.puppet.com/puppe Package: puppet-module-puppetlabs-mysql Architecture: all Depends: - puppet (>= 4) | puppet-common (>= 3), - puppet-module-nanliu-staging, - puppet-module-puppetlabs-stdlib, - puppet-module-puppetlabs-translate, + puppet-agent, + puppet-module-puppetlabs-stdlib (>= 9.0.0), ${misc:Depends}, Description: Puppet module for MySQL Puppet lets you centrally manage every important aspect of your system diff -pruN 8.1.0-7/debian/patches/do-not-emit-other-ssl-directives-when-ssl-is-false.patch 15.0.0-3/debian/patches/do-not-emit-other-ssl-directives-when-ssl-is-false.patch --- 8.1.0-7/debian/patches/do-not-emit-other-ssl-directives-when-ssl-is-false.patch 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/patches/do-not-emit-other-ssl-directives-when-ssl-is-false.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: do not emit other ssl directives when ssl = false - This is needed for newer versions of MariaDB, see issue #1509 -Author: Thomas Goirand -Forwarded: no -Last-Update: 2023-02-17 - ---- puppet-module-puppetlabs-mysql-8.1.0.orig/templates/my.cnf.erb -+++ puppet-module-puppetlabs-mysql-8.1.0/templates/my.cnf.erb -@@ -4,7 +4,7 @@ - <% if v.is_a?(Hash) -%> - [<%= k %>] - <% v.sort.map do |ki, vi| -%> --<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) -%> -+<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) or (ki =~ /^ssl-/ and v['ssl'] == false) -%> - <% next %> - <% elsif vi == true or vi == '' -%> - <%= ki %> diff -pruN 8.1.0-7/debian/patches/fix-client_dev_package_name.patch 15.0.0-3/debian/patches/fix-client_dev_package_name.patch --- 8.1.0-7/debian/patches/fix-client_dev_package_name.patch 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/patches/fix-client_dev_package_name.patch 2025-07-23 08:42:20.000000000 +0000 @@ -3,12 +3,14 @@ Description: Fix ::params:client_dev_pac libmariadb-dev. This patch fixes it. Author: Thomas Goirand Bug-Debian: https://bugs.debian.org/975478 -Forwarded: no -Last-Update: 2020-11-24 +Forwarded: https://github.com/puppetlabs/puppetlabs-mysql/pull/1623 +Last-Update: 2024-02-24 ---- puppet-module-puppetlabs-mysql-8.1.0.orig/manifests/params.pp -+++ puppet-module-puppetlabs-mysql-8.1.0/manifests/params.pp -@@ -190,7 +190,7 @@ +Index: puppet-module-puppetlabs-mysql/manifests/params.pp +=================================================================== +--- puppet-module-puppetlabs-mysql.orig/manifests/params.pp ++++ puppet-module-puppetlabs-mysql/manifests/params.pp +@@ -162,7 +162,7 @@ class mysql::params { $client_package_name = 'mariadb-client' $server_package_name = 'mariadb-server' $server_service_name = 'mariadb' @@ -17,12 +19,3 @@ Last-Update: 2020-11-24 $daemon_dev_package_name = 'libmariadbd-dev' } else { $client_package_name = 'mysql-client' -@@ -222,7 +222,7 @@ - } else { - $php_package_name = 'php5-mysql' - } -- $python_package_name = 'python-mysqldb' -+ $python_package_name = 'python3-mysqldb' - $ruby_package_name = $::lsbdistcodename ? { - 'jessie' => 'ruby-mysql', - 'stretch' => 'ruby-mysql2', diff -pruN 8.1.0-7/debian/patches/fix-creation-of-var-log-mysql.patch 15.0.0-3/debian/patches/fix-creation-of-var-log-mysql.patch --- 8.1.0-7/debian/patches/fix-creation-of-var-log-mysql.patch 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/patches/fix-creation-of-var-log-mysql.patch 2025-07-23 08:42:20.000000000 +0000 @@ -6,25 +6,35 @@ Description: Fix missing creation of /va . This patch adds creating of /var/log/mysql in the installdb.pp itself, to fix the current situation. -Author: Thomas Goirand -Forwarded: no -Last-Update: 2023-03-09 +Author: Jérôme Charaoui +Forwarded: https://github.com/puppetlabs/puppetlabs-mysql/pull/1622 ---- puppet-module-puppetlabs-mysql-8.1.0.orig/manifests/server/installdb.pp -+++ puppet-module-puppetlabs-mysql-8.1.0/manifests/server/installdb.pp -@@ -22,7 +22,14 @@ class mysql::server::installdb { - } +This patch aligns with the new package default of not creating a +`/var/log/mysql` directory on installation. +Index: puppet-module-puppetlabs-mysql/manifests/params.pp +=================================================================== +--- puppet-module-puppetlabs-mysql.orig/manifests/params.pp ++++ puppet-module-puppetlabs-mysql/manifests/params.pp +@@ -176,7 +176,6 @@ class mysql::params { + $config_file = '/etc/mysql/my.cnf' + $includedir = '/etc/mysql/conf.d' + $datadir = '/var/lib/mysql' +- $log_error = '/var/log/mysql/error.log' + $pidfile = '/var/run/mysqld/mysqld.pid' + $root_group = 'root' + $mysql_group = 'adm' +@@ -187,6 +186,14 @@ class mysql::params { + $tmpdir = '/tmp' + $managed_dirs = ['tmpdir','basedir','datadir','innodb_data_home_dir','innodb_log_group_home_dir','innodb_undo_directory','innodb_tmpdir'] - if $options['mysqld']['log-error'] { -- file { $options['mysqld']['log-error']: -+ file { '/var/log/mysql': -+ ensure => 'directory', -+ owner => $mysqluser, -+ group => 'adm', -+ mode => '0750', -+ require => Mysql_datadir[ $datadir ], -+ } -+ -> file { $options['mysqld']['log-error']: - ensure => present, - owner => $mysqluser, - group => $::mysql::server::mysql_group, ++ # log_error base directory absent in Debian >= 12 ++ if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '12') >= 0) or ++ ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '23.10') >= 0) { ++ $log_error = undef ++ } else { ++ $log_error = '/var/log/mysql/error.log' ++ } ++ + # mysql::bindings + if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '10') >= 0) or + ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '20.04') >= 0) { diff -pruN 8.1.0-7/debian/patches/series 15.0.0-3/debian/patches/series --- 8.1.0-7/debian/patches/series 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/patches/series 2025-07-23 08:42:20.000000000 +0000 @@ -1,3 +1,2 @@ fix-client_dev_package_name.patch -do-not-emit-other-ssl-directives-when-ssl-is-false.patch fix-creation-of-var-log-mysql.patch diff -pruN 8.1.0-7/debian/puppet-module-puppetlabs-mysql.install 15.0.0-3/debian/puppet-module-puppetlabs-mysql.install --- 8.1.0-7/debian/puppet-module-puppetlabs-mysql.install 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/puppet-module-puppetlabs-mysql.install 2025-07-23 08:42:20.000000000 +0000 @@ -1,4 +1,6 @@ +data usr/share/puppet/modules.available/puppetlabs-mysql lib usr/share/puppet/modules.available/puppetlabs-mysql manifests usr/share/puppet/modules.available/puppetlabs-mysql metadata.json usr/share/puppet/modules.available/puppetlabs-mysql templates usr/share/puppet/modules.available/puppetlabs-mysql +types usr/share/puppet/modules.available/puppetlabs-mysql diff -pruN 8.1.0-7/debian/tests/.rspec 15.0.0-3/debian/tests/.rspec --- 8.1.0-7/debian/tests/.rspec 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/tests/.rspec 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ ---color ---format documentation diff -pruN 8.1.0-7/debian/tests/control 15.0.0-3/debian/tests/control --- 8.1.0-7/debian/tests/control 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/tests/control 2025-07-23 08:42:20.000000000 +0000 @@ -1,4 +1,4 @@ -Test-Command: cd debian/tests && rspec spec/localhost/*_spec.rb +Tests: serverspec Depends: ruby-serverspec, @, diff -pruN 8.1.0-7/debian/tests/serverspec 15.0.0-3/debian/tests/serverspec --- 8.1.0-7/debian/tests/serverspec 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/debian/tests/serverspec 2025-07-23 08:42:20.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +cleanup () { + retval=$? + set +e + if [ -n "${AUTOPKGTEST_ARTIFACTS}" ]; then + for f in /etc/my.cnf /var/log/puppet-apply.log; do + [ -f "$f" ] && cp "$f" "$AUTOPKGTEST_ARTIFACTS" + done + if [ -d /run/systemd/system ]; then + journalctl -u mariadb.service > "${AUTOPKGTEST_ARTIFACTS}/mariadb.service.log" + fi + fi + return $retval +} + +trap cleanup EXIT + +cd debian/tests +rspec --format documentation spec/*_spec.rb diff -pruN 8.1.0-7/debian/tests/spec/localhost/install_spec.rb 15.0.0-3/debian/tests/spec/localhost/install_spec.rb --- 8.1.0-7/debian/tests/spec/localhost/install_spec.rb 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/tests/spec/localhost/install_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe package('puppet-module-puppetlabs-mysql') do - it { should be_installed } -end diff -pruN 8.1.0-7/debian/tests/spec/localhost/use_spec.rb 15.0.0-3/debian/tests/spec/localhost/use_spec.rb --- 8.1.0-7/debian/tests/spec/localhost/use_spec.rb 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/tests/spec/localhost/use_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -require 'spec_helper' - -describe command('puppet apply --detailed-exitcodes --execute "include mysql::client"') do - its(:exit_status) { should eq 2 } -end - -describe package('mariadb-client') do - it { should be_installed } -end - -describe command('puppet apply --detailed-exitcodes --execute "include mysql::server"') do - its(:exit_status) { should eq 2 } -end - -describe package('mariadb-server') do - it { should be_installed } -end - -describe service('mysql') do - it { should be_running } -end diff -pruN 8.1.0-7/debian/tests/spec/puppetlabs-mysql_spec.rb 15.0.0-3/debian/tests/spec/puppetlabs-mysql_spec.rb --- 8.1.0-7/debian/tests/spec/puppetlabs-mysql_spec.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/debian/tests/spec/puppetlabs-mysql_spec.rb 2025-07-23 08:42:20.000000000 +0000 @@ -0,0 +1,52 @@ +require 'spec_helper' + +describe "mariadb is not installed" do + describe package('mariadb') do + it { should_not be_installed } + end + describe service('mariadb') do + it { should_not be_running } + end +end + +describe "mysql::client class applies successfully" do + describe command("puppet apply --logdest /var/log/puppet-apply.log --test -e 'include mysql::client'") do + its(:exit_status) { should eq 2 } + end +end + +describe "mariadb-client is installed" do + describe package('mariadb-client') do + it { should be_installed } + end +end + +describe "mysql::server class applies successfully" do + describe command("puppet apply --logdest /var/log/puppet-apply.log --test -e 'include mysql::server'") do + its(:exit_status) { should eq 2 } + end +end + +describe "mariadb-server is installed" do + describe package('mariadb-server') do + it { should be_installed } + end +end + +describe "mariadb service is started" do + # allow time for the service to start + before(:all) do + sleep 5 + end + describe service('mariadb') do + it { should be_enabled } + it { should be_running } + end +end + +describe "mariadb is responsive" do + describe command("echo '\\s' | mysql --ssl=off") do + its(:exit_status) { should eq 0 } + its(:stdout) { should match (/Server:\s+MariaDB/) } + end +end diff -pruN 8.1.0-7/debian/tests/spec/spec_helper.rb 15.0.0-3/debian/tests/spec/spec_helper.rb --- 8.1.0-7/debian/tests/spec/spec_helper.rb 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/tests/spec/spec_helper.rb 2025-07-23 08:42:20.000000000 +0000 @@ -1,4 +1,4 @@ require 'serverspec' set :backend, :exec - +set :os, :family => 'debian', :release => 'testing' diff -pruN 8.1.0-7/debian/upstream/metadata 15.0.0-3/debian/upstream/metadata --- 8.1.0-7/debian/upstream/metadata 2023-03-09 11:31:33.000000000 +0000 +++ 15.0.0-3/debian/upstream/metadata 2025-07-23 08:42:20.000000000 +0000 @@ -1,4 +1,5 @@ --- -Name: puppetlabs-mysql +Bug-Database: https://github.com/puppetlabs/puppetlabs-mysql/issues +Bug-Submit: https://github.com/puppetlabs/puppetlabs-mysql/issues/new Repository: https://github.com/puppetlabs/puppetlabs-mysql.git Repository-Browse: https://github.com/puppetlabs/puppetlabs-mysql diff -pruN 8.1.0-7/examples/backup.pp 15.0.0-3/examples/backup.pp --- 8.1.0-7/examples/backup.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/backup.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,5 +1,5 @@ class { 'mysql::server': - root_password => 'password' + root_password => 'password', } class { 'mysql::server::backup': diff -pruN 8.1.0-7/examples/java.pp 15.0.0-3/examples/java.pp --- 8.1.0-7/examples/java.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/java.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1 +1 @@ -class { 'mysql::java':} +class { 'mysql::java': } diff -pruN 8.1.0-7/examples/monitor.pp 15.0.0-3/examples/monitor.pp --- 8.1.0-7/examples/monitor.pp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/examples/monitor.pp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,20 @@ +# @summary +# Add a monitoring user to the database + +$mysql_monitor_password = 'password' +$mysql_monitor_username = 'monitoring' +$mysql_monitor_hostname = $facts['networking']['hostname'] + +mysql_user { "${mysql_monitor_username}@${mysql_monitor_hostname}": + ensure => present, + password_hash => mysql::password($mysql_monitor_password), + require => Class['mysql::server::service'], +} + +mysql_grant { "${mysql_monitor_username}@${mysql_monitor_hostname}/*.*": + ensure => present, + user => "${mysql_monitor_username}@${mysql_monitor_hostname}", + table => '*.*', + privileges => ['PROCESS', 'SUPER'], + require => Mysql_user["${mysql_monitor_username}@${mysql_monitor_hostname}"], +} diff -pruN 8.1.0-7/examples/mysql_database.pp 15.0.0-3/examples/mysql_database.pp --- 8.1.0-7/examples/mysql_database.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/mysql_database.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,16 +1,16 @@ class { 'mysql::server': - root_password => 'password' + root_password => 'password', } -mysql::db{ ['test1', 'test2', 'test3']: +mysql::db { ['test1', 'test2', 'test3']: ensure => present, charset => 'utf8', require => Class['mysql::server'], } -mysql::db{ 'test4': +mysql::db { 'test4': ensure => present, charset => 'latin1', } -mysql::db{ 'test5': +mysql::db { 'test5': ensure => present, charset => 'binary', collate => 'binary', diff -pruN 8.1.0-7/examples/mysql_db.pp 15.0.0-3/examples/mysql_db.pp --- 8.1.0-7/examples/mysql_db.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/mysql_db.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,5 +1,5 @@ class { 'mysql::server': - root_password => 'password' + root_password => 'password', } mysql::db { 'mydb': user => 'myuser', @@ -7,11 +7,11 @@ mysql::db { 'mydb': host => 'localhost', grant => ['SELECT', 'UPDATE'], } -mysql::db { "mydb_${fqdn}": +mysql::db { "mydb_${facts['networking']['fqdn']}": user => 'myuser', password => 'mypass', dbname => 'mydb', - host => $::fqdn, + host => $facts['networking']['fqdn'], grant => ['SELECT', 'UPDATE'], tag => $domain, } diff -pruN 8.1.0-7/examples/mysql_grant.pp 15.0.0-3/examples/mysql_grant.pp --- 8.1.0-7/examples/mysql_grant.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/mysql_grant.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,4 +1,4 @@ -mysql_grant{'test1@localhost/redmine.*': +mysql_grant { 'test1@localhost/redmine.*': user => 'test1@localhost', table => 'redmine.*', privileges => ['UPDATE'], diff -pruN 8.1.0-7/examples/mysql_login_path.pp 15.0.0-3/examples/mysql_login_path.pp --- 8.1.0-7/examples/mysql_login_path.pp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/examples/mysql_login_path.pp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,64 @@ +# Debian MySQL Commiunity Server 8.0 +include apt +apt::source { 'repo.mysql.com': + location => 'http://repo.mysql.com/apt/debian', + release => $facts['os']['distro']['codename'], + repos => 'mysql-8.0', + key => { + id => 'A4A9406876FCBD3C456770C88C718D3B5072E1F5', + server => 'hkp://keyserver.ubuntu.com:80', + }, + include => { + src => false, + deb => true, + }, + notify => Exec['apt-get update'], +} +exec { 'apt-get update': + path => '/usr/bin:/usr/sbin:/bin:/sbin', + refreshonly => true, +} + +$root_pw = 'password' +class { 'mysql::server': + root_password => $root_pw, + service_name => 'mysql', + package_name => 'mysql-community-server', + create_root_my_cnf => false, + require => [ + Apt::Source['repo.mysql.com'], + Exec['apt-get update'] + ], + notify => Mysql_login_path['client'], +} + +class { 'mysql::client': + package_manage => false, + package_name => 'mysql-community-client', + require => Class['mysql::server'], +} + +mysql_login_path { 'client': + ensure => present, + host => 'localhost', + user => 'root', + password => Sensitive($root_pw), + socket => '/var/run/mysqld/mysqld.sock', + owner => root, +} + +mysql_login_path { 'local_dan': + ensure => present, + host => '127.0.0.1', + user => 'dan', + password => Sensitive('blah'), + port => 3306, + owner => root, + require => Class['mysql::server'], +} + +mysql_user { 'dan@localhost': + ensure => present, + password_hash => mysql::password('blah'), + require => Mysql_login_path['client'], +} diff -pruN 8.1.0-7/examples/mysql_plugin.pp 15.0.0-3/examples/mysql_plugin.pp --- 8.1.0-7/examples/mysql_plugin.pp 2018-09-13 14:14:13.000000000 +0000 +++ 15.0.0-3/examples/mysql_plugin.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,9 +1,9 @@ class { 'mysql::server': - root_password => 'password' + root_password => 'password', } -$validate_password_soname = $::osfamily ? { - windows => 'validate_password.dll', +$validate_password_soname = $facts['os']['family'] ? { + 'windows' => 'validate_password.dll', default => 'validate_password.so' } @@ -12,8 +12,8 @@ mysql_plugin { 'validate_password': soname => $validate_password_soname, } -$auth_socket_soname = $::osfamily ? { - windows => 'auth_socket.dll', +$auth_socket_soname = $facts['os']['family'] ? { + 'windows' => 'auth_socket.dll', default => 'auth_socket.so' } diff -pruN 8.1.0-7/examples/mysql_user.pp 15.0.0-3/examples/mysql_user.pp --- 8.1.0-7/examples/mysql_user.pp 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/examples/mysql_user.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,28 +4,28 @@ class { 'mysql::server': root_password => 'password', } -mysql_user{ 'redmine@localhost': +mysql_user { 'redmine@localhost': ensure => present, password_hash => mysql::password('redmine'), require => Class['mysql::server'], } -mysql_user{ 'dan@localhost': +mysql_user { 'dan@localhost': ensure => present, - password_hash => mysql::password('blah') + password_hash => mysql::password('blah'), } -mysql_user{ 'dan@%': +mysql_user { 'dan@%': ensure => present, password_hash => mysql::password('blah'), } -mysql_user{ 'socketplugin@%': +mysql_user { 'socketplugin@%': ensure => present, plugin => 'unix_socket', } -mysql_user{ 'socketplugin@%': +mysql_user { 'socketplugin@%': ensure => present, password_hash => mysql::password('blah'), plugin => 'mysql_native_password', diff -pruN 8.1.0-7/examples/mysqltuner.pp 15.0.0-3/examples/mysqltuner.pp --- 8.1.0-7/examples/mysqltuner.pp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/examples/mysqltuner.pp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,12 @@ +# @summary +# Manage the MySQLTuner package. + +$version = 'v1.3.0' + +file { '/usr/local/bin/mysqltuner': + ensure => 'file', + owner => 'root', + group => 'root', + mode => '0550', + source => "https://github.com/major/MySQLTuner-perl/raw/${version}/mysqltuner.pl", +} diff -pruN 8.1.0-7/examples/python.pp 15.0.0-3/examples/python.pp --- 8.1.0-7/examples/python.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/python.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1 +1 @@ -class { 'mysql::bindings::python':} +class { 'mysql::bindings::python': } diff -pruN 8.1.0-7/examples/rh-mysql80-server.pp 15.0.0-3/examples/rh-mysql80-server.pp --- 8.1.0-7/examples/rh-mysql80-server.pp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/examples/rh-mysql80-server.pp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,22 @@ +file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo': + source => 'https://raw.githubusercontent.com/sclorg/centos-release-scl/master/centos-release-scl/RPM-GPG-KEY-CentOS-SIG-SCLo', +} + +yumrepo { 'centos-sclo-rh': + ensure => present, + name => 'CentOS-SCLo-scl-rh', + enabled => true, + baseurl => 'http://mirror.centos.org/centos/7/sclo/$basearch/rh/', + mirrorlist => 'http://mirrorlist.centos.org?arch=$basearch&release=7&repo=sclo-rh', + descr => 'CentOS-7 - SCLo rh', + gpgcheck => true, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo', +} +class { 'mysql::server': + package_name => 'rh-mysql80', + package_ensure => 'installed', + service_name => 'rh-mysql80-mysqld', + config_file => '/etc/my.cnf', + includedir => '/etc/my.cnf.d', + options => { mysqld => { log_error => '/var/log/mysqld.log', datadir => '/var/lib/mysql' } }, +} diff -pruN 8.1.0-7/examples/server/config.pp 15.0.0-3/examples/server/config.pp --- 8.1.0-7/examples/server/config.pp 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/examples/server/config.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,2 @@ mysql::server::config { 'testfile': - } diff -pruN 8.1.0-7/hiera.yaml 15.0.0-3/hiera.yaml --- 8.1.0-7/hiera.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/hiera.yaml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,19 @@ +--- +version: 5 + +defaults: # Used for any hierarchy level that omits these keys. + datadir: data # This path is relative to hiera.yaml's directory. + data_hash: yaml_data # Use the built-in YAML backend. + +hierarchy: + - name: "osfamily/major release" + paths: + # Used to distinguish between Debian and Ubuntu + - "os/%{facts.os.name}/%{facts.os.release.major}.yaml" + - "os/%{facts.os.family}/%{facts.os.release.major}.yaml" + - name: "osfamily" + paths: + - "os/%{facts.os.name}.yaml" + - "os/%{facts.os.family}.yaml" + - name: 'common' + path: 'common.yaml' diff -pruN 8.1.0-7/lib/facter/mysql_server_id.rb 15.0.0-3/lib/facter/mysql_server_id.rb --- 8.1.0-7/lib/facter/mysql_server_id.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/lib/facter/mysql_server_id.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,13 +1,22 @@ +# frozen_string_literal: true + def mysql_id_get - Facter.value(:macaddress).split(':')[2..-1].reduce(0) { |total, value| (total << 6) + value.hex } + # Convert the existing mac to an integer + macval = Facter.value(:macaddress).delete(':').to_i(16) + + # Valid range is from 1 - 4294967295 for replication hosts. + # We can not guarantee a fully unique value, this reduces the + # full mac value down to into that number space. + # + # The -1/+1 ensures that we keep above 1 if we get unlucky + # enough to hit a mac address that evenly divides. + (macval % (4_294_967_295 - 1)) + 1 end Facter.add('mysql_server_id') do setcode do - begin - mysql_id_get - rescue - nil - end + mysql_id_get + rescue StandardError + nil end end diff -pruN 8.1.0-7/lib/facter/mysql_version.rb 15.0.0-3/lib/facter/mysql_version.rb --- 8.1.0-7/lib/facter/mysql_version.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/lib/facter/mysql_version.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,6 +1,9 @@ +# frozen_string_literal: true + Facter.add('mysql_version') do + confine { Facter::Core::Execution.which('mysql') } setcode do - mysql_ver = Facter::Util::Resolution.exec('mysql --version') + mysql_ver = Facter::Core::Execution.execute('mysql --version') mysql_ver.match(%r{\d+\.\d+\.\d+})[0] if mysql_ver end end diff -pruN 8.1.0-7/lib/facter/mysqld_version.rb 15.0.0-3/lib/facter/mysqld_version.rb --- 8.1.0-7/lib/facter/mysqld_version.rb 2018-09-13 14:14:13.000000000 +0000 +++ 15.0.0-3/lib/facter/mysqld_version.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,5 +1,9 @@ +# frozen_string_literal: true + Facter.add('mysqld_version') do + confine { Facter::Core::Execution.which('mysqld') || Facter::Core::Execution.which('/usr/libexec/mysqld') } setcode do - Facter::Util::Resolution.exec('mysqld --no-defaults -V 2>/dev/null') + # Add /usr/libexec to PATH to find mysqld command + Facter::Core::Execution.execute('env PATH=$PATH:/usr/libexec mysqld --no-defaults -V 2>/dev/null') end end diff -pruN 8.1.0-7/lib/puppet/functions/mysql/normalise_and_deepmerge.rb 15.0.0-3/lib/puppet/functions/mysql/normalise_and_deepmerge.rb --- 8.1.0-7/lib/puppet/functions/mysql/normalise_and_deepmerge.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/lib/puppet/functions/mysql/normalise_and_deepmerge.rb 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,73 @@ +# frozen_string_literal: true + +# @summary Recursively merges two or more hashes together, normalises keys with differing use of dashes and underscores. +# +# @example +# $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } } +# $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } } +# $merged_hash = mysql::normalise_and_deepmerge($hash1, $hash2) +# # The resulting hash is equivalent to: +# # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } +# +# - When there is a duplicate key that is a hash, they are recursively merged. +# - When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." +# - When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), the rightmost style will win. +# +Puppet::Functions.create_function(:'mysql::normalise_and_deepmerge') do + # @param args + # Hash to be normalised + # + # @return hash + # The given hash normalised + # + def normalise_and_deepmerge(*args) + raise Puppet::ParseError, _('mysql::normalise_and_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length } if args.length < 2 + + result = {} + args.each do |arg| + next if arg.is_a?(String) && arg.empty? # empty string is synonym for puppet's undef + # If the argument was not a hash, skip it. + raise Puppet::ParseError, _('mysql::normalise_and_deepmerge: unexpected argument type %{arg_class}, only expects hash arguments.') % { args_class: args.class } unless arg.is_a?(Hash) + + # We need to make a copy of the hash since it is frozen by puppet + current = deep_copy(arg) + + # Now we have to traverse our hash assigning our non-hash values + # to the matching keys in our result while following our hash values + # and repeating the process. + overlay(result, current) + end + result + end + + def normalized?(hash, key) + return true if hash.key?(key) + return false unless %r{-|_}.match?(key) + + other_key = key.include?('-') ? key.tr('-', '_') : key.tr('_', '-') + return false unless hash.key?(other_key) + + hash[key] = hash.delete(other_key) + true + end + + def overlay(hash1, hash2) + hash2.each do |key, value| + if normalized?(hash1, key) && value.is_a?(Hash) && hash1[key].is_a?(Hash) + overlay(hash1[key], value) + else + hash1[key] = value + end + end + end + + def deep_copy(inputhash) + return inputhash unless inputhash.is_a? Hash + + hash = {} + inputhash.each do |k, v| + hash.store(k, deep_copy(v)) + end + hash + end +end diff -pruN 8.1.0-7/lib/puppet/functions/mysql/password.rb 15.0.0-3/lib/puppet/functions/mysql/password.rb --- 8.1.0-7/lib/puppet/functions/mysql/password.rb 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/lib/puppet/functions/mysql/password.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'digest/sha1' # @summary # Hash a string as mysql's "PASSWORD()" function would do it @@ -5,18 +7,33 @@ require 'digest/sha1' Puppet::Functions.create_function(:'mysql::password') do # @param password # Plain text password. + # @param sensitive + # If the mysql password hash should be of datatype Sensitive[String] # # @return hash # The mysql password hash from the clear text password. # dispatch :password do - required_param 'String', :password - return_type 'String' + required_param 'Variant[String, Sensitive[String]]', :password + optional_param 'Boolean', :sensitive + return_type 'Variant[String, Sensitive[String]]' end - def password(password) - return '' if password.empty? - return password if password =~ %r{\*[A-F0-9]{40}$} - '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(password)).upcase + def password(password, sensitive = false) # rubocop:disable Style/OptionalBooleanParameter + password = password.unwrap if password.is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive) + + result_string = if %r{\*[A-F0-9]{40}$}.match?(password) + password + elsif password.empty? + '' + else + "*#{Digest::SHA1.hexdigest(Digest::SHA1.digest(password)).upcase}" + end + + if sensitive + Puppet::Pops::Types::PSensitiveType::Sensitive.new(result_string) + else + result_string + end end end diff -pruN 8.1.0-7/lib/puppet/functions/mysql/strip_hash.rb 15.0.0-3/lib/puppet/functions/mysql/strip_hash.rb --- 8.1.0-7/lib/puppet/functions/mysql/strip_hash.rb 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/lib/puppet/functions/mysql/strip_hash.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # @summary # When given a hash this function strips out all blank entries. # diff -pruN 8.1.0-7/lib/puppet/functions/mysql_password.rb 15.0.0-3/lib/puppet/functions/mysql_password.rb --- 8.1.0-7/lib/puppet/functions/mysql_password.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/lib/puppet/functions/mysql_password.rb 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +# @summary DEPRECATED. Use the namespaced function [`mysql::password`](#mysqlpassword) instead. +Puppet::Functions.create_function(:mysql_password) do + # @param password + # Plain text password. + # @param sensitive + # If the mysql password hash should be of datatype Sensitive[String] + # + # @return + # The mysql password hash from the 4.x function mysql::password. + dispatch :mysql_password do + required_param 'Variant[String, Sensitive[String]]', :password + optional_param 'Boolean', :sensitive + return_type 'Variant[String, Sensitive[String]]' + end + + def mysql_password(password, sensitive = false) # rubocop:disable Style/OptionalBooleanParameter + call_function('deprecation', 'mysql_password', "This method has been deprecated, please use the namespaced version 'mysql::password' instead.") + call_function('mysql::password', password, sensitive) + end +end diff -pruN 8.1.0-7/lib/puppet/parser/functions/mysql_password.rb 15.0.0-3/lib/puppet/parser/functions/mysql_password.rb --- 8.1.0-7/lib/puppet/parser/functions/mysql_password.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/lib/puppet/parser/functions/mysql_password.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -require 'digest/sha1' -module Puppet::Parser::Functions - newfunction(:mysql_password, type: :rvalue, doc: <<-EOS - @summary - Hash a string as mysql's "PASSWORD()" function would do it - - @param [String] password Plain text password. - - @return [String] the mysql password hash from the clear text password. - EOS - ) do |args| - - if args.size != 1 - raise Puppet::ParseError, _('mysql_password(): Wrong number of arguments given (%{args_length} for 1)') % { args_length: args.length } - end - - return '' if args[0].empty? - return args[0] if args[0] =~ %r{\*[A-F0-9]{40}$} - '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(args[0])).upcase - end -end diff -pruN 8.1.0-7/lib/puppet/provider/mysql.rb 15.0.0-3/lib/puppet/provider/mysql.rb --- 8.1.0-7/lib/puppet/provider/mysql.rb 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,22 +1,30 @@ +# frozen_string_literal: true + # Puppet provider for mysql class Puppet::Provider::Mysql < Puppet::Provider # Without initvars commands won't work. initvars # Make sure we find mysql commands on CentOS and FreeBSD - ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/local/libexec:/usr/local/bin' + ENV['PATH'] = "#{ENV.fetch('PATH', nil)}:/usr/libexec:/usr/local/libexec:/usr/local/bin" ENV['LD_LIBRARY_PATH'] = [ - ENV['LD_LIBRARY_PATH'], + ENV.fetch('LD_LIBRARY_PATH', nil), '/usr/lib', '/usr/lib64', '/opt/rh/rh-mysql56/root/usr/lib', '/opt/rh/rh-mysql56/root/usr/lib64', '/opt/rh/rh-mysql57/root/usr/lib', '/opt/rh/rh-mysql57/root/usr/lib64', + '/opt/rh/rh-mysql80/root/usr/lib', + '/opt/rh/rh-mysql80/root/usr/lib64', '/opt/rh/rh-mariadb100/root/usr/lib', '/opt/rh/rh-mariadb100/root/usr/lib64', '/opt/rh/rh-mariadb101/root/usr/lib', '/opt/rh/rh-mariadb101/root/usr/lib64', + '/opt/rh/rh-mariadb102/root/usr/lib', + '/opt/rh/rh-mariadb102/root/usr/lib64', + '/opt/rh/rh-mariadb103/root/usr/lib', + '/opt/rh/rh-mariadb103/root/usr/lib64', '/opt/rh/mysql55/root/usr/lib', '/opt/rh/mysql55/root/usr/lib64', '/opt/rh/mariadb55/root/usr/lib', @@ -63,10 +71,10 @@ class Puppet::Provider::Mysql < Puppet:: end def self.mysqld_version - # note: be prepared for '5.7.6-rc-log' etc results + # NOTE: be prepared for '5.7.6-rc-log' etc results # versioncmp detects 5.7.6-log to be newer then 5.7.6 # this is why we need the trimming. - mysqld_version_string.scan(%r{\d+\.\d+\.\d+}).first unless mysqld_version_string.nil? + mysqld_version_string&.scan(%r{\d+\.\d+\.\d+})&.first end def mysqld_version @@ -74,13 +82,21 @@ class Puppet::Provider::Mysql < Puppet:: end def self.newer_than(forks_versions) - forks_versions.keys.include?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) >= 0 + forks_versions.key?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) >= 0 end def newer_than(forks_versions) self.class.newer_than(forks_versions) end + def self.older_than(forks_versions) + forks_versions.key?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]).negative? + end + + def older_than(forks_versions) + self.class.older_than(forks_versions) + end + def defaults_file self.class.defaults_file end @@ -89,16 +105,16 @@ class Puppet::Provider::Mysql < Puppet:: if type.eql? 'system' if File.file?("#{Facter.value(:root_home)}/.mylogin.cnf") ENV['MYSQL_TEST_LOGIN_FILE'] = "#{Facter.value(:root_home)}/.mylogin.cnf" - mysql_raw([system_database, '-e', text_of_sql].flatten.compact) + mysql_raw([system_database, '-e', text_of_sql].flatten.compact).scrub else - mysql_raw([defaults_file, system_database, '-e', text_of_sql].flatten.compact) + mysql_raw([defaults_file, system_database, '-e', text_of_sql].flatten.compact).scrub end elsif type.eql? 'regular' if File.file?("#{Facter.value(:root_home)}/.mylogin.cnf") ENV['MYSQL_TEST_LOGIN_FILE'] = "#{Facter.value(:root_home)}/.mylogin.cnf" - mysql_raw(['-NBe', text_of_sql].flatten.compact) + mysql_raw(['-NBe', text_of_sql].flatten.compact).scrub else - mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact) + mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact).scrub end else raise Puppet::Error, _("#mysql_caller: Unrecognised type '%{type}'" % { type: type }) @@ -129,7 +145,7 @@ class Puppet::Provider::Mysql < Puppet:: table_string = '' # We can't escape *.* so special case this. - table_string << if table == '*.*' + table_string += if table == '*.*' '*.*' # Special case also for FUNCTIONs and PROCEDUREs elsif table.start_with?('FUNCTION ', 'PROCEDURE ') @@ -142,9 +158,10 @@ class Puppet::Provider::Mysql < Puppet:: def self.cmd_privs(privileges) return 'ALL PRIVILEGES' if privileges.include?('ALL') + priv_string = '' privileges.each do |priv| - priv_string << "#{priv}, " + priv_string += "#{priv}, " end # Remove trailing , from the last element. priv_string.sub(%r{, $}, '') @@ -154,7 +171,7 @@ class Puppet::Provider::Mysql < Puppet:: def self.cmd_options(options) option_string = '' options.each do |opt| - option_string << ' WITH GRANT OPTION' if opt == 'GRANT' + option_string += ' WITH GRANT OPTION' if opt == 'GRANT' end option_string end diff -pruN 8.1.0-7/lib/puppet/provider/mysql_database/mysql.rb 15.0.0-3/lib/puppet/provider/mysql_database/mysql.rb --- 8.1.0-7/lib/puppet/provider/mysql_database/mysql.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_database/mysql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) Puppet::Type.type(:mysql_database).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'Manages MySQL databases.' @@ -22,7 +24,7 @@ Puppet::Type.type(:mysql_database).provi # the contents of the property_hash generated by self.instances def self.prefetch(resources) databases = instances - resources.keys.each do |database| + resources.each_key do |database| provider = databases.find { |db| db.name == database } resources[database].provider = provider if provider end diff -pruN 8.1.0-7/lib/puppet/provider/mysql_datadir/mysql.rb 15.0.0-3/lib/puppet/provider/mysql_datadir/mysql.rb --- 8.1.0-7/lib/puppet/provider/mysql_datadir/mysql.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_datadir/mysql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) Puppet::Type.type(:mysql_datadir).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'manage data directories for mysql instances' @@ -6,9 +8,11 @@ Puppet::Type.type(:mysql_datadir).provid # Make sure we find mysqld on CentOS and mysql_install_db on Gentoo and Solaris 11 ENV['PATH'] = [ - ENV['PATH'], + ENV.fetch('PATH', nil), '/usr/libexec', '/usr/share/mysql/scripts', + '/opt/rh/rh-mysql80/root/usr/bin', + '/opt/rh/rh-mysql80/root/usr/libexec', '/opt/rh/rh-mysql57/root/usr/bin', '/opt/rh/rh-mysql57/root/usr/libexec', '/opt/rh/rh-mysql56/root/usr/bin', @@ -17,6 +21,10 @@ Puppet::Type.type(:mysql_datadir).provid '/opt/rh/rh-mariadb101/root/usr/libexec', '/opt/rh/rh-mariadb100/root/usr/bin', '/opt/rh/rh-mariadb100/root/usr/libexec', + '/opt/rh/rh-mariadb102/root/usr/bin', + '/opt/rh/rh-mariadb102/root/usr/libexec', + '/opt/rh/rh-mariadb103/root/usr/bin', + '/opt/rh/rh-mariadb103/root/usr/libexec', '/opt/rh/mysql55/root/usr/bin', '/opt/rh/mysql55/root/usr/libexec', '/opt/rh/mariadb55/root/usr/bin', @@ -39,9 +47,8 @@ Puppet::Type.type(:mysql_datadir).provid log_error = @resource.value(:log_error) || '/var/tmp/mysqld_initialize.log' # rubocop:enable Lint/UselessAssignment unless defaults_extra_file.nil? - unless File.exist?(defaults_extra_file) - raise ArgumentError, _('Defaults-extra-file %{file} is missing.') % { file: defaults_extra_file } - end + raise ArgumentError, _('Defaults-extra-file %{file} is missing.') % { file: defaults_extra_file } unless File.exist?(defaults_extra_file) + defaults_extra_file = "--defaults-extra-file=#{defaults_extra_file}" end @@ -57,10 +64,7 @@ Puppet::Type.type(:mysql_datadir).provid opts << "--#{opt}=#{val}" unless val.nil? end - if mysqld_version.nil? - debug("Installing MySQL data directory with mysql_install_db #{opts.compact.join(' ')}") - mysql_install_db(opts.compact) - elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') + if !mysqld_version.nil? && newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') opts << "--log-error=#{log_error}" opts << initialize.to_s debug("Initializing MySQL data directory >= 5.7.6 with mysqld: #{opts.compact.join(' ')}") diff -pruN 8.1.0-7/lib/puppet/provider/mysql_grant/mysql.rb 15.0.0-3/lib/puppet/provider/mysql_grant/mysql.rb --- 8.1.0-7/lib/puppet/provider/mysql_grant/mysql.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_grant/mysql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) Puppet::Type.type(:mysql_grant).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'Set grants for users in MySQL.' @@ -5,7 +7,7 @@ Puppet::Type.type(:mysql_grant).provide( commands mysql_raw: 'mysql' def self.instances - instances = [] + instance_configs = {} users.map do |user| user_string = cmd_user(user) query = "SHOW GRANTS FOR #{user_string};" @@ -17,7 +19,8 @@ Puppet::Type.type(:mysql_grant).provide( # Default root user created by mysql_install_db on a host with fqdn # of myhost.mydomain.my: root@myhost.mydomain.my, when MySQL is started # with --skip-name-resolve. - next if e.inspect =~ %r{There is no such grant defined for user} + next if e.inspect.include?('There is no such grant defined for user') + raise Puppet::Error, _('#mysql had an error -> %{inspect}') % { inspect: e.inspect } end # Once we have the list of grants generate entries for each. @@ -26,6 +29,7 @@ Puppet::Type.type(:mysql_grant).provide( munged_grant = grant.delete("'").delete('`').delete('"') # Matching: GRANT (SELECT, UPDATE) PRIVILEGES ON (*.*) TO ('root')@('127.0.0.1') (WITH GRANT OPTION) next unless match = munged_grant.match(%r{^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)?$}) # rubocop:disable Lint/AssignmentInCondition + privileges, table, user, host, rest = match.captures table.gsub!('\\\\', '\\') @@ -36,7 +40,7 @@ Puppet::Type.type(:mysql_grant).provide( # split and sort the column_privileges in the parentheses and rejoin if priv.include?('(') type, col = priv.strip.split(%r{\s+|\b}, 2) - type.upcase + ' (' + col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ') + ')' + "#{type.upcase} (#{col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ')})" else # Once we split privileges up on the , we need to make sure we # shortern ALL PRIVILEGES to just all. @@ -44,7 +48,7 @@ Puppet::Type.type(:mysql_grant).provide( end end # Same here, but to remove OPTION leaving just GRANT. - options = if rest =~ %r{WITH\sGRANT\sOPTION} + options = if %r{WITH\sGRANT\sOPTION}.match?(rest) ['GRANT'] else ['NONE'] @@ -52,22 +56,60 @@ Puppet::Type.type(:mysql_grant).provide( # fix double backslash that MySQL prints, so resources match table.gsub!('\\\\', '\\') # We need to return an array of instances so capture these - instances << new( - name: "#{user}@#{host}/#{table}", - ensure: :present, - privileges: stripped_privileges.sort, + name = "#{user}@#{host}/#{table}" + if instance_configs.key?(name) + instance_config = instance_configs[name] + stripped_privileges.concat instance_config[:privileges] + options.concat instance_config[:options] + end + + sorted_privileges = stripped_privileges.uniq.sort + mysql_v8_privileges = ['ALTER', 'ALTER ROUTINE', 'CREATE', 'CREATE ROLE', 'CREATE ROUTINE', 'CREATE TABLESPACE', 'CREATE TEMPORARY TABLES', 'CREATE USER', + 'CREATE VIEW', 'DELETE', 'DROP', 'DROP ROLE', 'EVENT', 'EXECUTE', 'FILE', 'INDEX', 'INSERT', 'LOCK TABLES', 'PROCESS', 'REFERENCES', + 'RELOAD', 'REPLICATION CLIENT', 'REPLICATION SLAVE', 'SELECT', 'SHOW DATABASES', 'SHOW VIEW', 'SHUTDOWN', 'SUPER', 'TRIGGER', + 'UPDATE'] + # The following two compare blocks are a workaround for issue #1474. + mysql_pre_v8_privileges_one = ['ALL', 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ABORT_EXEMPT', 'AUDIT_ADMIN', 'AUTHENTICATION_POLICY_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', + 'BINLOG_ENCRYPTION_ADMIN', 'CLONE_ADMIN', 'CONNECTION_ADMIN', 'ENCRYPTION_KEY_ADMIN', 'FLUSH_OPTIMIZER_COSTS', 'FLUSH_STATUS', + 'FLUSH_TABLES', 'FLUSH_USER_RESOURCES', 'GROUP_REPLICATION_ADMIN', 'GROUP_REPLICATION_STREAM', 'INNODB_REDO_LOG_ARCHIVE', + 'INNODB_REDO_LOG_ENABLE', 'PASSWORDLESS_USER_ADMIN', 'PERSIST_RO_VARIABLES_ADMIN', 'REPLICATION_APPLIER', 'REPLICATION_SLAVE_ADMIN', + 'RESOURCE_GROUP_ADMIN', 'RESOURCE_GROUP_USER', 'ROLE_ADMIN', 'SERVICE_CONNECTION_ADMIN', 'SESSION_VARIABLES_ADMIN', 'SET_USER_ID', + 'SHOW_ROUTINE', 'SYSTEM_USER', 'SYSTEM_VARIABLES_ADMIN', 'TABLE_ENCRYPTION_ADMIN', 'XA_RECOVER_ADMIN'] + mysql_pre_v8_privileges_two = ['ALL', 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ABORT_EXEMPT', 'AUDIT_ADMIN', 'AUTHENTICATION_POLICY_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', + 'BINLOG_ENCRYPTION_ADMIN', 'CLONE_ADMIN', 'CONNECTION_ADMIN', 'ENCRYPTION_KEY_ADMIN', 'FLUSH_OPTIMIZER_COSTS', 'FLUSH_STATUS', + 'FLUSH_TABLES', 'FLUSH_USER_RESOURCES', 'GROUP_REPLICATION_ADMIN', 'GROUP_REPLICATION_STREAM', 'INNODB_REDO_LOG_ARCHIVE', + 'INNODB_REDO_LOG_ENABLE', 'PASSWORDLESS_USER_ADMIN', 'PERSIST_RO_VARIABLES_ADMIN', 'REPLICATION_APPLIER', 'REPLICATION_SLAVE_ADMIN', + 'RESOURCE_GROUP_ADMIN', 'RESOURCE_GROUP_USER', 'ROLE_ADMIN', 'SENSITIVE_VARIABLES_OBSERVER', 'SERVICE_CONNECTION_ADMIN', + 'SESSION_VARIABLES_ADMIN', 'SET_USER_ID', 'SHOW_ROUTINE', 'SYSTEM_USER', 'SYSTEM_VARIABLES_ADMIN', 'TABLE_ENCRYPTION_ADMIN', 'XA_RECOVER_ADMIN'] + if (newer_than('mysql' => '8.0.0') && sorted_privileges == mysql_v8_privileges) || sorted_privileges == mysql_pre_v8_privileges_one || sorted_privileges == mysql_pre_v8_privileges_two + sorted_privileges = ['ALL'] + end + + instance_configs[name] = { + privileges: sorted_privileges, table: table, user: "#{user}@#{host}", - options: options, - ) + options: options.uniq + } end end + instances = [] + instance_configs.map do |name, config| + instances << new( + name: name, + ensure: :present, + privileges: config[:privileges], + table: config[:table], + user: config[:user], + options: config[:options], + ) + end instances end def self.prefetch(resources) users = instances - resources.keys.each do |name| + resources.each_key do |name| if provider = users.find { |user| user.name == name } # rubocop:disable Lint/AssignmentInCondition resources[name].provider = provider end @@ -79,9 +121,9 @@ Puppet::Type.type(:mysql_grant).provide( priv_string = self.class.cmd_privs(privileges) table_string = privileges.include?('PROXY') ? self.class.cmd_user(table) : self.class.cmd_table(table) query = "GRANT #{priv_string}" - query << " ON #{table_string}" - query << " TO #{user_string}" - query << self.class.cmd_options(options) unless options.nil? + query += " ON #{table_string}" + query += " TO #{user_string}" + query += self.class.cmd_options(options) unless options.nil? self.class.mysql_caller(query, 'system') end @@ -156,12 +198,8 @@ Puppet::Type.type(:mysql_grant).provide( def privileges=(privileges) diff = diff_privileges(@property_hash[:privileges], privileges) - unless diff[:revoke].empty? - revoke(@property_hash[:user], @property_hash[:table], diff[:revoke]) - end - unless diff[:grant].empty? - grant(@property_hash[:user], @property_hash[:table], diff[:grant], @property_hash[:options]) - end + revoke(@property_hash[:user], @property_hash[:table], diff[:revoke]) unless diff[:revoke].empty? + grant(@property_hash[:user], @property_hash[:table], diff[:grant], @property_hash[:options]) unless diff[:grant].empty? @property_hash[:privileges] = privileges self.privileges end diff -pruN 8.1.0-7/lib/puppet/provider/mysql_login_path/inifile.rb 15.0.0-3/lib/puppet/provider/mysql_login_path/inifile.rb --- 8.1.0-7/lib/puppet/provider/mysql_login_path/inifile.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_login_path/inifile.rb 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,646 @@ +# frozen_string_literal: true + +# See: https://github.com/puppetlabs/puppet/blob/main/lib/puppet/util/inifile.rb +# This class represents the INI file and can be used to parse, modify, +# and write INI files. +class Puppet::Provider::MysqlLoginPath::IniFile < Puppet::Provider + include Enumerable + + class Error < StandardError; end + # VERSION = '3.0.0' + + # Public: Open an INI file and load the contents. + # + # filename - The name of the file as a String + # opts - The Hash of options (default: {}) + # :comment - String containing the comment character(s) + # :parameter - String used to separate parameter and value + # :encoding - Encoding String for reading / writing + # :default - The String name of the default global section + # + # Examples + # + # IniFile.load('file.ini') + # #=> IniFile instance + # + # IniFile.load('does/not/exist.ini') + # #=> nil + # + # Returns an IniFile instance or nil if the file could not be opened. + def self.load(filename, opts = {}) + return unless File.file? filename + + new(opts.merge(filename: filename)) + end + + # Get and set the filename + attr_accessor :filename + + # Get and set the encoding + attr_accessor :encoding + + # Public: Create a new INI file from the given set of options. If :content + # is provided then it will be used to populate the INI file. If a :filename + # is provided then the contents of the file will be parsed and stored in the + # INI file. If neither the :content or :filename is provided then an empty + # INI file is created. + # + # opts - The Hash of options (default: {}) + # :content - The String/Hash containing the INI contents + # :comment - String containing the comment character(s) + # :parameter - String used to separate parameter and value + # :encoding - Encoding String for reading / writing + # :default - The String name of the default global section + # :filename - The filename as a String + # + # Examples + # + # IniFile.new + # #=> an empty IniFile instance + # + # IniFile.new( :content => "[global]\nfoo=bar" ) + # #=> an IniFile instance + # + # IniFile.new( :filename => 'file.ini', :encoding => 'UTF-8' ) + # #=> an IniFile instance + # + # IniFile.new( :content => "[global]\nfoo=bar", :comment => '#' ) + # #=> an IniFile instance + # + def initialize(opts = {}) + super + + @comment = opts.fetch(:comment, ';#') + @param = opts.fetch(:parameter, '=') + @encoding = opts.fetch(:encoding, nil) + @default = opts.fetch(:default, 'global') + @filename = opts.fetch(:filename, nil) + content = opts.fetch(:content, nil) + + @ini = Hash.new { |h, k| h[k] = {} } + + if content.is_a?(Hash) then merge!(content) + elsif content then parse(content) + elsif @filename then read + end + end + + # Public: Write the contents of this IniFile to the file system. If left + # unspecified, the currently configured filename and encoding will be used. + # Otherwise the filename and encoding can be specified in the options hash. + # + # opts - The default options Hash + # :filename - The filename as a String + # :encoding - The encoding as a String + # + # Returns this IniFile instance. + def write(opts = {}) + filename = opts.fetch(:filename, @filename) + encoding = opts.fetch(:encoding, @encoding) + mode = encoding ? "w:#{encoding}" : 'w' + + File.open(filename, mode) do |f| + @ini.each do |section, hash| + f.puts "[#{section}]" + hash.each { |param, val| f.puts "#{param} #{@param} #{escape_value val}" } + f.puts + end + end + + self + end + alias save write + + # Public: Read the contents of the INI file from the file system and replace + # and set the state of this IniFile instance. If left unspecified the + # currently configured filename and encoding will be used when reading from + # the file system. Otherwise the filename and encoding can be specified in + # the options hash. + # + # opts - The default options Hash + # :filename - The filename as a String + # :encoding - The encoding as a String + # + # Returns this IniFile instance if the read was successful; nil is returned + # if the file could not be read. + def read(opts = {}) + filename = opts.fetch(:filename, @filename) + encoding = opts.fetch(:encoding, @encoding) + return unless File.file? filename + + mode = encoding ? "r:#{encoding}" : 'r' + File.open(filename, mode) { |fd| parse fd } + self + end + alias restore read + + # Returns this IniFile converted to a String. + def to_s + s = [] + @ini.each do |section, hash| + s << "[#{section}]" + hash.each { |param, val| s << "#{param} #{@param} #{escape_value val}" } + s << '' + end + s.join("\n") + end + + # Returns this IniFile converted to a Hash. + def to_h + @ini.dup + end + + # Public: Creates a copy of this inifile with the entries from the + # other_inifile merged into the copy. + # + # other - The other IniFile. + # + # Returns a new IniFile. + def merge(other) + dup.merge!(other) + end + + # Public: Merges other_inifile into this inifile, overwriting existing + # entries. Useful for having a system inifile with user overridable settings + # elsewhere. + # + # other - The other IniFile. + # + # Returns this IniFile. + def merge!(other) + return self if other.nil? + + my_keys = @ini.keys + other_keys = case other + when IniFile + other.instance_variable_get(:@ini).keys + when Hash + other.keys + else + raise Error, "cannot merge contents from '#{other.class.name}'" + end + + (my_keys & other_keys).each do |key| + case other[key] + when Hash + @ini[key].merge!(other[key]) + when nil + nil + else + raise Error, "cannot merge section #{key.inspect} - unsupported type: #{other[key].class.name}" + end + end + + (other_keys - my_keys).each do |key| + @ini[key] = case other[key] + when Hash + other[key].dup + when nil + {} + else + raise Error, "cannot merge section #{key.inspect} - unsupported type: #{other[key].class.name}" + end + end + + self + end + + # Public: Yield each INI file section, parameter, and value in turn to the + # given block. + # + # block - The block that will be iterated by the each method. The block will + # be passed the current section and the parameter/value pair. + # + # Examples + # + # inifile.each do |section, parameter, value| + # puts "#{parameter} = #{value} [in section - #{section}]" + # end + # + # Returns this IniFile. + def each + return unless block_given? + + @ini.each do |section, hash| + hash.each do |param, val| + yield section, param, val + end + end + self + end + + # Public: Yield each section in turn to the given block. + # + # block - The block that will be iterated by the each method. The block will + # be passed the current section as a Hash. + # + # Examples + # + # inifile.each_section do |section| + # puts section.inspect + # end + # + # Returns this IniFile. + def each_section(&block) + return unless block + + @ini.each_key(&block) + self + end + + # Public: Remove a section identified by name from the IniFile. + # + # section - The section name as a String. + # + # Returns the deleted section Hash. + def delete_section(section) + @ini.delete section.to_s + end + + # Public: Get the section Hash by name. If the section does not exist, then + # it will be created. + # + # section - The section name as a String. + # + # Examples + # + # inifile['global'] + # #=> global section Hash + # + # Returns the Hash of parameter/value pairs for this section. + def [](section) + return nil if section.nil? + + @ini[section.to_s] + end + + # Public: Set the section to a hash of parameter/value pairs. + # + # section - The section name as a String. + # value - The Hash of parameter/value pairs. + # + # Examples + # + # inifile['tenderloin'] = { 'gritty' => 'yes' } + # #=> { 'gritty' => 'yes' } + # + # Returns the value Hash. + def []=(section, value) + @ini[section.to_s] = value + end + + # Public: Create a Hash containing only those INI file sections whose names + # match the given regular expression. + # + # regex - The Regexp used to match section names. + # + # Examples + # + # inifile.match(/^tree_/) + # #=> Hash of matching sections + # + # Return a Hash containing only those sections that match the given regular + # expression. + def match(regex) + @ini.dup.delete_if { |section, _| section !~ regex } + end + + # Public: Check to see if the IniFile contains the section. + # + # section - The section name as a String. + # + # Returns true if the section exists in the IniFile. + def section?(section) + @ini.key? section.to_s + end + + # Returns an Array of section names contained in this IniFile. + def sections + @ini.keys + end + + # Public: Freeze the state of this IniFile object. Any attempts to change + # the object will raise an error. + # + # Returns this IniFile. + def freeze + super + @ini.each_value(&:freeze) + @ini.freeze + self + end + + # Public: Mark this IniFile as tainted -- this will traverse each section + # marking each as tainted. + # + # Returns this IniFile. + def taint + super + @ini.each_value(&:taint) + @ini.taint + self + end + + # Public: Produces a duplicate of this IniFile. The duplicate is independent + # of the original -- i.e. the duplicate can be modified without changing the + # original. The tainted state of the original is copied to the duplicate. + # + # Returns a new IniFile. + def dup + other = super + other.instance_variable_set(:@ini, Hash.new { |h, k| h[k] = {} }) + @ini.each_pair { |s, h| other[s].merge! h } + other.taint if tainted? + other + end + + # Public: Produces a duplicate of this IniFile. The duplicate is independent + # of the original -- i.e. the duplicate can be modified without changing the + # original. The tainted state and the frozen state of the original is copied + # to the duplicate. + # + # Returns a new IniFile. + def clone + other = dup + other.freeze if frozen? + other + end + + # Public: Compare this IniFile to some other IniFile. For two INI files to + # be equivalent, they must have the same sections with the same parameter / + # value pairs in each section. + # + # other - The other IniFile. + # + # Returns true if the INI files are equivalent and false if they differ. + def eql?(other) + return true if equal? other + return false unless other.instance_of? self.class + + @ini == other.instance_variable_get(:@ini) + end + alias == eql? + + # Escape special characters. + # + # value - The String value to escape. + # + # Returns the escaped value. + def escape_value(value) + value = value.to_s.dup + value.gsub!(%r{\\([0nrt])}, '\\\\\1') + value.gsub!(%r{\n}, '\n') + value.gsub!(%r{\r}, '\r') + value.gsub!(%r{\t}, '\t') + value.gsub!(%r{\0}, '\0') + value + end + + # Parse the given content and store the information in this IniFile + # instance. All data will be cleared out and replaced with the information + # read from the content. + # + # content - A String or a file descriptor (must respond to `each_line`) + # + # Returns this IniFile. + def parse(content) + parser = Parser.new(@ini, @param, @comment, @default) + parser.parse(content) + self + end + + # The IniFile::Parser has the responsibility of reading the contents of an + # .ini file and storing that information into a ruby Hash. The object being + # parsed must respond to `each_line` - this includes Strings and any IO + # object. + class Parser + attr_writer :section + attr_accessor :property, :value + + # Create a new IniFile::Parser that can be used to parse the contents of + # an .ini file. + # + # hash - The Hash where parsed information will be stored + # param - String used to separate parameter and value + # comment - String containing the comment character(s) + # default - The String name of the default global section + # + def initialize(hash, param, comment, default) + @hash = hash + @default = default + + comment = comment.to_s.empty? ? '\\z' : "\\s*(?:[#{comment}].*)?\\z" + + @section_regexp = %r{\A\s*\[([^\]]+)\]#{comment}} + @ignore_regexp = %r{\A#{comment}} + @property_regexp = %r{\A(.*?)(? true + # "false" --> false + # "" --> nil + # "42" --> 42 + # "3.14" --> 3.14 + # "foo" --> "foo" + # + # Returns the typecast value. + def typecast(value) + case value + when %r{\Atrue\z}i then true + when %r{\Afalse\z}i then false + when %r{\A\s*\z}i then nil + else + begin + begin + Integer(value) + rescue StandardError + Float(value) + end + rescue StandardError + unescape_value(value) + end + end + end + + # Unescape special characters found in the value string. This will convert + # escaped null, tab, carriage return, newline, and backslash into their + # literal equivalents. + # + # value - The String value to unescape. + # + # Returns the unescaped value. + def unescape_value(value) + value = value.to_s + value.gsub!(%r{\\[0nrt\\]}) do |char| + case char + when '\0' then "\0" + when '\n' then "\n" + when '\r' then "\r" + when '\t' then "\t" + when '\\\\' then '\\' + end + end + value + end + end +end diff -pruN 8.1.0-7/lib/puppet/provider/mysql_login_path/mysql_login_path.rb 15.0.0-3/lib/puppet/provider/mysql_login_path/mysql_login_path.rb --- 8.1.0-7/lib/puppet/provider/mysql_login_path/mysql_login_path.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_login_path/mysql_login_path.rb 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,162 @@ +# frozen_string_literal: true + +require File.expand_path(File.join(File.dirname(__FILE__), 'inifile')) +require File.expand_path(File.join(File.dirname(__FILE__), 'sensitive')) +require 'puppet/resource_api/simple_provider' +require 'puppet/util/execution' +require 'puppet/util/suidmanager' +require 'open3' +require 'pty' +require 'expect' +require 'fileutils' +require 'English' + +# Implementation for the mysql_login_path type using the Resource API. +class Puppet::Provider::MysqlLoginPath::MysqlLoginPath < Puppet::ResourceApi::SimpleProvider + def get_homedir(_context, uid) + result = Puppet::Util::Execution.execute(['/usr/bin/getent', 'passwd', uid], failonfail: true) + result.split(':')[5] + end + + def mysql_config_editor_set_cmd(context, uid, password = nil, *args) + args.unshift('/usr/bin/mysql_config_editor') + homedir = get_homedir(context, uid) + login_file_path = "#{homedir}/.mylogin.cnf" + + if args.is_a?(Array) + command = args.flatten.map(&:to_s) + command_str = command.join(' ') + elsif args.is_a?(String) + command_str = command + end + + begin + Puppet::Util::SUIDManager.asuser(uid) do + FileUtils.touch login_file_path + FileUtils.chmod 0o600, login_file_path + end + + PTY.spawn({ 'HOME' => homedir }, command_str) do |input, output, _pid| + if password + input.expect(%r{Enter password:}) + output.puts password + end + end + rescue StandardError => e + raise Puppet::ExecutionFailure, _( + "Execution of '%{str}' returned %{exit_status}: %{output}", + ) % { + str: command_str, + exit_status: $CHILD_STATUS.exitstatus, + output: e.message + } + end + end + + def mysql_config_editor_cmd(context, uid, *args) + args.unshift('/usr/bin/mysql_config_editor') + homedir = get_homedir(context, uid) + Puppet::Util::Execution.execute( + args, + failonfail: true, + uid: uid, + custom_environment: { 'HOME' => homedir }, + ) + end + + def my_print_defaults_cmd(context, uid, *args) + args.unshift('/usr/bin/my_print_defaults') + homedir = get_homedir(context, uid) + Puppet::Util::Execution.execute( + args, + failonfail: true, + uid: uid, + custom_environment: { 'HOME' => homedir }, + ) + end + + def get_password(context, uid, name) + result = '' + output = my_print_defaults_cmd(context, uid, '-s', name) + output.split("\n").each do |line| + result = line.sub(%r{--password=}, '') if line.include?('--password') + end + result + end + + def save_login_path(context, name, should) + uid = name.fetch(:owner) + + args = ['set', '--skip-warn'] + args.push('-G', should[:name].to_s) if should[:name] + args.push('-h', should[:host].to_s) if should[:host] + args.push('-u', should[:user].to_s) if should[:user] + args.push('-S', should[:socket].to_s) if should[:socket] + args.push('-P', should[:port].to_s) if should[:port] + args.push('-p') if should[:password] && extract_pw(should[:password]) + password = (should[:password] && extract_pw(should[:password])) ? extract_pw(should[:password]) : nil + + mysql_config_editor_set_cmd(context, uid, password, args) + end + + def delete_login_path(context, name) + login_path = name.fetch(:name) + uid = name.fetch(:owner) + mysql_config_editor_cmd(context, uid, 'remove', '-G', login_path) + end + + def gen_pw(password) + Puppet::Provider::MysqlLoginPath::Sensitive.new(password) + end + + def extract_pw(sensitive) + sensitive.unwrap + end + + def list_login_paths(context, uid) + result = [] + output = mysql_config_editor_cmd(context, uid, 'print', '--all') + ini = Puppet::Provider::MysqlLoginPath::IniFile.new(content: output) + ini.each_section do |section| + result.push(ensure: 'present', + name: section, + owner: uid.to_s, + title: "#{section}-#{uid}", + host: ini[section]['host'].nil? ? nil : ini[section]['host'], + user: ini[section]['user'].nil? ? nil : ini[section]['user'], + password: ini[section]['password'].nil? ? nil : gen_pw(get_password(context, uid, section)), + socket: ini[section]['socket'].nil? ? nil : ini[section]['socket'], + port: ini[section]['port'].nil? ? nil : ini[section]['port']) + end + result + end + + def get(context, name) + result = [] + owner = name.empty? ? ['root'] : name.filter_map { |item| item[:owner] }.uniq + owner.each do |uid| + login_paths = list_login_paths(context, uid) + result += login_paths + end + result + end + + def create(context, name, should) + save_login_path(context, name, should) + end + + def update(context, name, should) + delete_login_path(context, name) + save_login_path(context, name, should) + end + + def delete(context, name) + delete_login_path(context, name) + end + + def canonicalize(_context, resources) + resources.each do |r| + r[:password] = gen_pw(extract_pw(r[:password])) if r.key?(:password) && r[:password].is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive) + end + end +end diff -pruN 8.1.0-7/lib/puppet/provider/mysql_login_path/sensitive.rb 15.0.0-3/lib/puppet/provider/mysql_login_path/sensitive.rb --- 8.1.0-7/lib/puppet/provider/mysql_login_path/sensitive.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_login_path/sensitive.rb 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +# A Puppet Language type that makes the Sensitive Type comparable +# +class Puppet::Provider::MysqlLoginPath::Sensitive < Puppet::Pops::Types::PSensitiveType::Sensitive + def ==(other) + return true if other.is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive) && unwrap == other.unwrap + end + + def encode_with(coder) + coder.tag = nil + coder.scalar = 'Puppet::Provider::MysqlLoginPath::Sensitive <>' + end +end diff -pruN 8.1.0-7/lib/puppet/provider/mysql_plugin/mysql.rb 15.0.0-3/lib/puppet/provider/mysql_plugin/mysql.rb --- 8.1.0-7/lib/puppet/provider/mysql_plugin/mysql.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_plugin/mysql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) Puppet::Type.type(:mysql_plugin).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'Manages MySQL plugins.' @@ -17,7 +19,7 @@ Puppet::Type.type(:mysql_plugin).provide # the contents of the property_hash generated by self.instances def self.prefetch(resources) plugins = instances - resources.keys.each do |plugin| + resources.each_key do |plugin| if provider = plugins.find { |pl| pl.name == plugin } # rubocop:disable Lint/AssignmentInCondition resources[plugin].provider = provider end @@ -27,7 +29,7 @@ Puppet::Type.type(:mysql_plugin).provide def create # Use plugin_name.so as soname if it's not specified. This won't work on windows as # there it should be plugin_name.dll - @resource[:soname].nil? ? (soname = @resource[:name] + '.so') : (soname = @resource[:soname]) + @resource[:soname].nil? ? (soname = "#{@resource[:name]}.so") : (soname = @resource[:soname]) self.class.mysql_caller("install plugin #{@resource[:name]} soname '#{soname}'", 'regular') @property_hash[:ensure] = :present diff -pruN 8.1.0-7/lib/puppet/provider/mysql_user/mysql.rb 15.0.0-3/lib/puppet/provider/mysql_user/mysql.rb --- 8.1.0-7/lib/puppet/provider/mysql_user/mysql.rb 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/lib/puppet/provider/mysql_user/mysql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'manage users for a mysql database.' @@ -10,20 +12,27 @@ Puppet::Type.type(:mysql_user).provide(: # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. users.map do |name| - if mysqld_version.nil? - ## Default ... - # rubocop:disable Metrics/LineLength - query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" - elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.16') + # rubocop:disable Layout/LineLength + if !mysqld_version.nil? && newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, AUTHENTICATION_STRING, PLUGIN FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" + elsif !mysqld_version.nil? && newer_than('mariadb' => '10.1.21') + query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD, PLUGIN, AUTHENTICATION_STRING FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" else query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" end - @max_user_connections, @max_connections_per_hour, @max_queries_per_hour, - @max_updates_per_hour, ssl_type, ssl_cipher, x509_issuer, x509_subject, - @password, @plugin = mysql_caller(query, 'regular').split(%r{\s}) + # rubocop:enable Layout/LineLength + @max_user_connections, @max_connections_per_hour, @max_queries_per_hour, @max_updates_per_hour, ssl_type, ssl_cipher, + x509_issuer, x509_subject, @password, @plugin, @authentication_string = mysql_caller(query, 'regular').chomp.split(%r{\t}) @tls_options = parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject) - # rubocop:enable Metrics/LineLength + if (newer_than('mariadb' => '10.1.21') && (@plugin == 'ed25519' || @plugin == 'mysql_native_password')) || + (newer_than('mariadb' => '10.2.16') && older_than('mariadb' => '10.2.19')) || + (newer_than('mariadb' => '10.3.8') && older_than('mariadb' => '10.3.11')) + # Some auth plugins (e.g. ed25519) use authentication_string + # to store password hash or auth information + # Old mariadb 10.2 or 10.3 store password hash in authentication_string + # https://jira.mariadb.org/browse/MDEV-16238 https://jira.mariadb.org/browse/MDEV-16774 + @password = @authentication_string + end new(name: name, ensure: :present, password_hash: @password, @@ -41,7 +50,7 @@ Puppet::Type.type(:mysql_user).provide(: def self.prefetch(resources) users = instances # rubocop:disable Lint/AssignmentInCondition - resources.keys.each do |name| + resources.each_key do |name| if provider = users.find { |user| user.name == name } resources[name].provider = provider end @@ -60,13 +69,15 @@ Puppet::Type.type(:mysql_user).provide(: max_updates_per_hour = @resource.value(:max_updates_per_hour) || 0 tls_options = @resource.value(:tls_options) || ['NONE'] + password_hash = password_hash.unwrap if password_hash.is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive) + # Use CREATE USER to be compatible with NO_AUTO_CREATE_USER sql_mode # This is also required if you want to specify a authentication plugin if !plugin.nil? - if !password_hash.nil? - self.class.mysql_caller("CREATE USER '#{merged_name}' IDENTIFIED WITH '#{plugin}' AS '#{password_hash}'", 'system') - else + if password_hash.nil? self.class.mysql_caller("CREATE USER '#{merged_name}' IDENTIFIED WITH '#{plugin}'", 'system') + else + self.class.mysql_caller("CREATE USER '#{merged_name}' IDENTIFIED WITH '#{plugin}' AS '#{password_hash}'", 'system') end @property_hash[:ensure] = :present @property_hash[:plugin] = plugin @@ -79,13 +90,13 @@ Puppet::Type.type(:mysql_user).provide(: @property_hash[:ensure] = :present @property_hash[:password_hash] = password_hash end - # rubocop:disable Metrics/LineLength + # rubocop:disable Layout/LineLength if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') self.class.mysql_caller("ALTER USER IF EXISTS '#{merged_name}' WITH MAX_USER_CONNECTIONS #{max_user_connections} MAX_CONNECTIONS_PER_HOUR #{max_connections_per_hour} MAX_QUERIES_PER_HOUR #{max_queries_per_hour} MAX_UPDATES_PER_HOUR #{max_updates_per_hour}", 'system') else self.class.mysql_caller("GRANT USAGE ON *.* TO '#{merged_name}' WITH MAX_USER_CONNECTIONS #{max_user_connections} MAX_CONNECTIONS_PER_HOUR #{max_connections_per_hour} MAX_QUERIES_PER_HOUR #{max_queries_per_hour} MAX_UPDATES_PER_HOUR #{max_updates_per_hour}", 'system') end - # rubocop:enable Metrics/LineLength + # rubocop:enable Layout/LineLength @property_hash[:max_user_connections] = max_user_connections @property_hash[:max_connections_per_hour] = max_connections_per_hour @property_hash[:max_queries_per_hour] = max_queries_per_hour @@ -130,15 +141,29 @@ Puppet::Type.type(:mysql_user).provide(: def password_hash=(string) merged_name = self.class.cmd_user(@resource[:name]) + plugin = @resource.value(:plugin) # We have a fact for the mysql version ... - if mysqld_version.nil? - # default ... if mysqld_version does not work - self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system') - elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') - raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless string =~ %r{^\*|^$} + if !mysqld_version.nil? && newer_than('mariadb' => '10.1.21') && plugin == 'ed25519' + raise ArgumentError, _('ed25519 hash should be 43 bytes long.') unless string.length == 43 + + # ALTER USER statement is only available upstream starting 10.2 + # https://mariadb.com/kb/en/mariadb-1020-release-notes/ + if newer_than('mariadb' => '10.2.0') + sql = "ALTER USER #{merged_name} IDENTIFIED WITH ed25519 AS '#{string}'" + else + concat_name = @resource[:name] + sql = "UPDATE mysql.user SET password = '', plugin = 'ed25519'" + sql += ", authentication_string = '#{string}'" + sql += " where CONCAT(user, '@', host) = '#{concat_name}'; FLUSH PRIVILEGES" + end + self.class.mysql_caller(sql, 'system') + elsif !mysqld_version.nil? && newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless %r{^\*|^$}.match?(string) + self.class.mysql_caller("ALTER USER #{merged_name} IDENTIFIED WITH mysql_native_password AS '#{string}'", 'system') else + # default ... if mysqld_version does not work self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system') end @@ -147,43 +172,64 @@ Puppet::Type.type(:mysql_user).provide(: def max_user_connections=(int) merged_name = self.class.cmd_user(@resource[:name]) - self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_USER_CONNECTIONS #{int}", 'system').chomp - + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + self.class.mysql_caller("ALTER USER #{merged_name} WITH MAX_USER_CONNECTIONS #{int}", 'system').chomp + else + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_USER_CONNECTIONS #{int}", 'system').chomp + end (max_user_connections == int) ? (return true) : (return false) end def max_connections_per_hour=(int) merged_name = self.class.cmd_user(@resource[:name]) - self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}", 'system').chomp - + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + self.class.mysql_caller("ALTER USER #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}", 'system').chomp + else + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}", 'system').chomp + end (max_connections_per_hour == int) ? (return true) : (return false) end def max_queries_per_hour=(int) merged_name = self.class.cmd_user(@resource[:name]) - self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}", 'system').chomp - + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + self.class.mysql_caller("ALTER USER #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}", 'system').chomp + else + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}", 'system').chomp + end (max_queries_per_hour == int) ? (return true) : (return false) end def max_updates_per_hour=(int) merged_name = self.class.cmd_user(@resource[:name]) - self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}", 'system').chomp - + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + self.class.mysql_caller("ALTER USER #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}", 'system').chomp + else + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}", 'system').chomp + end (max_updates_per_hour == int) ? (return true) : (return false) end def plugin=(string) merged_name = self.class.cmd_user(@resource[:name]) - if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') + if newer_than('mariadb' => '10.1.21') && string == 'ed25519' + if newer_than('mariadb' => '10.2.0') + sql = "ALTER USER #{merged_name} IDENTIFIED WITH '#{string}' AS '#{@resource[:password_hash]}'" + else + concat_name = @resource[:name] + sql = "UPDATE mysql.user SET password = '', plugin = '#{string}'" + sql += ", authentication_string = '#{@resource[:password_hash]}'" + sql += " where CONCAT(user, '@', host) = '#{concat_name}'; FLUSH PRIVILEGES" + end + elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') sql = "ALTER USER #{merged_name} IDENTIFIED WITH '#{string}'" - sql << " AS '#{@resource[:password_hash]}'" if string == 'mysql_native_password' + sql += " AS '#{@resource[:password_hash]}'" if string == 'mysql_native_password' else # See https://bugs.mysql.com/bug.php?id=67449 sql = "UPDATE mysql.user SET plugin = '#{string}'" - sql << ((string == 'mysql_native_password') ? ", password = '#{@resource[:password_hash]}'" : ", password = ''") - sql << " WHERE CONCAT(user, '@', host) = '#{@resource[:name]}'" + sql += ((string == 'mysql_native_password') ? ", password = '#{@resource[:password_hash]}'" : ", password = ''") + sql += " WHERE CONCAT(user, '@', host) = '#{@resource[:name]}'" end self.class.mysql_caller(sql, 'system') @@ -203,15 +249,16 @@ Puppet::Type.type(:mysql_user).provide(: end def self.parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject) - if ssl_type == 'ANY' + case ssl_type + when 'ANY' ['SSL'] - elsif ssl_type == 'X509' + when 'X509' ['X509'] - elsif ssl_type == 'SPECIFIED' + when 'SPECIFIED' options = [] - options << "CIPHER #{ssl_cipher}" if !ssl_cipher.nil? && !ssl_cipher.empty? - options << "ISSUER #{x509_issuer}" if !x509_issuer.nil? && !x509_issuer.empty? - options << "SUBJECT #{x509_subject}" if !x509_subject.nil? && !x509_subject.empty? + options << "CIPHER '#{ssl_cipher}'" if !ssl_cipher.nil? && !ssl_cipher.empty? + options << "ISSUER '#{x509_issuer}'" if !x509_issuer.nil? && !x509_issuer.empty? + options << "SUBJECT '#{x509_subject}'" if !x509_subject.nil? && !x509_subject.empty? options else ['NONE'] diff -pruN 8.1.0-7/lib/puppet/type/mysql_database.rb 15.0.0-3/lib/puppet/type/mysql_database.rb --- 8.1.0-7/lib/puppet/type/mysql_database.rb 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/lib/puppet/type/mysql_database.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.newtype(:mysql_database) do @doc = <<-PUPPET @summary diff -pruN 8.1.0-7/lib/puppet/type/mysql_datadir.rb 15.0.0-3/lib/puppet/type/mysql_datadir.rb --- 8.1.0-7/lib/puppet/type/mysql_datadir.rb 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/lib/puppet/type/mysql_datadir.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,10 +1,12 @@ +# frozen_string_literal: true + Puppet::Type.newtype(:mysql_datadir) do @doc = <<-PUPPET @summary Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above). @api private - PUPPET + PUPPET ensurable diff -pruN 8.1.0-7/lib/puppet/type/mysql_grant.rb 15.0.0-3/lib/puppet/type/mysql_grant.rb --- 8.1.0-7/lib/puppet/type/mysql_grant.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/lib/puppet/type/mysql_grant.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,8 +1,10 @@ +# frozen_string_literal: true + Puppet::Type.newtype(:mysql_grant) do @doc = <<-PUPPET @summary Manage a MySQL user's rights. - PUPPET + PUPPET ensurable autorequire(:file) { '/root/.my.cnf' } @@ -14,9 +16,7 @@ Puppet::Type.newtype(:mysql_grant) do # 'ALL'. This can't be done in the munge in the property as that iterates # over the array and there's no way to replace the entire array before it's # returned to the provider. - if self[:ensure] == :present && Array(self[:privileges]).count > 1 && self[:privileges].to_s.include?('ALL') - self[:privileges] = 'ALL' - end + self[:privileges] = 'ALL' if self[:ensure] == :present && Array(self[:privileges]).size > 1 && self[:privileges].to_s.include?('ALL') # Sort the privileges array in order to ensure the comparision in the provider # self.instances method match. Otherwise this causes it to keep resetting the # privileges. @@ -25,21 +25,20 @@ Puppet::Type.newtype(:mysql_grant) do # split and sort the column_privileges in the parentheses and rejoin if priv.include?('(') type, col = priv.strip.split(%r{\s+|\b}, 2) - type.upcase + ' (' + col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ') + ')' + "#{type.upcase} (#{col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ')})" else priv.strip.upcase end - }.uniq.reject { |k| k == 'GRANT' || k == 'GRANT OPTION' }.sort! + }.uniq.reject { |k| ['GRANT', 'GRANT OPTION'].include?(k) }.sort! end # rubocop:enable Style/MultilineBlockChain validate do - raise(_('`privileges` `parameter` is required.')) if self[:ensure] == :present && self[:privileges].nil? - raise(_('`privileges` `parameter`: PROXY can only be specified by itself.')) if Array(self[:privileges]).count > 1 && Array(self[:privileges]).include?('PROXY') - raise(_('`table` `parameter` is required.')) if self[:ensure] == :present && self[:table].nil? - raise(_('`user` `parameter` is required.')) if self[:ensure] == :present && self[:user].nil? - if self[:user] && self[:table] - raise(_('`name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}" - end + raise(_('mysql_grant: `privileges` `parameter` is required.')) if self[:ensure] == :present && self[:privileges].nil? + raise(_('mysql_grant: `privileges` `parameter`: PROXY can only be specified by itself.')) if Array(self[:privileges]).size > 1 && Array(self[:privileges]).include?('PROXY') + raise(_('mysql_grant: `table` `parameter` is required.')) if self[:ensure] == :present && self[:table].nil? + raise(_('mysql_grant: `user` `parameter` is required.')) if self[:ensure] == :present && self[:user].nil? + + raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:user] && self[:table] && (self[:name] != "#{self[:user]}/#{self[:table]}") end newparam(:name, namevar: true) do @@ -55,8 +54,8 @@ Puppet::Type.newtype(:mysql_grant) do validate do |value| mysql_version = Facter.value(:mysql_version) - if value =~ %r{proxy}i && Puppet::Util::Package.versioncmp(mysql_version, '5.5.0') < 0 - raise(ArgumentError, _('PROXY user not supported on mysql versions < 5.5.0. Current version %{version}.') % { version: mysql_version }) + if value =~ %r{proxy}i && Puppet::Util::Package.versioncmp(mysql_version, '5.5.0').negative? + raise(ArgumentError, _('mysql_grant: PROXY user not supported on mysql versions < 5.5.0. Current version %{version}.') % { version: mysql_version }) end end end @@ -65,8 +64,8 @@ Puppet::Type.newtype(:mysql_grant) do desc 'Table to apply privileges to.' validate do |value| - if Array(@resource[:privileges]).include?('PROXY') && !%r{^[0-9a-zA-Z$_]*@[\w%\.:\-\/]*$}.match(value) - raise(ArgumentError, _('`table` `property` for PROXY should be specified as proxy_user@proxy_host.')) + if Array(@resource[:privileges]).include?('PROXY') && !%r{^[0-9a-zA-Z$_]*@[\w%.:\-/]*$}.match(value) + raise(ArgumentError, _('mysql_grant: `table` `property` for PROXY should be specified as proxy_user@proxy_host.')) end end @@ -74,7 +73,7 @@ Puppet::Type.newtype(:mysql_grant) do value.delete('`') end - newvalues(%r{.*\..*}, %r{^[0-9a-zA-Z$_]*@[\w%\.:\-/]*$}) + newvalues(%r{.*\..*}, %r{^[0-9a-zA-Z$_]*@[\w%.:\-/]*$}) end newproperty(:user) do @@ -85,25 +84,22 @@ Puppet::Type.newtype(:mysql_grant) do # http://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions/8057827#8057827 # rubocop:disable Lint/AssignmentInCondition # rubocop:disable Lint/UselessAssignment - if matches = %r{^(['`"])((?!\1).)*\1@([\w%\.:\-/]+)$}.match(value) + if matches = %r{^(['`"])((?!\1).)*\1@([\w%.:\-/]+)$}.match(value) user_part = matches[2] host_part = matches[3] - elsif matches = %r{^([0-9a-zA-Z$_]*)@([\w%\.:\-/]+)$}.match(value) - user_part = matches[1] - host_part = matches[2] - elsif matches = %r{^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$}.match(value) + elsif matches = %r{^([0-9a-zA-Z$_]*)@([\w%.:\-/]+)$}.match(value) || matches = %r{^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$}.match(value) user_part = matches[1] host_part = matches[2] else - raise(ArgumentError, _('Invalid database user %{user}.') % { user: value }) + raise(ArgumentError, _('mysql_grant: Invalid database user %{user}.') % { user: value }) end # rubocop:enable Lint/AssignmentInCondition # rubocop:enable Lint/UselessAssignment mysql_version = Facter.value(:mysql_version) unless mysql_version.nil? - raise(ArgumentError, _('MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8') < 0 && user_part.size > 16 - raise(ArgumentError, _('MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 && user_part.size > 32 - raise(ArgumentError, _('MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') > 0 && user_part.size > 80 + raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8').negative? && user_part.size > 16 + raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').negative? && user_part.size > 32 + raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').positive? && user_part.size > 80 end end diff -pruN 8.1.0-7/lib/puppet/type/mysql_login_path.rb 15.0.0-3/lib/puppet/type/mysql_login_path.rb --- 8.1.0-7/lib/puppet/type/mysql_login_path.rb 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/lib/puppet/type/mysql_login_path.rb 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,83 @@ +# frozen_string_literal: true + +require 'puppet/resource_api' + +Puppet::ResourceApi.register_type( + name: 'mysql_login_path', + + docs: <<-DESCRIPTION, + @summary + Manage a MySQL login path. + @see + https://dev.mysql.com/doc/refman/8.0/en/mysql-config-editor.html + @example + mysql_login_path { 'local_socket': + owner => 'root', + host => 'localhost', + user => 'root', + password => Sensitive('secure'), + socket => '/var/run/mysql/mysql.sock', + ensure => present, + } + + mysql_login_path { 'local_tcp': + owner => 'root', + host => '127.0.0.1', + user => 'root', + password => Sensitive('more_secure'), + port => 3306, + ensure => present, + } + + This type provides Puppet with the capabilities to store authentication credentials in an obfuscated login path file + named .mylogin.cnf created with the mysql_config_editor utility. Supports only MySQL Community Edition > v5.6.6. + DESCRIPTION + features: ['simple_get_filter', 'canonicalize'], + title_patterns: [ + { + pattern: %r{^(?.*[^-])-(?.*)$}, + desc: 'Where the name of the and the owner are provided with a hyphen seperator' + }, + { + pattern: %r{^(?.*)$}, + desc: 'Where only the name is provided' + }, + ], + attributes: { + ensure: { + type: 'Enum[present, absent]', + desc: 'Whether this resource should be present or absent on the target system.' + }, + name: { + type: 'String', + desc: 'Name of the login path you want to manage.', + behaviour: :namevar + }, + owner: { + type: 'String', + desc: 'The user to whom the logon path should belong.', + behaviour: :namevar, + default: 'root' + }, + host: { + type: 'Optional[String]', + desc: 'Host name to be entered into the login path.' + }, + user: { + type: 'Optional[String]', + desc: 'Username to be entered into the login path.' + }, + password: { + type: 'Optional[Sensitive[String[1]]]', + desc: 'Password to be entered into login path' + }, + socket: { + type: 'Optional[String]', + desc: 'Socket path to be entered into login path' + }, + port: { + type: 'Optional[Integer[0,65535]]', + desc: 'Port number to be entered into login path.' + } + }, +) diff -pruN 8.1.0-7/lib/puppet/type/mysql_plugin.rb 15.0.0-3/lib/puppet/type/mysql_plugin.rb --- 8.1.0-7/lib/puppet/type/mysql_plugin.rb 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/lib/puppet/type/mysql_plugin.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.newtype(:mysql_plugin) do @doc = <<-PUPPET @summary diff -pruN 8.1.0-7/lib/puppet/type/mysql_user.rb 15.0.0-3/lib/puppet/type/mysql_user.rb --- 8.1.0-7/lib/puppet/type/mysql_user.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/lib/puppet/type/mysql_user.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,9 +1,11 @@ +# frozen_string_literal: true + # This has to be a separate type to enable collecting Puppet::Type.newtype(:mysql_user) do @doc = <<-PUPPET @summary Manage a MySQL user. This includes management of users password as well as privileges. - PUPPET + PUPPET ensurable @@ -19,13 +21,10 @@ Puppet::Type.newtype(:mysql_user) do mysql_version = Facter.value(:mysql_version) # rubocop:disable Lint/AssignmentInCondition # rubocop:disable Lint/UselessAssignment - if matches = %r{^(['`"])((?:(?!\1).)*)\1@([\w%\.:\-/]+)$}.match(value) + if matches = %r{^(['`"])((?:(?!\1).)*)\1@([\w%.:\-/]+)$}.match(value) user_part = matches[2] host_part = matches[3] - elsif matches = %r{^([0-9a-zA-Z$_]*)@([\w%\.:\-/]+)$}.match(value) - user_part = matches[1] - host_part = matches[2] - elsif matches = %r{^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$}.match(value) + elsif matches = %r{^([0-9a-zA-Z$_]*)@([\w%.:\-/]+)$}.match(value) || matches = %r{^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$}.match(value) user_part = matches[1] host_part = matches[2] else @@ -34,9 +33,9 @@ Puppet::Type.newtype(:mysql_user) do # rubocop:enable Lint/AssignmentInCondition # rubocop:enable Lint/UselessAssignment unless mysql_version.nil? - raise(ArgumentError, _('MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8') < 0 && user_part.size > 16 - raise(ArgumentError, _('MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 && user_part.size > 32 - raise(ArgumentError, _('MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') > 0 && user_part.size > 80 + raise(ArgumentError, _('MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8').negative? && user_part.size > 16 + raise(ArgumentError, _('MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').negative? && user_part.size > 32 + raise(ArgumentError, _('MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').positive? && user_part.size > 80 end end @@ -47,18 +46,18 @@ Puppet::Type.newtype(:mysql_user) do end newproperty(:password_hash) do - desc 'The password hash of the user. Use mysql_password() for creating such a hash.' + desc 'The password hash of the user. Use mysql::password() for creating such a hash.' newvalue(%r{\w*}) def change_to_s(currentvalue, _newvalue) (currentvalue == :absent) ? 'created password' : 'changed password' end - # rubocop:disable Style/PredicateName + # rubocop:disable Naming/PredicateName def is_to_s(_currentvalue) '[old password hash redacted]' end - # rubocop:enable Style/PredicateName + # rubocop:enable Naming/PredicateName def should_to_s(_newvalue) '[new password hash redacted]' @@ -95,9 +94,7 @@ Puppet::Type.newtype(:mysql_user) do validate do |value| value = [value] unless value.is_a?(Array) if value.include?('NONE') || value.include?('SSL') || value.include?('X509') - if value.length > 1 - raise(ArgumentError, _('`tls_options` `property`: The values NONE, SSL and X509 cannot be used with other options, you may only pick one of them.')) - end + raise(ArgumentError, _('`tls_options` `property`: The values NONE, SSL and X509 cannot be used with other options, you may only pick one of them.')) if value.length > 1 else value.each do |opt| o = opt.match(%r{^(CIPHER|ISSUER|SUBJECT)}i) @@ -105,13 +102,13 @@ Puppet::Type.newtype(:mysql_user) do end end end - def insync?(is) + def insync?(insync) # The current value may be nil and we don't # want to call sort on it so make sure we have arrays - if is.is_a?(Array) && @should.is_a?(Array) - is.sort == @should.sort + if insync.is_a?(Array) && @should.is_a?(Array) + insync.sort == @should.sort else - is == @should + insync == @should end end end diff -pruN 8.1.0-7/locales/config.yaml 15.0.0-3/locales/config.yaml --- 8.1.0-7/locales/config.yaml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/locales/config.yaml 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ ---- -# This is the project-specific configuration file for setting up -# fast_gettext for your project. -gettext: - # This is used for the name of the .pot and .po files; they will be - # called .pot? - project_name: puppetlabs-mysql - # This is used in comments in the .pot and .po files to indicate what - # project the files belong to and should bea little more desctiptive than - # - package_name: puppetlabs-mysql - # The locale that the default messages in the .pot file are in - default_locale: en - # The email used for sending bug reports. - bugs_address: docs@puppet.com - # The holder of the copyright. - copyright_holder: Puppet, Inc. - # This determines which comments in code should be eligible for translation. - # Any comments that start with this string will be externalized. (Leave - # empty to include all.) - comments_tag: TRANSLATOR - # Patterns for +Dir.glob+ used to find all files that might contain - # translatable content, relative to the project root directory - source_files: - - './lib/**/*.rb' - diff -pruN 8.1.0-7/locales/ja/puppetlabs-mysql.po 15.0.0-3/locales/ja/puppetlabs-mysql.po --- 8.1.0-7/locales/ja/puppetlabs-mysql.po 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/locales/ja/puppetlabs-mysql.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-06T16:20:13+01:00\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Kojima Ai , 2017\n" -"Language-Team: Japanese (Japan) (https://www.transifex.com/puppet/teams/29089/ja_JP/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ja_JP\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Translate Toolkit 2.0.0\n" - -#. ./manifests/bindings/client_dev.pp:12 -msgid "No MySQL client development package configured for %{os}." -msgstr "%{os}å‘ã‘ã«è¨­å®šã•ã‚ŒãŸMySQLクライアント開発パッケージã¯ã‚ã‚Šã¾ã›ã‚“。" - -#. ./manifests/bindings/daemon_dev.pp:12 -msgid "No MySQL daemon development package configured for %{os}." -msgstr "%{os}å‘ã‘ã«è¨­å®šã•ã‚ŒãŸMySQLデーモン開発パッケージã¯ã‚ã‚Šã¾ã›ã‚“。" - -#. ./manifests/bindings.pp:38 -msgid "" -"::mysql::bindings::java cannot be managed by puppet on %{osfamily} as it is " -"not in official repositories. Please disable java mysql binding." -msgstr "" -"::mysql::bindings::javaã¯ã€å…¬å¼ãªãƒªãƒã‚¸ãƒˆãƒªã§ã¯ãªã%{osfamily}ã«ã‚ã‚‹ãã®ã¾ã¾ã®çŠ¶æ…‹ã§ã¯ã€Puppetã«ã‚ˆã‚‹ç®¡ç†ã¯ã§ãã¾ã›ã‚“。java" -" mysqlãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã‚’無効ã«ã—ã¦ãã ã•ã„。" - -#. ./manifests/bindings.pp:40 -msgid "" -"::mysql::bindings::php does not need to be managed by puppet on %{osfamily} " -"as it is included in mysql package by default." -msgstr "" -"::mysql::bindings::phpã¯ã€%{osfamily}上ã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§MySQLパッケージã«å«ã¾ã‚ŒãŸçŠ¶æ…‹ã®ã¾ã¾ã€Puppetã§ç®¡ç†ã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。" - -#. ./manifests/bindings.pp:42 -msgid "" -"::mysql::bindings::ruby cannot be managed by puppet on %{osfamily} as it is " -"not in official repositories. Please disable ruby mysql binding." -msgstr "" -"::mysql::bindings::rubyã¯ã€å…¬å¼ãªãƒªãƒã‚¸ãƒˆãƒªã§ã¯ãªã%{osfamily}ã«ã‚ã‚‹ãã®ã¾ã¾ã®çŠ¶æ…‹ã§ã¯ã€Puppetã«ã‚ˆã‚‹ç®¡ç†ã¯ã§ãã¾ã›ã‚“。ruby" -" mysqlãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã‚’無効ã«ã—ã¦ãã ã•ã„。" - -#. ./manifests/params.pp:124 -msgid "" -"Unsupported platform: puppetlabs-%{module_name} currently doesn't support " -"%{os}." -msgstr "サãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ãƒ—ラットフォーム: puppetlabs-%{module_name}ã¯ã€ç¾åœ¨%{os}をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“" - -#. ./manifests/params.pp:381 -msgid "" -"Unsupported platform: puppetlabs-%{module_name} currently doesn't support " -"%{osfamily} or %{os}." -msgstr "" -"サãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ãƒ—ラットフォーム: " -"puppetlabs-%{module_name}ã¯ã€ç¾åœ¨%{osfamily}ã¾ãŸã¯%{os}をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“" - -#. ./manifests/params.pp:465 -msgid "" -"Unsupported platform: puppetlabs-%{module_name} only supports RedHat 5.0 and" -" beyond." -msgstr "サãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ãƒ—ラットフォーム: puppetlabs-%{module_name}ã¯ã€RedHat 5.0以é™ã®ã¿ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™" - -#. ./manifests/server/backup.pp:28 -msgid "" -"The 'prescript' option is not currently implemented for the %{provider} " -"backup provider." -msgstr "'prescript'オプションã¯ã€ç¾åœ¨ã€%{provider}ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—プロãƒã‚¤ãƒ€å‘ã‘ã«ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。" - -#. ./manifests/server.pp:48 -msgid "" -"The `old_root_password` attribute is no longer used and will be removed in a" -" future release." -msgstr "`old_root_password`属性ã¯å»ƒæ­¢äºˆå®šã§ã‚ã‚Šã€ä»Šå¾Œã®ãƒªãƒªãƒ¼ã‚¹ã§å»ƒæ­¢ã•ã‚Œã¾ã™ã€‚" - -#. metadata.json -#: .summary -msgid "Installs, configures, and manages the MySQL service." -msgstr "MySQLサービスをインストールã€è¨­å®šã€ç®¡ç†ã—ã¾ã™ã€‚" - -#. metadata.json -#: .description -msgid "MySQL module" -msgstr "MySQLモジュール" - -#: ./lib/puppet/parser/functions/mysql_deepmerge.rb:22 -msgid "" -"mysql_deepmerge(): wrong number of arguments (%{args_length}; must be at " -"least 2)" -msgstr "mysql_deepmerge(): 引数ã®æ•°ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“(%{args_length}; 2以上ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™)" - -#: ./lib/puppet/parser/functions/mysql_deepmerge.rb:30 -msgid "" -"mysql_deepmerge: unexpected argument type %{arg_class}, only expects hash " -"arguments." -msgstr "mysql_deepmerge: 予期ã›ã¬å¼•æ•°ã‚¿ã‚¤ãƒ—%{arg_class}ã§ã™ã€‚想定ã•ã‚Œã‚‹å¼•æ•°ã¯ãƒãƒƒã‚·ãƒ¥å¼•æ•°ã®ã¿ã§ã™ã€‚" - -#: ./lib/puppet/parser/functions/mysql_dirname.rb:9 -msgid "" -"mysql_dirname(): Wrong number of arguments given (%{args_length} for 1)" -msgstr "mysql_dirname(): 指定ã•ã‚ŒãŸå¼•æ•°ã®æ•°ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“(%{args_length}ã¯1)" - -#: ./lib/puppet/parser/functions/mysql_password.rb:11 -msgid "" -"mysql_password(): Wrong number of arguments given (%{args_length} for 1)" -msgstr "mysql_password(): 指定ã•ã‚ŒãŸå¼•æ•°ã®æ•°ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“(%{args_length}ã¯1)" - -#: ./lib/puppet/parser/functions/mysql_strip_hash.rb:11 -msgid "mysql_strip_hash(): Requires a hash to work." -msgstr "mysql_strip_hash(): 動作ã™ã‚‹ã«ã¯ãƒãƒƒã‚·ãƒ¥ãŒå¿…è¦ã§ã™ã€‚" - -#: ./lib/puppet/provider/mysql_datadir/mysql.rb:24 -msgid "Defaults-extra-file %{file} is missing." -msgstr "Defaults-extra-file %{file}ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" - -#: ./lib/puppet/provider/mysql_datadir/mysql.rb:59 -msgid "ERROR: `Resource` can not be removed." -msgstr "ERROR: `Resource`を削除ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" - -#: ./lib/puppet/provider/mysql_grant/mysql.rb:19 -msgid "#mysql had an error -> %{inspect}" -msgstr "#mysqlã«ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã—㟠-> %{inspect}" - -#: ./lib/puppet/provider/mysql_user/mysql.rb:125 -msgid "Only mysql_native_password (*ABCD..XXX) hashes are supported." -msgstr "mysql_native_password (*ABCD...XXX)ãƒãƒƒã‚·ãƒ¥ã®ã¿ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:34 -msgid "`privileges` `parameter` is required." -msgstr "`privileges` `parameter`ãŒå¿…è¦ã§ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:35 -msgid "`privileges` `parameter`: PROXY can only be specified by itself." -msgstr "`privileges` `parameter`: PROXYã¯è‡ªèº«ã§æŒ‡å®šã™ã‚‹ã“ã¨ã®ã¿å¯èƒ½ã§ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:36 -msgid "`table` `parameter` is required." -msgstr "`table` `parameter`ãŒå¿…è¦ã§ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:37 -msgid "`user` `parameter` is required." -msgstr "`user` `parameter`ãŒå¿…è¦ã§ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:39 -msgid "`name` `parameter` must match user@host/table format." -msgstr "`name` `parameter`ã¯user@host/tableã®å½¢å¼ã¨ä¸€è‡´ã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:57 -msgid "" -"PROXY user not supported on mysql versions < 5.5.0. Current version " -"%{version}." -msgstr "PROXYユーザã¯mysql 5.5.0以å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³%{version}" - -#: ./lib/puppet/type/mysql_grant.rb:67 -msgid "" -"`table` `property` for PROXY should be specified as proxy_user@proxy_host." -msgstr "PROXYã®`table` `property`ã¯proxy_user@proxy_hostã¨ã—ã¦æŒ‡å®šã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:96 ./lib/puppet/type/mysql_user.rb:29 -msgid "Invalid database user %{user}." -msgstr "無効ãªãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ¦ãƒ¼ã‚¶%{user}" - -#: ./lib/puppet/type/mysql_grant.rb:102 ./lib/puppet/type/mysql_user.rb:34 -msgid "MySQL usernames are limited to a maximum of 16 characters." -msgstr "MySQLユーザåã¯æœ€å¤§16文字ã«åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:103 ./lib/puppet/type/mysql_user.rb:35 -msgid "MySQL usernames are limited to a maximum of 32 characters." -msgstr "MySQLユーザåã¯æœ€å¤§32文字ã«åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ã€‚" - -#: ./lib/puppet/type/mysql_grant.rb:104 ./lib/puppet/type/mysql_user.rb:36 -msgid "MySQL usernames are limited to a maximum of 80 characters." -msgstr "MySQLユーザåã¯æœ€å¤§80文字ã«åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ã€‚" - -#: ./lib/puppet/type/mysql_user.rb:82 -msgid "" -"`tls_options` `property`: The values NONE, SSL and X509 cannot be used with " -"other options, you may only pick one of them." -msgstr "" -"`tls_options` `property`: " -"NONEã€SSLã€X509ã¯ä»–ã®ã‚ªãƒ—ションã¨åŒæ™‚ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。ã„ãšã‚Œã‹1ã¤ã®ã¿é¸æŠžå¯èƒ½ã§ã™ã€‚" - -#: ./lib/puppet/type/mysql_user.rb:87 -msgid "Invalid tls option %{option}." -msgstr "無効ãªtlsオプション%{option}" diff -pruN 8.1.0-7/locales/puppetlabs-mysql.pot 15.0.0-3/locales/puppetlabs-mysql.pot --- 8.1.0-7/locales/puppetlabs-mysql.pot 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/locales/puppetlabs-mysql.pot 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -"Project-Id-Version: puppetlabs-mysql 3.11.0-50-gd122d86\n" -"\n" -"Report-Msgid-Bugs-To: docs@puppet.com\n" -"POT-Creation-Date: 2017-09-14 14:21+0100\n" -"PO-Revision-Date: 2017-09-14 14:21+0100\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -#. metadata.json -#: .summary -msgid "Installs, configures, and manages the MySQL service." -msgstr "" - -#. metadata.json -#: .description -msgid "MySQL module" -msgstr "" - -#. ./manifests/bindings/client_dev.pp:12 -msgid "No MySQL client development package configured for %{os}." -msgstr "" - -#. ./manifests/bindings/daemon_dev.pp:12 -msgid "No MySQL daemon development package configured for %{os}." -msgstr "" - -#. ./manifests/bindings.pp:38 -msgid "" -"::mysql::bindings::java cannot be managed by puppet on %{osfamily} as it is " -"not in official repositories. Please disable java mysql binding." -msgstr "" - -#. ./manifests/bindings.pp:40 -msgid "" -"::mysql::bindings::php does not need to be managed by puppet on %{osfamily} " -"as it is included in mysql package by default." -msgstr "" - -#. ./manifests/bindings.pp:42 -msgid "" -"::mysql::bindings::ruby cannot be managed by puppet on %{osfamily} as it is " -"not in official repositories. Please disable ruby mysql binding." -msgstr "" - -#. ./manifests/params.pp:124 -msgid "" -"Unsupported platform: puppetlabs-%{module_name} currently doesn't support " -"%{os}." -msgstr "" - -#. ./manifests/params.pp:381 -msgid "" -"Unsupported platform: puppetlabs-%{module_name} currently doesn't support " -"%{osfamily} or %{os}." -msgstr "" - -#. ./manifests/params.pp:465 -msgid "" -"Unsupported platform: puppetlabs-%{module_name} only supports RedHat 5.0 and " -"beyond." -msgstr "" - -#. ./manifests/server/backup.pp:28 -msgid "" -"The 'prescript' option is not currently implemented for the %{provider} " -"backup provider." -msgstr "" - -#. ./manifests/server.pp:48 -msgid "" -"The `old_root_password` attribute is no longer used and will be removed in a " -"future release." -msgstr "" - -#: ./lib/puppet/parser/functions/mysql_deepmerge.rb:22 -msgid "" -"mysql_deepmerge(): wrong number of arguments (%{args_length}; must be at " -"least 2)" -msgstr "" - -#: ./lib/puppet/parser/functions/mysql_deepmerge.rb:30 -msgid "" -"mysql_deepmerge: unexpected argument type %{arg_class}, only expects hash " -"arguments." -msgstr "" - -#: ./lib/puppet/parser/functions/mysql_dirname.rb:9 -msgid "mysql_dirname(): Wrong number of arguments given (%{args_length} for 1)" -msgstr "" - -#: ./lib/puppet/parser/functions/mysql_password.rb:11 -msgid "" -"mysql_password(): Wrong number of arguments given (%{args_length} for 1)" -msgstr "" - -#: ./lib/puppet/parser/functions/mysql_strip_hash.rb:11 -msgid "mysql_strip_hash(): Requires a hash to work." -msgstr "" - -#: ./lib/puppet/provider/mysql_datadir/mysql.rb:24 -msgid "Defaults-extra-file %{file} is missing." -msgstr "" - -#: ./lib/puppet/provider/mysql_datadir/mysql.rb:59 -msgid "ERROR: `Resource` can not be removed." -msgstr "" - -#: ./lib/puppet/provider/mysql_grant/mysql.rb:19 -msgid "#mysql had an error -> %{inspect}" -msgstr "" - -#: ./lib/puppet/provider/mysql_user/mysql.rb:125 -msgid "Only mysql_native_password (*ABCD...XXX) hashes are supported." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:34 -msgid "`privileges` `parameter` is required." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:35 -msgid "`privileges` `parameter`: PROXY can only be specified by itself." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:36 -msgid "`table` `parameter` is required." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:37 -msgid "`user` `parameter` is required." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:39 -msgid "`name` `parameter` must match user@host/table format." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:57 -msgid "" -"PROXY user not supported on mysql versions < 5.5.0. Current version " -"%{version}." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:67 -msgid "" -"`table` `property` for PROXY should be specified as proxy_user@proxy_host." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:96 ./lib/puppet/type/mysql_user.rb:29 -msgid "Invalid database user %{user}." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:102 ./lib/puppet/type/mysql_user.rb:34 -msgid "MySQL usernames are limited to a maximum of 16 characters." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:103 ./lib/puppet/type/mysql_user.rb:35 -msgid "MySQL usernames are limited to a maximum of 32 characters." -msgstr "" - -#: ./lib/puppet/type/mysql_grant.rb:104 ./lib/puppet/type/mysql_user.rb:36 -msgid "MySQL usernames are limited to a maximum of 80 characters." -msgstr "" - -#: ./lib/puppet/type/mysql_user.rb:82 -msgid "" -"`tls_options` `property`: The values NONE, SSL and X509 cannot be used with " -"other options, you may only pick one of them." -msgstr "" - -#: ./lib/puppet/type/mysql_user.rb:87 -msgid "Invalid tls option %{option}." -msgstr "" diff -pruN 8.1.0-7/manifests/backup/mysqlbackup.pp 15.0.0-3/manifests/backup/mysqlbackup.pp --- 8.1.0-7/manifests/backup/mysqlbackup.pp 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/manifests/backup/mysqlbackup.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,33 +4,43 @@ # @api private # class mysql::backup::mysqlbackup ( - $backupuser = '', - $backuppassword = '', - $maxallowedpacket = '1M', - $backupdir = '', - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = $mysql::params::root_group, - $backupcompress = true, - $backuprotate = 30, - $backupmethod = '', - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $include_triggers = true, - $include_routines = false, - $ensure = 'present', - $time = ['23', '5'], - $prescript = false, - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', - $optional_args = [], + String $backupuser = '', + Variant[String, Sensitive[String]] $backuppassword = '', + String[1] $maxallowedpacket = '1M', + String $backupdir = '', + String[1] $backupdirmode = '0700', + String[1] $backupdirowner = 'root', + String[1] $backupdirgroup = $mysql::params::root_group, + Boolean $backupcompress = true, + Variant[Integer, String[1]] $backuprotate = 30, + String $backupmethod = '', + Optional[String[1]] $backup_success_file_path = undef, + Boolean $ignore_events = true, + Boolean $delete_before_dump = false, + Array[String[1]] $backupdatabases = [], + Boolean $file_per_database = false, + Boolean $include_triggers = true, + Boolean $include_routines = false, + Enum['present', 'absent'] $ensure = 'present', + Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'], + Variant[Boolean, String[1], Array[String[1]]] $prescript = false, + Variant[Boolean, String[1], Array[String[1]]] $postscript = false, + String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', + Array[String[1]] $optional_args = [], + Boolean $incremental_backups = false, + Boolean $install_cron = true, + Optional[String[1]] $compression_command = undef, + Optional[String[1]] $compression_extension = undef, + Optional[String[1]] $backupmethod_package = undef, ) inherits mysql::params { - + $backuppassword_unsensitive = if $backuppassword =~ Sensitive { + $backuppassword.unwrap + } else { + $backuppassword + } mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql::password($backuppassword), + password_hash => Deferred('mysql::password', [$backuppassword]), require => Class['mysql::server::root_password'], } @@ -43,7 +53,7 @@ class mysql::backup::mysqlbackup ( ensure => $ensure, user => "${backupuser}@localhost", table => '*.*', - privileges => [ 'RELOAD', 'SUPER', 'REPLICATION CLIENT' ], + privileges => ['RELOAD', 'SUPER', 'REPLICATION CLIENT'], require => Mysql_user["${backupuser}@localhost"], } @@ -51,7 +61,7 @@ class mysql::backup::mysqlbackup ( ensure => $ensure, user => "${backupuser}@localhost", table => 'mysql.backup_progress', - privileges => [ 'CREATE', 'INSERT', 'DROP', 'UPDATE' ], + privileges => ['CREATE', 'INSERT', 'DROP', 'UPDATE'], require => Mysql_user["${backupuser}@localhost"], } @@ -59,10 +69,18 @@ class mysql::backup::mysqlbackup ( ensure => $ensure, user => "${backupuser}@localhost", table => 'mysql.backup_history', - privileges => [ 'CREATE', 'INSERT', 'SELECT', 'DROP', 'UPDATE' ], + privileges => ['CREATE', 'INSERT', 'SELECT', 'DROP', 'UPDATE'], require => Mysql_user["${backupuser}@localhost"], } + if $install_cron { + if $facts['os']['family'] == 'RedHat' { + stdlib::ensure_packages('cronie') + } elsif $facts['os']['family'] != 'FreeBSD' { + stdlib::ensure_packages('cron') + } + } + cron { 'mysqlbackup-weekly': ensure => $ensure, command => 'mysqlbackup backup', @@ -90,23 +108,21 @@ class mysql::backup::mysqlbackup ( 'incremental_base' => 'history:last_backup', 'incremental_backup_dir' => $backupdir, 'user' => $backupuser, - 'password' => $backuppassword, - } + 'password' => Deferred('mysql::password', [$backuppassword_unsensitive]), + }, } - $options = $default_options.deep_merge($mysql::server::override_options) + $options = mysql::normalise_and_deepmerge($default_options, $mysql::server::override_options) file { 'mysqlbackup-config-file': path => '/etc/mysql/conf.d/meb.cnf', - content => template('mysql/meb.cnf.erb'), + content => stdlib::deferrable_epp('mysql/meb.cnf.epp', { 'options' => $options }), mode => '0600', } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, } - } diff -pruN 8.1.0-7/manifests/backup/mysqldump.pp 15.0.0-3/manifests/backup/mysqldump.pp --- 8.1.0-7/manifests/backup/mysqldump.pp 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/manifests/backup/mysqldump.pp 2023-06-19 12:29:51.000000000 +0000 @@ -3,45 +3,61 @@ # @api private # class mysql::backup::mysqldump ( - $backupuser = '', - $backuppassword = '', - $backupdir = '', - $maxallowedpacket = '1M', - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = $mysql::params::root_group, - $backupcompress = true, - $backuprotate = 30, - $backupmethod = 'mysqldump', - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $include_triggers = false, - $include_routines = false, - $ensure = 'present', - $time = ['23', '5'], - $prescript = false, - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', - $optional_args = [], + String $backupuser = '', + Variant[String, Sensitive[String]] $backuppassword = '', + String $backupdir = '', + String[1] $maxallowedpacket = '1M', + String[1] $backupdirmode = '0700', + String[1] $backupdirowner = 'root', + String[1] $backupdirgroup = $mysql::params::root_group, + Boolean $backupcompress = true, + Variant[Integer, String[1]] $backuprotate = 30, + String[1] $backupmethod = 'mysqldump', + Optional[String[1]] $backup_success_file_path = undef, + Boolean $ignore_events = true, + Boolean $delete_before_dump = false, + Array[String[1]] $backupdatabases = [], + Boolean $file_per_database = false, + Boolean $include_triggers = false, + Boolean $include_routines = false, + Enum['present', 'absent'] $ensure = 'present', + Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'], + Variant[Boolean, String[1], Array[String[1]]] $prescript = false, + Variant[Boolean, String[1], Array[String[1]]] $postscript = false, + String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', + Array[String[1]] $optional_args = [], + String[1] $mysqlbackupdir_ensure = 'directory', + Optional[String[1]] $mysqlbackupdir_target = undef, + Boolean $incremental_backups = false, + Boolean $install_cron = true, + String[1] $compression_command = 'bzcat -zc', + String[1] $compression_extension = '.bz2', + Optional[String[1]] $backupmethod_package = undef, + Array[String] $excludedatabases = [], ) inherits mysql::params { + $backuppassword_unsensitive = if $backuppassword =~ Sensitive { + $backuppassword.unwrap + } else { + $backuppassword + } - if $backupcompress { - ensure_packages(['bzip2']) - Package['bzip2'] -> File['mysqlbackup.sh'] + unless $facts['os']['family'] == 'FreeBSD' { + if $backupcompress and $compression_command == 'bzcat -zc' { + stdlib::ensure_packages(['bzip2']) + Package['bzip2'] -> File['mysqlbackup.sh'] + } } mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql::password($backuppassword), + password_hash => Deferred('mysql::password', [$backuppassword]), require => Class['mysql::server::root_password'], } - if $include_triggers { - $privs = [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS', 'TRIGGER' ] + if $include_triggers { + $privs = ['SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS', 'TRIGGER'] } else { - $privs = [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS' ] + $privs = ['SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS'] } mysql_grant { "${backupuser}@localhost/*.*": @@ -52,15 +68,27 @@ class mysql::backup::mysqldump ( require => Mysql_user["${backupuser}@localhost"], } + if $install_cron { + if $facts['os']['family'] == 'RedHat' { + stdlib::ensure_packages('cronie') + } elsif $facts['os']['family'] != 'FreeBSD' { + stdlib::ensure_packages('cron') + } + } + cron { 'mysql-backup': - ensure => $ensure, - command => '/usr/local/sbin/mysqlbackup.sh', - user => 'root', - hour => $time[0], - minute => $time[1], - require => File['mysqlbackup.sh'], + ensure => $ensure, + command => '/usr/local/sbin/mysqlbackup.sh', + user => 'root', + hour => $time[0], + minute => $time[1], + monthday => $time[2], + month => $time[3], + weekday => $time[4], + require => File['mysqlbackup.sh'], } + # TODO: use EPP instead of ERB, as EPP can handle Data of Type Sensitive without further ado file { 'mysqlbackup.sh': ensure => $ensure, path => '/usr/local/sbin/mysqlbackup.sh', @@ -70,12 +98,20 @@ class mysql::backup::mysqldump ( content => template('mysql/mysqlbackup.sh.erb'), } - file { 'mysqlbackupdir': - ensure => 'directory', - path => $backupdir, - mode => $backupdirmode, - owner => $backupdirowner, - group => $backupdirgroup, + if $mysqlbackupdir_target { + file { $backupdir: + ensure => $mysqlbackupdir_ensure, + target => $mysqlbackupdir_target, + mode => $backupdirmode, + owner => $backupdirowner, + group => $backupdirgroup, + } + } else { + file { $backupdir: + ensure => $mysqlbackupdir_ensure, + mode => $backupdirmode, + owner => $backupdirowner, + group => $backupdirgroup, + } } - } diff -pruN 8.1.0-7/manifests/backup/xtrabackup.pp 15.0.0-3/manifests/backup/xtrabackup.pp --- 8.1.0-7/manifests/backup/xtrabackup.pp 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/manifests/backup/xtrabackup.pp 2023-06-19 12:29:51.000000000 +0000 @@ -3,84 +3,185 @@ # @api private # class mysql::backup::xtrabackup ( - $xtrabackup_package_name = $mysql::params::xtrabackup_package_name, - $backupuser = undef, - $backuppassword = undef, - $backupdir = '', - $maxallowedpacket = '1M', - $backupmethod = 'xtrabackup', - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = $mysql::params::root_group, - $backupcompress = true, - $backuprotate = 30, - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $include_triggers = true, - $include_routines = false, - $ensure = 'present', - $time = ['23', '5'], - $prescript = false, - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', - $optional_args = [], - $additional_cron_args = '--backup' + Optional[String] $backupuser = undef, + Optional[Variant[String, Sensitive[String]]] $backuppassword = undef, + String $backupdir = '', + String[1] $maxallowedpacket = '1M', + String[1] $backupmethod = 'xtrabackup', + String[1] $backupdirmode = '0700', + String[1] $backupdirowner = 'root', + String[1] $backupdirgroup = $mysql::params::root_group, + Boolean $backupcompress = true, + Variant[Integer, String[1]] $backuprotate = 30, + String[1] $backupscript_template = 'mysql/xtrabackup.sh.erb', + Optional[String[1]] $backup_success_file_path = undef, + Boolean $ignore_events = true, + Boolean $delete_before_dump = false, + Array[String[1]] $backupdatabases = [], + Boolean $file_per_database = false, + Boolean $include_triggers = true, + Boolean $include_routines = false, + Enum['present', 'absent'] $ensure = 'present', + Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'], + Variant[Boolean, String[1], Array[String[1]]] $prescript = false, + Variant[Boolean, String[1], Array[String[1]]] $postscript = false, + String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', + Array[String[1]] $optional_args = [], + String[1] $additional_cron_args = '--backup', + Boolean $incremental_backups = true, + Boolean $install_cron = true, + Optional[String[1]] $compression_command = undef, + Optional[String[1]] $compression_extension = undef, + String[1] $backupmethod_package = $mysql::params::xtrabackup_package_name, + Array[String] $excludedatabases = [], ) inherits mysql::params { + stdlib::ensure_packages($backupmethod_package) - ensure_packages($xtrabackup_package_name) + $backuppassword_unsensitive = if $backuppassword =~ Sensitive { + $backuppassword.unwrap + } else { + $backuppassword + } if $backupuser and $backuppassword { mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql::password($backuppassword), + password_hash => Deferred('mysql::password', [$backuppassword]), require => Class['mysql::server::root_password'], } + # Percona XtraBackup needs additional grants/privileges to work with MySQL 8 + if versioncmp($facts['mysql_version'], '8') >= 0 and !(/(?i:mariadb)/ in $facts['mysqld_version']) { + if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') >= 0) or + ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') >= 0) { + mysql_grant { "${backupuser}@localhost/*.*": + ensure => $ensure, + user => "${backupuser}@localhost", + table => '*.*', + privileges => ['BINLOG MONITOR', 'RELOAD', 'PROCESS', 'LOCK TABLES', 'BACKUP_ADMIN'], + require => Mysql_user["${backupuser}@localhost"], + } + } + else { + mysql_grant { "${backupuser}@localhost/*.*": + ensure => $ensure, + user => "${backupuser}@localhost", + table => '*.*', + privileges => ['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT', 'BACKUP_ADMIN'], + require => Mysql_user["${backupuser}@localhost"], + } + } + mysql_grant { "${backupuser}@localhost/performance_schema.keyring_component_status": + ensure => $ensure, + user => "${backupuser}@localhost", + table => 'performance_schema.keyring_component_status', + privileges => ['SELECT'], + require => Mysql_user["${backupuser}@localhost"], + } + mysql_grant { "${backupuser}@localhost/performance_schema.log_status": + ensure => $ensure, + user => "${backupuser}@localhost", + table => 'performance_schema.log_status', + privileges => ['SELECT'], + require => Mysql_user["${backupuser}@localhost"], + } + } + else { + if $facts['os']['family'] == 'debian' and $facts['os']['release']['major'] == '11' or + ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') >= 0) { + mysql_grant { "${backupuser}@localhost/*.*": + ensure => $ensure, + user => "${backupuser}@localhost", + table => '*.*', + privileges => ['BINLOG MONITOR', 'RELOAD', 'PROCESS', 'LOCK TABLES'], + require => Mysql_user["${backupuser}@localhost"], + } + } + else { + mysql_grant { "${backupuser}@localhost/*.*": + ensure => $ensure, + user => "${backupuser}@localhost", + table => '*.*', + privileges => ['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT'], + require => Mysql_user["${backupuser}@localhost"], + } + } + } + } - mysql_grant { "${backupuser}@localhost/*.*": - ensure => $ensure, - user => "${backupuser}@localhost", - table => '*.*', - privileges => [ 'RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT' ], - require => Mysql_user["${backupuser}@localhost"], + if $install_cron { + if $facts['os']['family'] == 'RedHat' { + stdlib::ensure_packages('cronie') + } elsif $facts['os']['family'] != 'FreeBSD' { + stdlib::ensure_packages('cron') } } - cron { 'xtrabackup-weekly': - ensure => $ensure, - command => "/usr/local/sbin/xtrabackup.sh --target-dir=${backupdir} ${additional_cron_args}", - user => 'root', - hour => $time[0], - minute => $time[1], - weekday => '0', - require => Package[$xtrabackup_package_name], + if $incremental_backups { + # Warn if old backups are removed too soon. Incremental backups will fail + # if the full backup is no longer available. + if ($backuprotate.convert_to(Integer) < 7) { + warning('The value for `backuprotate` is too low, it must be set to at least 7 days when using incremental backups.') + } + + # The --target-dir uses a more predictable value for the full backup so + # that it can easily be calculated and used in incremental backup jobs. + # Besides that it allows to have multiple full backups. + cron { 'xtrabackup-weekly': + ensure => $ensure, + command => "/usr/local/sbin/xtrabackup.sh --target-dir=${backupdir}/$(date +\\%F)_full ${additional_cron_args}", + user => 'root', + hour => $time[0], + minute => $time[1], + weekday => '0', + require => Package[$backupmethod_package], + } + } + + # Wether to use GNU or BSD date format. + case $facts['os']['family'] { + 'FreeBSD','OpenBSD': { + $dateformat = '$(date -v-sun +\\%F)_full' + } + default: { + $dateformat = '$(date -d "last sunday" +\\%F)_full' + } + } + + $daily_cron_data = ($incremental_backups) ? { + true => { + 'directories' => "--incremental-basedir=${backupdir}/${dateformat} --target-dir=${backupdir}/$(date +\\%F_\\%H-\\%M-\\%S)", + 'weekday' => '1-6', + }, + false => { + 'directories' => "--target-dir=${backupdir}/$(date +\\%F_\\%H-\\%M-\\%S)", + 'weekday' => '*', + }, } cron { 'xtrabackup-daily': ensure => $ensure, - command => "/usr/local/sbin/xtrabackup.sh --incremental-basedir=${backupdir} --target-dir=${backupdir}/`date +%F_%H-%M-%S` ${additional_cron_args}", + command => "/usr/local/sbin/xtrabackup.sh ${daily_cron_data['directories']} ${additional_cron_args}", user => 'root', hour => $time[0], minute => $time[1], - weekday => '1-6', - require => Package[$xtrabackup_package_name], + weekday => $daily_cron_data['weekday'], + require => Package[$backupmethod_package], } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, } + # TODO: use EPP instead of ERB, as EPP can handle Data of Type Sensitive without further ado file { 'xtrabackup.sh': ensure => $ensure, path => '/usr/local/sbin/xtrabackup.sh', mode => '0700', owner => 'root', group => $mysql::params::root_group, - content => template('mysql/xtrabackup.sh.erb'), + content => template($backupscript_template), } } diff -pruN 8.1.0-7/manifests/bindings/client_dev.pp 15.0.0-3/manifests/bindings/client_dev.pp --- 8.1.0-7/manifests/bindings/client_dev.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/client_dev.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,7 +4,6 @@ # @api private # class mysql::bindings::client_dev { - if $mysql::bindings::client_dev_package_name { package { 'mysql-client_dev': ensure => $mysql::bindings::client_dev_package_ensure, @@ -13,7 +12,6 @@ class mysql::bindings::client_dev { provider => $mysql::bindings::client_dev_package_provider, } } else { - warning(translate('No MySQL client development package configured for %{os}.', {'os' => $::operatingsystem })) + warning("No MySQL client development package configured for ${::facts['os']['family']}.") } - } diff -pruN 8.1.0-7/manifests/bindings/daemon_dev.pp 15.0.0-3/manifests/bindings/daemon_dev.pp --- 8.1.0-7/manifests/bindings/daemon_dev.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/daemon_dev.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,7 +4,6 @@ # @api private # class mysql::bindings::daemon_dev { - if $mysql::bindings::daemon_dev_package_name { package { 'mysql-daemon_dev': ensure => $mysql::bindings::daemon_dev_package_ensure, @@ -13,7 +12,6 @@ class mysql::bindings::daemon_dev { provider => $mysql::bindings::daemon_dev_package_provider, } } else { - warning(translate('No MySQL daemon development package configured for %{os}.', {'os' => $::operatingsystem })) + warning("No MySQL daemon development package configured for ${::facts['os']['family']}.") } - } diff -pruN 8.1.0-7/manifests/bindings/java.pp 15.0.0-3/manifests/bindings/java.pp --- 8.1.0-7/manifests/bindings/java.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/java.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,12 +4,10 @@ # @api private # class mysql::bindings::java { - package { 'mysql-connector-java': ensure => $mysql::bindings::java_package_ensure, install_options => $mysql::bindings::install_options, name => $mysql::bindings::java_package_name, provider => $mysql::bindings::java_package_provider, } - } diff -pruN 8.1.0-7/manifests/bindings/perl.pp 15.0.0-3/manifests/bindings/perl.pp --- 8.1.0-7/manifests/bindings/perl.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/perl.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,12 +4,10 @@ # @api private # class mysql::bindings::perl { - - package{ 'perl_mysql': + package { 'perl_mysql': ensure => $mysql::bindings::perl_package_ensure, install_options => $mysql::bindings::install_options, name => $mysql::bindings::perl_package_name, provider => $mysql::bindings::perl_package_provider, } - } diff -pruN 8.1.0-7/manifests/bindings/php.pp 15.0.0-3/manifests/bindings/php.pp --- 8.1.0-7/manifests/bindings/php.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/php.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,12 +4,10 @@ # @api private # class mysql::bindings::php { - package { 'php-mysql': ensure => $mysql::bindings::php_package_ensure, install_options => $mysql::bindings::install_options, name => $mysql::bindings::php_package_name, provider => $mysql::bindings::php_package_provider, } - } diff -pruN 8.1.0-7/manifests/bindings/python.pp 15.0.0-3/manifests/bindings/python.pp --- 8.1.0-7/manifests/bindings/python.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/python.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,12 +4,10 @@ # @api private # class mysql::bindings::python { - package { 'python-mysqldb': ensure => $mysql::bindings::python_package_ensure, install_options => $mysql::bindings::install_options, name => $mysql::bindings::python_package_name, provider => $mysql::bindings::python_package_provider, } - } diff -pruN 8.1.0-7/manifests/bindings/ruby.pp 15.0.0-3/manifests/bindings/ruby.pp --- 8.1.0-7/manifests/bindings/ruby.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings/ruby.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,12 +4,10 @@ # @api private # class mysql::bindings::ruby { - - package{ 'ruby_mysql': + package { 'ruby_mysql': ensure => $mysql::bindings::ruby_package_ensure, install_options => $mysql::bindings::install_options, name => $mysql::bindings::ruby_package_name, provider => $mysql::bindings::ruby_package_provider, } - } diff -pruN 8.1.0-7/manifests/bindings.pp 15.0.0-3/manifests/bindings.pp --- 8.1.0-7/manifests/bindings.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/bindings.pp 2023-06-19 12:29:51.000000000 +0000 @@ -25,107 +25,106 @@ # @param daemon_dev # Specifies whether `::mysql::bindings::daemon_dev` should be included. Valid values are `true`, `false`. # @param java_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `java_enable => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `java_enable => true`. # @param java_package_name # The name of the Java package to install. Only applies if `java_enable => true`. # @param java_package_provider # The provider to use to install the Java package. Only applies if `java_enable => true`. # @param perl_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `perl_enable => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `perl_enable => true`. # @param perl_package_name # The name of the Perl package to install. Only applies if `perl_enable => true`. # @param perl_package_provider # The provider to use to install the Perl package. Only applies if `perl_enable => true`. # @param php_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `php_enable => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `php_enable => true`. # @param php_package_name # The name of the PHP package to install. Only applies if `php_enable => true`. # @param php_package_provider # The provider to use to install the PHP package. Only applies if `php_enable => true`. # @param python_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `python_enable => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `python_enable => true`. # @param python_package_name # The name of the Python package to install. Only applies if `python_enable => true`. # @param python_package_provider # The provider to use to install the Python package. Only applies if `python_enable => true`. # @param ruby_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `ruby_enable => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `ruby_enable => true`. # @param ruby_package_name # The name of the Ruby package to install. Only applies if `ruby_enable => true`. # @param ruby_package_provider # What provider should be used to install the package. # @param client_dev_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `client_dev => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `client_dev => true`. # @param client_dev_package_name # The name of the client_dev package to install. Only applies if `client_dev => true`. # @param client_dev_package_provider # The provider to use to install the client_dev package. Only applies if `client_dev => true`. # @param daemon_dev_package_ensure -# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `daemon_dev => true`. +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# Only applies if `daemon_dev => true`. # @param daemon_dev_package_name # The name of the daemon_dev package to install. Only applies if `daemon_dev => true`. # @param daemon_dev_package_provider # The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`. # class mysql::bindings ( - $install_options = undef, + Optional[Array[String[1]]] $install_options = undef, # Boolean to determine if we should include the classes. - $java_enable = false, - $perl_enable = false, - $php_enable = false, - $python_enable = false, - $ruby_enable = false, - $client_dev = false, - $daemon_dev = false, + Boolean $java_enable = false, + Boolean $perl_enable = false, + Boolean $php_enable = false, + Boolean $python_enable = false, + Boolean $ruby_enable = false, + Boolean $client_dev = false, + Boolean $daemon_dev = false, # Settings for the various classes. - $java_package_ensure = $mysql::params::java_package_ensure, - $java_package_name = $mysql::params::java_package_name, - $java_package_provider = $mysql::params::java_package_provider, - $perl_package_ensure = $mysql::params::perl_package_ensure, - $perl_package_name = $mysql::params::perl_package_name, - $perl_package_provider = $mysql::params::perl_package_provider, - $php_package_ensure = $mysql::params::php_package_ensure, - $php_package_name = $mysql::params::php_package_name, - $php_package_provider = $mysql::params::php_package_provider, - $python_package_ensure = $mysql::params::python_package_ensure, - $python_package_name = $mysql::params::python_package_name, - $python_package_provider = $mysql::params::python_package_provider, - $ruby_package_ensure = $mysql::params::ruby_package_ensure, - $ruby_package_name = $mysql::params::ruby_package_name, - $ruby_package_provider = $mysql::params::ruby_package_provider, - $client_dev_package_ensure = $mysql::params::client_dev_package_ensure, - $client_dev_package_name = $mysql::params::client_dev_package_name, - $client_dev_package_provider = $mysql::params::client_dev_package_provider, - $daemon_dev_package_ensure = $mysql::params::daemon_dev_package_ensure, - $daemon_dev_package_name = $mysql::params::daemon_dev_package_name, - $daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $java_package_ensure = $mysql::params::java_package_ensure, + String[1] $java_package_name = $mysql::params::java_package_name, + Optional[String[1]] $java_package_provider = $mysql::params::java_package_provider, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $perl_package_ensure = $mysql::params::perl_package_ensure, + String[1] $perl_package_name = $mysql::params::perl_package_name, + Optional[String[1]] $perl_package_provider = $mysql::params::perl_package_provider, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $php_package_ensure = $mysql::params::php_package_ensure, + String[1] $php_package_name = $mysql::params::php_package_name, + Optional[String[1]] $php_package_provider = $mysql::params::php_package_provider, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $python_package_ensure = $mysql::params::python_package_ensure, + String[1] $python_package_name = $mysql::params::python_package_name, + Optional[String[1]] $python_package_provider = $mysql::params::python_package_provider, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $ruby_package_ensure = $mysql::params::ruby_package_ensure, + String[1] $ruby_package_name = $mysql::params::ruby_package_name, + Optional[String[1]] $ruby_package_provider = $mysql::params::ruby_package_provider, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $client_dev_package_ensure = $mysql::params::client_dev_package_ensure, + Optional[String[1]] $client_dev_package_name = $mysql::params::client_dev_package_name, + Optional[String[1]] $client_dev_package_provider = $mysql::params::client_dev_package_provider, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $daemon_dev_package_ensure = $mysql::params::daemon_dev_package_ensure, + String[1] $daemon_dev_package_name = $mysql::params::daemon_dev_package_name, + Optional[String[1]] $daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider ) inherits mysql::params { - - case $::osfamily { + case $facts['os']['family'] { 'Archlinux': { - if $java_enable { fail(translate('::mysql::bindings::java cannot be managed by puppet on %{osfamily} - as it is not in official repositories. Please disable java mysql binding.', - {'osfamily' => $::osfamily })) } - if $perl_enable { include '::mysql::bindings::perl' } - if $php_enable { warning(translate('::mysql::bindings::php does not need to be managed by puppet on %{osfamily} - as it is included in mysql package by default.', - {'osfamily' => $::osfamily })) } - if $python_enable { include '::mysql::bindings::python' } - if $ruby_enable { fail(translate('::mysql::bindings::ruby cannot be managed by puppet on %{osfamily} - as it is not in official repositories. Please disable ruby mysql binding.', - {'osfamily' => $::osfamily } )) } + if $java_enable { fail("::mysql::bindings::java cannot be managed by puppet on ${facts['os']['family']} as it is not in official repositories. Please disable java mysql binding.") } + if $perl_enable { include 'mysql::bindings::perl' } + if $php_enable { warning("::mysql::bindings::php does not need to be managed by puppet on ${facts['os']['family']} as it is included in mysql package by default.") } + if $python_enable { include 'mysql::bindings::python' } + if $ruby_enable { fail("::mysql::bindings::ruby cannot be managed by puppet on ${facts['os']['family']} as it is not in official repositories. Please disable ruby mysql binding.") } } default: { - if $java_enable { include '::mysql::bindings::java' } - if $perl_enable { include '::mysql::bindings::perl' } - if $php_enable { include '::mysql::bindings::php' } - if $python_enable { include '::mysql::bindings::python' } - if $ruby_enable { include '::mysql::bindings::ruby' } + if $java_enable { include 'mysql::bindings::java' } + if $perl_enable { include 'mysql::bindings::perl' } + if $php_enable { include 'mysql::bindings::php' } + if $python_enable { include 'mysql::bindings::python' } + if $ruby_enable { include 'mysql::bindings::ruby' } } } - if $client_dev { include '::mysql::bindings::client_dev' } - if $daemon_dev { include '::mysql::bindings::daemon_dev' } - + if $client_dev { include 'mysql::bindings::client_dev' } + if $daemon_dev { include 'mysql::bindings::daemon_dev' } } diff -pruN 8.1.0-7/manifests/client/install.pp 15.0.0-3/manifests/client/install.pp --- 8.1.0-7/manifests/client/install.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/client/install.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,15 +4,13 @@ # @api private # class mysql::client::install { - if $mysql::client::package_manage { - package { 'mysql_client': ensure => $mysql::client::package_ensure, install_options => $mysql::client::install_options, name => $mysql::client::package_name, + provider => $mysql::client::package_provider, + source => $mysql::client::package_source, } - } - } diff -pruN 8.1.0-7/manifests/client.pp 15.0.0-3/manifests/client.pp --- 8.1.0-7/manifests/client.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/client.pp 2023-06-19 12:29:51.000000000 +0000 @@ -18,16 +18,21 @@ # Whether to manage the MySQL client package. Defaults to `true`. # @param package_name # The name of the MySQL client package to install. +# @param package_provider +# Specify the provider of the package. Optional. Valid value is a String. +# @param package_source +# Specify the path to the package source. Optional. Valid value is a String # class mysql::client ( - $bindings_enable = $mysql::params::bindings_enable, - $install_options = undef, - $package_ensure = $mysql::params::client_package_ensure, - $package_manage = $mysql::params::client_package_manage, - $package_name = $mysql::params::client_package_name, + Boolean $bindings_enable = $mysql::params::bindings_enable, + Optional[Array[String[1]]] $install_options = undef, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $package_ensure = $mysql::params::client_package_ensure, + Boolean $package_manage = $mysql::params::client_package_manage, + String[1] $package_name = $mysql::params::client_package_name, + Optional[String[1]] $package_provider = undef, + Optional[String[1]] $package_source = undef, ) inherits mysql::params { - - include '::mysql::client::install' + include 'mysql::client::install' if $bindings_enable { class { 'mysql::bindings': diff -pruN 8.1.0-7/manifests/db.pp 15.0.0-3/manifests/db.pp --- 8.1.0-7/manifests/db.pp 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/manifests/db.pp 2023-06-19 12:29:51.000000000 +0000 @@ -9,6 +9,12 @@ # grant => ['SELECT', 'UPDATE'], # } # +# @param name +# The name of the database to create. Database names must: +# * be longer than 64 characters. +# * not contain / \ or . characters. +# * not contain characters that are not permitted in file names. +# * not end with space characters. # @param user # The user for the database you're creating. # @param password @@ -18,9 +24,9 @@ # @param dbname # The name of the database to create. # @param charset -# The character set for the database. +# The character set for the database. Must have the same value as collate to avoid corrective changes. See https://dev.mysql.com/doc/refman/8.0/en/charset-mysql.html for charset and collation pairs. # @param collate -# The collation for the database. +# The collation for the database. Must have the same value as charset to avoid corrective changes. See https://dev.mysql.com/doc/refman/8.0/en/charset-mysql.html for charset and collation pairs. # @param host # The host to use as part of user@host for grants. # @param grant @@ -28,7 +34,7 @@ # @param grant_options # The grant_options for the grant for user@host on the database. # @param sql -# The path to the sqlfile you want to execute. This can be single file specified as string, or it can be an array of strings. +# The path to the sqlfile you want to execute. This can be an array containing one or more file paths. # @param enforce_sql # Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. # @param ensure @@ -37,48 +43,73 @@ # Timeout, in seconds, for loading the sqlfiles. Defaults to 300. # @param import_cat_cmd # Command to read the sqlfile for importing the database. Useful for compressed sqlfiles. For example, you can use 'zcat' for .gz files. +# @param mysql_exec_path +# Specify the path in which mysql has been installed if done in the non-standard bin/sbin path. # define mysql::db ( - $user, - $password, - $tls_options = undef, - $dbname = $name, - $charset = 'utf8', - $collate = 'utf8_general_ci', - $host = 'localhost', - $grant = 'ALL', - $grant_options = undef, - Optional[Variant[Array, Hash, String]] $sql = undef, - $enforce_sql = false, - Enum['absent', 'present'] $ensure = 'present', - $import_timeout = 300, - $import_cat_cmd = 'cat', - $mysql_exec_path = $mysql::params::exec_path, + String[1] $user, + 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] $host = 'localhost', + Variant[String[1], Array[String[1]]] $grant = 'ALL', + Optional[Variant[String[1], Array[String[1]]]] $grant_options = undef, + Optional[Array] $sql = undef, + Boolean $enforce_sql = false, + Enum['absent', 'present'] $ensure = 'present', + Integer $import_timeout = 300, + Enum['cat', 'zcat', 'bzcat'] $import_cat_cmd = 'cat', + Optional[String] $mysql_exec_path = undef, ) { + include 'mysql::client' - $table = "${dbname}.*" + # Ensure that the database name is valid. + if $dbname !~ /^[^\/?%*:|\""<>.\s;]{1,64}$/ { + $message = "The database name '${dbname}' is invalid. Values must: + * be longer than 64 characters. + * not contain // \\ or . characters. + * not contain characters that are not permitted in file names. + * not end with space characters." + fail($message) + } - $sql_inputs = join([$sql], ' ') + # Ensure that the sql files passed are valid file paths. + if $sql { + $sql.each | $sqlfile | { + if $sqlfile !~ /^\/(?:.[.A-Za-z0-9_-]+\/?+)+(?:\.[.A-Za-z0-9]+)+$/ { + $message = "The file '${sqlfile}' is invalid. A valid file path is expected." + fail($message) + } + } + } - include '::mysql::client' + if ($mysql_exec_path) { + $_mysql_exec_path = $mysql_exec_path + } else { + $_mysql_exec_path = $mysql::params::exec_path + } $db_resource = { ensure => $ensure, charset => $charset, collate => $collate, provider => 'mysql', - require => [ Class['mysql::client'] ], + require => [Class['mysql::client']], } ensure_resource('mysql_database', $dbname, $db_resource) $user_resource = { ensure => $ensure, - password_hash => mysql::password($password), + password_hash => Deferred('mysql::password', [$password]), tls_options => $tls_options, } ensure_resource('mysql_user', "${user}@${host}", $user_resource) if $ensure == 'present' { + $table = "${dbname}.*" + mysql_grant { "${user}@${host}/${table}": privileges => $grant, provider => 'mysql', @@ -91,15 +122,13 @@ define mysql::db ( ], } - $refresh = ! $enforce_sql - if $sql { - exec{ "${dbname}-import": - command => "${import_cat_cmd} ${sql_inputs} | mysql ${dbname}", + exec { "${dbname}-import": + command => "${import_cat_cmd} ${shell_join($sql)} | mysql ${dbname}", logoutput => true, - environment => "HOME=${::root_home}", - refreshonly => $refresh, - path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:${mysql_exec_path}", + environment => "HOME=${facts['root_home']}", + refreshonly => ! $enforce_sql, + path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:${_mysql_exec_path}", require => Mysql_grant["${user}@${host}/${table}"], subscribe => Mysql_database[$dbname], timeout => $import_timeout, diff -pruN 8.1.0-7/manifests/params.pp 15.0.0-3/manifests/params.pp --- 8.1.0-7/manifests/params.pp 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/manifests/params.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,22 +4,8 @@ # @api private # class mysql::params { - - $manage_config_file = true - $purge_conf_dir = false - $restart = false - $root_password = 'UNSET' - $install_secret_file = '/.mysql_secret' - $server_package_ensure = 'present' - $server_package_manage = true - $server_service_manage = true - $server_service_enabled = true $client_package_ensure = 'present' $client_package_manage = true - $create_root_user = true - $create_root_my_cnf = true - $create_root_login_file = false - $login_file = undef $exec_path = '' # mysql::bindings $bindings_enable = false @@ -37,29 +23,40 @@ class mysql::params { $client_dev_package_provider = undef $daemon_dev_package_ensure = 'present' $daemon_dev_package_provider = undef - $xtrabackup_package_name = 'percona-xtrabackup' - - case $::osfamily { + case $facts['os']['family'] { 'RedHat': { - case $::operatingsystem { + case $facts['os']['name'] { 'Fedora': { - if versioncmp($::operatingsystemrelease, '19') >= 0 or $::operatingsystemrelease == 'Rawhide' { + if versioncmp($facts['os']['release']['full'], '19') >= 0 or $facts['os']['release']['full'] == 'Rawhide' { $provider = 'mariadb' } else { $provider = 'mysql' } $python_package_name = 'MySQL-python' } - /^(RedHat|CentOS|Scientific|OracleLinux)$/: { - if versioncmp($::operatingsystemmajrelease, '7') >= 0 { + 'Amazon': { + if versioncmp($facts['os']['release']['full'], '2') >= 0 { $provider = 'mariadb' } else { $provider = 'mysql' } - if versioncmp($::operatingsystemmajrelease, '8') >= 0 { + } + /^(RedHat|Rocky|CentOS|Scientific|OracleLinux|AlmaLinux)$/: { + if versioncmp($facts['os']['release']['major'], '7') >= 0 { + $provider = 'mariadb' + if versioncmp($facts['os']['release']['major'], '8') >= 0 { + $xtrabackup_package_name = 'percona-xtrabackup-24' + } + } else { + $provider = 'mysql' + $xtrabackup_package_name = 'percona-xtrabackup-20' + } + if versioncmp($facts['os']['release']['major'], '8') >= 0 { + $java_package_name = 'mariadb-java-client' $python_package_name = 'python3-PyMySQL' } else { + $java_package_name = 'mysql-connector-java' $python_package_name = 'MySQL-python' } } @@ -98,8 +95,8 @@ class mysql::params { $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings - $java_package_name = 'mysql-connector-java' $perl_package_name = 'perl-DBD-MySQL' $php_package_name = 'php-mysql' $ruby_package_name = 'ruby-mysql' @@ -107,85 +104,60 @@ class mysql::params { } 'Suse': { - case $::operatingsystem { + case $facts['os']['name'] { 'OpenSuSE': { - if versioncmp( $::operatingsystemmajrelease, '12' ) >= 0 { - $client_package_name = 'mariadb-client' - $server_package_name = 'mariadb' - # First service start fails if this is set. Runs fine without - # it being set, in any case. Leaving it as-is for the mysql. - $basedir = undef - } else { - $client_package_name = 'mysql-community-server-client' - $server_package_name = 'mysql-community-server' - $basedir = '/usr' - } + $socket = '/var/run/mysql/mysql.sock' + $log_error = '/var/log/mysql/mysqld.log' + $pidfile = '/var/run/mysql/mysqld.pid' + $ruby_package_name = 'rubygem-mysql' + $client_package_name = 'mariadb-client' + $server_package_name = 'mariadb' + # First service start fails if this is set. Runs fine without + # it being set, in any case. Leaving it as-is for the mysql. + $basedir = undef } 'SLES','SLED': { - if versioncmp($::operatingsystemrelease, '12') >= 0 { - $client_package_name = 'mariadb-client' - $server_package_name = 'mariadb' - $basedir = undef - } else { - $client_package_name = 'mysql-client' - $server_package_name = 'mysql' - $basedir = '/usr' - } + $socket = '/run/mysql/mysql.sock' + $log_error = '/var/log/mysqld.log' + $pidfile = '/var/lib/mysql/mysqld.pid' + $ruby_package_name = 'ruby-mysql' + $client_package_name = 'mariadb-client' + $server_package_name = 'mariadb' + $basedir = undef } default: { - fail(translate('Unsupported platform: puppetlabs-%{module_name} currently doesn\'t support %{os}.', - {'module_name' => $module_name, 'os' => $::operatingsystem })) + fail("Unsupported platform: puppetlabs-${module_name} currently doesn\'t support ${facts['os']['name']}.") } } $config_file = '/etc/my.cnf' $includedir = '/etc/my.cnf.d' $datadir = '/var/lib/mysql' - $log_error = $::operatingsystem ? { - /OpenSuSE/ => '/var/log/mysql/mysqld.log', - /(SLES|SLED)/ => '/var/log/mysqld.log', - } - $pidfile = $::operatingsystem ? { - /OpenSuSE/ => '/var/run/mysql/mysqld.pid', - /(SLES|SLED)/ => '/var/lib/mysql/mysqld.pid', - } $root_group = 'root' $mysql_group = 'mysql' $server_service_name = 'mysql' - - if $::operatingsystem =~ /(SLES|SLED)/ { - if versioncmp( $::operatingsystemmajrelease, '12' ) >= 0 { - $socket = '/run/mysql/mysql.sock' - } else { - $socket = '/var/lib/mysql/mysql.sock' - } - } else { - $socket = '/var/run/mysql/mysql.sock' - } + $xtrabackup_package_name = 'xtrabackup' $ssl_ca = '/etc/mysql/cacert.pem' $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings $java_package_name = 'mysql-connector-java' $perl_package_name = 'perl-DBD-mysql' $php_package_name = 'apache2-mod_php53' $python_package_name = 'python-mysql' - $ruby_package_name = $::operatingsystem ? { - /OpenSuSE/ => 'rubygem-mysql', - /(SLES|SLED)/ => 'ruby-mysql', - } $client_dev_package_name = 'libmysqlclient-devel' $daemon_dev_package_name = 'mysql-devel' } 'Debian': { - if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 { + if $facts['os']['name'] == 'Debian' or $facts['os']['name'] == 'Raspbian' or + ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0) { $provider = 'mariadb' } else { $provider = 'mysql' } - if $provider == 'mariadb' { $client_package_name = 'mariadb-client' $server_package_name = 'mariadb-server' @@ -213,23 +185,43 @@ class mysql::params { $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = ['tmpdir','basedir','datadir','innodb_data_home_dir','innodb_log_group_home_dir','innodb_undo_directory','innodb_tmpdir'] + # mysql::bindings - $java_package_name = 'libmysql-java' + if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '10') >= 0) or + ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '20.04') >= 0) { + $java_package_name = 'libmariadb-java' + } else { + $java_package_name = 'libmysql-java' + } $perl_package_name = 'libdbd-mysql-perl' - if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') >= 0) or - ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) { + if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '16.04') >= 0) or + ($facts['os']['name'] == 'Debian') { $php_package_name = 'php-mysql' } else { $php_package_name = 'php5-mysql' } - $python_package_name = 'python-mysqldb' - $ruby_package_name = $::lsbdistcodename ? { - 'jessie' => 'ruby-mysql', - 'stretch' => 'ruby-mysql2', - 'trusty' => 'ruby-mysql', - 'xenial' => 'ruby-mysql', - 'bionic' => 'ruby-mysql2', - default => 'libmysql-ruby', + if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '16.04') < 0) or + ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '20.04') >= 0) or + ($facts['os']['name'] == 'Debian') { + $xtrabackup_package_name = 'percona-xtrabackup-24' + } + if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '20.04') >= 0) or + ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '11') >= 0) { + $python_package_name = 'python3-mysqldb' + } else { + $python_package_name = 'python-mysqldb' + } + + $ruby_package_name = $facts['os']['release']['major'] ? { + '9' => 'ruby-mysql2', # stretch + '10' => 'ruby-mysql2', # buster + '11' => 'ruby-mysql2', # bullseye + '16.04' => 'ruby-mysql', # xenial + '18.04' => 'ruby-mysql2', # bionic + '20.04' => 'ruby-mysql2', # focal + '22.04' => 'ruby-mysql2', # jammy + default => 'libmysql-ruby', } } @@ -252,6 +244,7 @@ class mysql::params { $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings $java_package_name = 'mysql-connector-java' $perl_package_name = 'perl-dbd-mysql' @@ -277,6 +270,7 @@ class mysql::params { $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings $java_package_name = 'dev-java/jdbc-mysql' $perl_package_name = 'dev-perl/DBD-mysql' @@ -286,8 +280,8 @@ class mysql::params { } 'FreeBSD': { - $client_package_name = 'databases/mysql56-client' - $server_package_name = 'databases/mysql56-server' + $client_package_name = 'databases/mysql57-client' + $server_package_name = 'databases/mysql57-server' $basedir = '/usr/local' $config_file = '/usr/local/etc/my.cnf' $includedir = '/usr/local/etc/my.cnf.d' @@ -302,6 +296,7 @@ class mysql::params { $ssl_cert = undef $ssl_key = undef $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings $java_package_name = 'databases/mysql-connector-java' $perl_package_name = 'p5-DBD-mysql' @@ -320,7 +315,7 @@ class mysql::params { $config_file = '/etc/my.cnf' $includedir = undef $datadir = '/var/mysql' - $log_error = "/var/mysql/${::hostname}.err" + $log_error = "/var/mysql/${facts['networking']['hostname']}.err" $pidfile = '/var/mysql/mysql.pid' $root_group = 'wheel' $mysql_group = '_mysql' @@ -330,6 +325,7 @@ class mysql::params { $ssl_cert = undef $ssl_key = undef $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings $java_package_name = undef $perl_package_name = 'p5-DBD-mysql' @@ -341,34 +337,8 @@ class mysql::params { $daemon_dev_package_name = undef } - 'Solaris': { - $client_package_name = 'database/mysql-55/client' - $server_package_name = 'database/mysql-55' - $basedir = undef - $config_file = '/etc/mysql/5.5/my.cnf' - $datadir = '/var/mysql/5.5/data' - $log_error = "/var/mysql/5.5/data/${::hostname}.err" - $pidfile = "/var/mysql/5.5/data/${::hostname}.pid" - $root_group = 'bin' - $server_service_name = 'application/database/mysql:version_55' - $socket = '/tmp/mysql.sock' - $ssl_ca = undef - $ssl_cert = undef - $ssl_key = undef - $tmpdir = '/tmp' - # mysql::bindings - $java_package_name = undef - $perl_package_name = undef - $php_package_name = 'web/php-53/extension/php-mysql' - $python_package_name = 'library/python/python-mysql' - $ruby_package_name = undef - # The libraries installed by these packages are included in client and server packages, no installation required. - $client_dev_package_name = undef - $daemon_dev_package_name = undef - } - default: { - case $::operatingsystem { + case $facts['os']['name'] { 'Alpine': { $client_package_name = 'mariadb-client' $server_package_name = 'mariadb' @@ -385,6 +355,7 @@ class mysql::params { $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = undef $java_package_name = undef $perl_package_name = 'perl-dbd-mysql' $php_package_name = 'php7-mysqlnd' @@ -410,6 +381,7 @@ class mysql::params { $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' + $managed_dirs = undef # mysql::bindings $java_package_name = 'mysql-connector-java' $perl_package_name = 'perl-DBD-MySQL' @@ -422,26 +394,22 @@ class mysql::params { } default: { - fail(translate('Unsupported platform: puppetlabs-%{module_name} currently doesn\'t support %{osfamily} or %{os}.', - {'module_name' => $module_name, 'os' => $::operatingsystem, 'osfamily' => $::osfamily})) + fail("Unsupported platform: puppetlabs-${module_name} currently doesn\'t support ${facts['os']['family']} or ${facts['os']['name']}.") } } } } - case $::operatingsystem { + case $facts['os']['name'] { 'Ubuntu': { - # lint:ignore:only_variable_string - if versioncmp("${::operatingsystemmajrelease}", '14.10') > 0 { - # lint:endignore - $server_service_provider = 'systemd' - } else { - $server_service_provider = 'upstart' - } + $server_service_provider = 'systemd' } 'Alpine': { $server_service_provider = 'rc-service' } + 'FreeBSD': { + $server_service_provider = 'freebsd' + } default: { $server_service_provider = undef } @@ -512,8 +480,12 @@ class mysql::params { }, } + if !defined('$xtrabackup_package_name') { + $xtrabackup_package_name = 'percona-xtrabackup' + } + ## Additional graceful failures - if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' { - fail(translate('Unsupported platform: puppetlabs-%{module_name} only supports RedHat 5.0 and beyond.', {'module_name' => $module_name})) + if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '4' and $facts['os']['name'] != 'Amazon' { + fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 6.0 and beyond.") } } diff -pruN 8.1.0-7/manifests/server/account_security.pp 15.0.0-3/manifests/server/account_security.pp --- 8.1.0-7/manifests/server/account_security.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/server/account_security.pp 2023-06-19 12:29:51.000000000 +0000 @@ -5,32 +5,32 @@ # class mysql::server::account_security { mysql_user { - [ 'root@127.0.0.1', + ['root@127.0.0.1', 'root@::1', '@localhost', - '@%']: - ensure => 'absent', - require => Anchor['mysql::server::end'], - } - if ($::fqdn != 'localhost.localdomain') { - mysql_user { - [ 'root@localhost.localdomain', - '@localhost.localdomain']: + '@%']: ensure => 'absent', require => Anchor['mysql::server::end'], + } + if ($facts['networking']['fqdn'] != 'localhost.localdomain') { + mysql_user { + ['root@localhost.localdomain', + '@localhost.localdomain']: + ensure => 'absent', + require => Anchor['mysql::server::end'], } } - if ($::fqdn and $::fqdn != 'localhost') { + if ($facts['networking']['fqdn'] and $facts['networking']['fqdn'] != 'localhost') { mysql_user { - [ "root@${::fqdn}", - "@${::fqdn}"]: - ensure => 'absent', - require => Anchor['mysql::server::end'], + ["root@${facts['networking']['fqdn']}", + "@${facts['networking']['fqdn']}"]: + ensure => 'absent', + require => Anchor['mysql::server::end'], } } - if ($::fqdn != $::hostname) { - if ($::hostname != 'localhost') { - mysql_user { ["root@${::hostname}", "@${::hostname}"]: + if ($facts['networking']['fqdn'] != $facts['networking']['hostname']) { + if ($facts['networking']['hostname'] != 'localhost') { + mysql_user { ["root@${facts['networking']['hostname']}", "@${facts['networking']['hostname']}"]: ensure => 'absent', require => Anchor['mysql::server::end'], } diff -pruN 8.1.0-7/manifests/server/backup.pp 15.0.0-3/manifests/server/backup.pp --- 8.1.0-7/manifests/server/backup.pp 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/manifests/server/backup.pp 2023-06-19 12:29:51.000000000 +0000 @@ -3,23 +3,29 @@ # # @example Create a basic MySQL backup: # class { 'mysql::server': -# root_password => 'password' +# root_password => 'password' # } # class { 'mysql::server::backup': -# backupuser => 'myuser', -# backuppassword => 'mypassword', -# backupdir => '/tmp/backups', +# backupuser => 'myuser', +# backuppassword => 'mypassword', +# backupdir => '/tmp/backups', +# } +# +# @example Create a basic MySQL backup using mariabackup: +# class { 'mysql::server': +# root_password => 'password' # } # class { 'mysql::server::backup': -# backupmethod => 'mariabackup', -# provider => 'xtrabackup', -# backupdir => '/tmp/backups', +# backupmethod => 'mariabackup', +# backupmethod_package => 'mariadb-backup' +# provider => 'xtrabackup', +# backupdir => '/tmp/backups', # } # # @param backupuser -# MySQL user with backup administrator privileges. +# MySQL user to create with backup administrator privileges. # @param backuppassword -# Password for `backupuser`. +# Password to create for `backupuser`. # @param backupdir # Directory to store backup. # @param backupdirmode @@ -29,95 +35,124 @@ # @param backupdirgroup # Group owner for the backup directory. This parameter is passed directly to the file resource. # @param backupcompress -# Whether or not to compress the backup (when using the mysqldump provider) +# Whether or not to compress the backup (when using the mysqldump or xtrabackup provider) # @param backupmethod -# The execution binary for backing up. ex. mysqldump, xtrabackup, mariabackup +# The execution binary for backing up. ex. mysqldump, xtrabackup, mariabackup +# @param backup_success_file_path +# Specify a path where upon successfull backup a file should be created for checking purposes. # @param backuprotate # Backup rotation interval in 24 hour periods. # @param ignore_events # Ignore the mysql.event table. # @param delete_before_dump -# Whether to delete old .sql files before backing up. Setting to true deletes old files before backing up, while setting to false deletes them after backup. +# Whether to delete old .sql files before backing up. +# Setting to true deletes old files before backing up, while setting to false deletes them after backup. # @param backupdatabases -# Databases to backup (if using xtrabackup provider). +# Databases to backup (required if using xtrabackup provider). By default `[]` will back up all databases. # @param file_per_database # Use file per database mode creating one file per database backup. # @param include_routines # Dump stored routines (procedures and functions) from dumped databases when doing a `file_per_database` backup. # @param include_triggers # Dump triggers for each dumped table when doing a `file_per_database` backup. +# @param incremental_backups +# A flag to activate/deactivate incremental backups. Currently only supported by the xtrabackup provider. # @param ensure # @param time # An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05) or ['3', '45'] (i.e., 03:45) for HH:MM times. # @param prescript # A script that is executed before the backup begins. # @param postscript -# A script that is executed when the backup is finished. This could be used to sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files. +# A script that is executed when the backup is finished. This could be used to sync the backup to a central store. +# This script can be either a single line that is directly executed or a number of lines supplied as an array. +# It could also be one or more externally managed (executable) files. # @param execpath # Allows you to set a custom PATH should your MySQL installation be non-standard places. Defaults to `/usr/bin:/usr/sbin:/bin:/sbin`. # @param provider -# Sets the server backup implementation. Valid values are: +# Sets the server backup implementation. Valid values are: xtrabackup, mysqldump, mysqlbackup # @param maxallowedpacket # Defines the maximum SQL statement size for the backup dump script. The default value is 1MB, as this is the default MySQL Server value. # @param optional_args -# Specifies an array of optional arguments which should be passed through to the backup tool. (Supported by the xtrabackup and mysqldump providers.) -# +# Specifies an array of optional arguments which should be passed through to the backup tool. +# (Supported by the xtrabackup and mysqldump providers.) +# @param install_cron +# Manage installation of cron package +# @param compression_command +# Configure the command used to compress the backup (when using the mysqldump provider). Make sure the command exists +# on the target system. Packages for it are NOT automatically installed. +# @param compression_extension +# Configure the file extension for the compressed backup (when using the mysqldump provider) +# @param backupmethod_package +# The package which provides the binary specified by the backupmethod parameter. +# @param excludedatabases +# Give a list of excluded databases when using file_per_database, e.g.: [ 'information_schema', 'performance_schema' ] class mysql::server::backup ( - $backupuser = undef, - $backuppassword = undef, - $backupdir = undef, - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = 'root', - $backupcompress = true, - $backuprotate = 30, - $backupmethod = undef, - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $include_routines = false, - $include_triggers = false, - $ensure = 'present', - $time = ['23', '5'], - $prescript = false, - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', - $provider = 'mysqldump', - $maxallowedpacket = '1M', - $optional_args = [], -) { - + Optional[String[1]] $backupuser = undef, + Optional[Variant[String, Sensitive[String]]] $backuppassword = undef, + Optional[String[1]] $backupdir = undef, + String[1] $backupdirmode = '0700', + String[1] $backupdirowner = 'root', + String[1] $backupdirgroup = $mysql::params::root_group, + Boolean $backupcompress = true, + Variant[String[1], Integer] $backuprotate = 30, + Optional[String[1]] $backupmethod = undef, + String[1] $backup_success_file_path = '/tmp/mysqlbackup_success', + Boolean $ignore_events = true, + Boolean $delete_before_dump = false, + Array[String[1]] $backupdatabases = [], + Boolean $file_per_database = false, + Boolean $include_routines = false, + Boolean $include_triggers = false, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $ensure = 'present', + Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'], + Variant[Boolean, String[1], Array[String[1]]] $prescript = false, + Variant[Boolean, String[1], Array[String[1]]] $postscript = false, + String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', + Enum['xtrabackup', 'mysqldump', 'mysqlbackup'] $provider = 'mysqldump', + String[1] $maxallowedpacket = '1M', + Array[String[1]] $optional_args = [], + Boolean $incremental_backups = true, + Boolean $install_cron = true, + Optional[String[1]] $compression_command = undef, + Optional[String[1]] $compression_extension = undef, + String[1] $backupmethod_package = $mysql::params::xtrabackup_package_name, + Array[String] $excludedatabases = [], +) inherits mysql::params { if $prescript and $provider =~ /(mysqldump|mysqlbackup)/ { - warning(translate("The 'prescript' option is not currently implemented for the %{provider} backup provider.", - {'provider' => $provider})) + warning("The 'prescript' option is not currently implemented for the ${provider} backup provider.") } create_resources('class', { - "mysql::backup::${provider}" => { - 'backupuser' => $backupuser, - 'backuppassword' => $backuppassword, - 'backupdir' => $backupdir, - 'backupdirmode' => $backupdirmode, - 'backupdirowner' => $backupdirowner, - 'backupdirgroup' => $backupdirgroup, - 'backupcompress' => $backupcompress, - 'backuprotate' => $backuprotate, - 'backupmethod' => $backupmethod, - 'ignore_events' => $ignore_events, - 'delete_before_dump' => $delete_before_dump, - 'backupdatabases' => $backupdatabases, - 'file_per_database' => $file_per_database, - 'include_routines' => $include_routines, - 'include_triggers' => $include_triggers, - 'ensure' => $ensure, - 'time' => $time, - 'prescript' => $prescript, - 'postscript' => $postscript, - 'execpath' => $execpath, - 'maxallowedpacket' => $maxallowedpacket, - 'optional_args' => $optional_args, - } + "mysql::backup::${provider}" => { + 'backupuser' => $backupuser, + 'backuppassword' => $backuppassword, + 'backupdir' => $backupdir, + 'backupdirmode' => $backupdirmode, + 'backupdirowner' => $backupdirowner, + 'backupdirgroup' => $backupdirgroup, + 'backupcompress' => $backupcompress, + 'backuprotate' => $backuprotate, + 'backupmethod' => $backupmethod, + 'backup_success_file_path' => $backup_success_file_path, + 'ignore_events' => $ignore_events, + 'delete_before_dump' => $delete_before_dump, + 'backupdatabases' => $backupdatabases, + 'file_per_database' => $file_per_database, + 'include_routines' => $include_routines, + 'include_triggers' => $include_triggers, + 'ensure' => $ensure, + 'time' => $time, + 'prescript' => $prescript, + 'postscript' => $postscript, + 'execpath' => $execpath, + 'maxallowedpacket' => $maxallowedpacket, + 'optional_args' => $optional_args, + 'incremental_backups' => $incremental_backups, + 'install_cron' => $install_cron, + 'compression_command' => $compression_command, + 'compression_extension' => $compression_extension, + 'backupmethod_package' => $backupmethod_package, + 'excludedatabases' => $excludedatabases, + } }) - } diff -pruN 8.1.0-7/manifests/server/binarylog.pp 15.0.0-3/manifests/server/binarylog.pp --- 8.1.0-7/manifests/server/binarylog.pp 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/manifests/server/binarylog.pp 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -# @summary -# Binary log configuration requires the mysql user to be present. This must be done after package install -# -# @api private -# -class mysql::server::binarylog { - - $options = $mysql::server::options - $includedir = $mysql::server::includedir - - $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false) - - if $logbin { - $logbindir = dirname($logbin) - - #Stop puppet from managing directory if just a filename/prefix is specified - if $logbindir != '.' { - file { $logbindir: - ensure => directory, - mode => '0755', - owner => $options['mysqld']['user'], - group => $options['mysqld']['user'], - } - } - } -} diff -pruN 8.1.0-7/manifests/server/config.pp 15.0.0-3/manifests/server/config.pp --- 8.1.0-7/manifests/server/config.pp 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/manifests/server/config.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,9 +4,9 @@ # @api private # class mysql::server::config { - - $options = $mysql::server::options + $options = $mysql::server::_options $includedir = $mysql::server::includedir + $managed_dirs = $mysql::server::managed_dirs File { owner => 'root', @@ -33,11 +33,41 @@ class mysql::server::config { } } - if $mysql::server::manage_config_file { + #Debian: Creating world readable directories before installing. + case $facts['os']['family'] { + 'Debian': { + if $managed_dirs { + $managed_dirs.each | $entry | { + $dir = $options['mysqld']["${entry}"] + + if ( $dir and $dir != '/usr' and $dir != '/tmp' ) { + $clean_dir = stdlib::shell_escape($dir) + $clean_package_name = stdlib::shell_escape($mysql::server::package_name) + + exec { "${entry}-managed_dir-mkdir": + command => ['/bin/mkdir', '-p', $clean_dir], + unless => [['/usr/bin/dpkg', '-s', $clean_package_name]], + notify => Exec["${entry}-managed_dir-chmod"], + } + + exec { "${entry}-managed_dir-chmod": + command => ['/bin/chmod', '777', $clean_dir], + refreshonly => true, + } + } + } + } + } + default: {} + } + + if $mysql::server::manage_config_file { file { 'mysql-config-file': path => $mysql::server::config_file, content => template('mysql/my.cnf.erb'), - mode => '0644', + mode => $mysql::server::config_file_mode, + owner => $mysql::server::mycnf_owner, + group => $mysql::server::mycnf_group, selinux_ignore_defaults => true, } @@ -49,7 +79,7 @@ class mysql::server::config { # We then check that the value of $includedir is either undefined or that different from $configparentdir # We first check that it is undefined due to dirname throwing an error when given undef/empty strings if $includedir == undef or $includedir == '' or - ($configparentdir != $includedir and $configparentdir != dirname($includedir)) { + ($configparentdir != $includedir and $configparentdir != dirname($includedir)) { file { $configparentdir: ensure => directory, mode => '0755', @@ -57,11 +87,4 @@ class mysql::server::config { } } } - - if $options['mysqld']['ssl-disable'] { - notify {'ssl-disable': - message =>'Disabling SSL is evil! You should never ever do this except - if you are forced to use a mysql version compiled without SSL support' - } - } } diff -pruN 8.1.0-7/manifests/server/install.pp 15.0.0-3/manifests/server/install.pp --- 8.1.0-7/manifests/server/install.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/server/install.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,17 +1,16 @@ -# @summary +# @summary # Private class for managing MySQL package. # # @api private # class mysql::server::install { - if $mysql::server::package_manage { - package { 'mysql-server': ensure => $mysql::server::package_ensure, install_options => $mysql::server::install_options, name => $mysql::server::package_name, + provider => $mysql::server::package_provider, + source => $mysql::server::package_source, } } - } diff -pruN 8.1.0-7/manifests/server/installdb.pp 15.0.0-3/manifests/server/installdb.pp --- 8.1.0-7/manifests/server/installdb.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/server/installdb.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,19 +1,18 @@ -# @summary +# @summary # Builds initial databases on installation. # # @api private # class mysql::server::installdb { - $options = $mysql::server::options + $options = $mysql::server::_options if $mysql::server::package_manage { - # Build the initial databases. - $mysqluser = $mysql::server::options['mysqld']['user'] - $datadir = $mysql::server::options['mysqld']['datadir'] - $basedir = $mysql::server::options['mysqld']['basedir'] + $mysqluser = $mysql::server::_options['mysqld']['user'] + $datadir = $mysql::server::_options['mysqld']['datadir'] + $basedir = $mysql::server::_options['mysqld']['basedir'] $config_file = $mysql::server::config_file - $log_error = $mysql::server::options['mysqld']['log-error'] + $log_error = $mysql::server::_options['mysqld']['log-error'] if $mysql::server::manage_config_file and $config_file != $mysql::params::config_file { $_config_file=$config_file @@ -21,15 +20,15 @@ class mysql::server::installdb { $_config_file=undef } - if $options['mysqld']['log-error'] { - file { $options['mysqld']['log-error']: - ensure => present, - owner => $mysqluser, - group => $::mysql::server::mysql_group, - mode => 'u+rw', - require => Mysql_datadir[ $datadir ], + if $options['mysqld']['log-error'] { + file { $options['mysqld']['log-error']: + ensure => file, + owner => $mysqluser, + group => $mysql::server::mysql_group, + mode => 'u+rw', + before => Mysql_datadir[$datadir], + } } - } mysql_datadir { $datadir: ensure => 'present', @@ -46,5 +45,4 @@ class mysql::server::installdb { } } } - } diff -pruN 8.1.0-7/manifests/server/managed_dirs.pp 15.0.0-3/manifests/server/managed_dirs.pp --- 8.1.0-7/manifests/server/managed_dirs.pp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/manifests/server/managed_dirs.pp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,45 @@ +# @summary +# Binary log configuration requires the mysql user to be present. This must be done after package install. +# +# @api private +# +class mysql::server::managed_dirs { + $options = $mysql::server::_options + $includedir = $mysql::server::includedir + $managed_dirs = $mysql::server::managed_dirs + + #Debian: Fix permission on directories + if $managed_dirs { + $managed_dirs_path = $managed_dirs.map |$path| { $options['mysqld']["${path}"] } + $managed_dirs.each | $entry | { + $dir = $options['mysqld']["${entry}"] + if ( $dir and $dir != '/usr' and $dir != '/tmp' ) { + file { "${entry}-managed_dir": + ensure => directory, + path => $dir, + mode => '0700', + owner => $options['mysqld']['user'], + group => $options['mysqld']['user'], + } + } + } + } else { + $managed_dirs_path = [] + } + + $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false) + + if $logbin { + $logbindir = dirname($logbin) + + #Stop puppet from managing directory if just a filename/prefix is specified or is not already managed + if (!($logbindir == '.' or $logbindir in $managed_dirs_path)) { + file { $logbindir: + ensure => directory, + mode => '0700', + owner => $options['mysqld']['user'], + group => $options['mysqld']['user'], + } + } + } +} diff -pruN 8.1.0-7/manifests/server/monitor.pp 15.0.0-3/manifests/server/monitor.pp --- 8.1.0-7/manifests/server/monitor.pp 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/manifests/server/monitor.pp 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -# @summary -# This is a helper class to add a monitoring user to the database -# -# @param mysql_monitor_username -# The username to create for MySQL monitoring. -# @param mysql_monitor_password -# The password to create for MySQL monitoring. -# @param mysql_monitor_hostname -# The hostname from which the monitoring user requests are allowed access. -# -class mysql::server::monitor ( - $mysql_monitor_username = '', - $mysql_monitor_password = '', - $mysql_monitor_hostname = '' -) { - - Anchor['mysql::server::end'] -> Class['mysql::server::monitor'] - - mysql_user { "${mysql_monitor_username}@${mysql_monitor_hostname}": - ensure => present, - password_hash => mysql::password($mysql_monitor_password), - require => Class['mysql::server::service'], - } - - mysql_grant { "${mysql_monitor_username}@${mysql_monitor_hostname}/*.*": - ensure => present, - user => "${mysql_monitor_username}@${mysql_monitor_hostname}", - table => '*.*', - privileges => [ 'PROCESS', 'SUPER' ], - require => Mysql_user["${mysql_monitor_username}@${mysql_monitor_hostname}"], - } - -} diff -pruN 8.1.0-7/manifests/server/mysqltuner.pp 15.0.0-3/manifests/server/mysqltuner.pp --- 8.1.0-7/manifests/server/mysqltuner.pp 2018-10-25 13:53:59.000000000 +0000 +++ 15.0.0-3/manifests/server/mysqltuner.pp 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# @summary -# Manage the MySQLTuner package. -# -# @param ensure -# Ensures that the resource exists. Valid values are 'present', 'absent'. Defaults to 'present'. -# @param version -# The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'. -# @param source -# Source path for the mysqltuner package. -# @param tuner_location -# Destination for the mysqltuner package. -class mysql::server::mysqltuner( - $ensure = 'present', - $version = 'v1.3.0', - $source = undef, - $tuner_location = '/usr/local/bin/mysqltuner', -) { - if $source { - $_source = $source - } else { - $_source = "https://github.com/major/MySQLTuner-perl/raw/${version}/mysqltuner.pl" - } - file { $tuner_location: - ensure => $ensure, - mode => '0550', - source => $_source, - } -} diff -pruN 8.1.0-7/manifests/server/root_password.pp 15.0.0-3/manifests/server/root_password.pp --- 8.1.0-7/manifests/server/root_password.pp 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/manifests/server/root_password.pp 2023-06-19 12:29:51.000000000 +0000 @@ -1,55 +1,61 @@ -# @summary +# @summary # Private class for managing the root password # # @api private # class mysql::server::root_password { + if $mysql::server::root_password =~ Sensitive { + $root_password = $mysql::server::root_password.unwrap + } else { + $root_password = $mysql::server::root_password + } + if $root_password == 'UNSET' { + $root_password_set = false + } else { + $root_password_set = true + } - $options = $mysql::server::options - $secret_file = $mysql::server::install_secret_file + $options = $mysql::server::_options $login_file = $mysql::server::login_file # New installations of MySQL will configure a default random password for the root user # with an expiration. No actions can be performed until this password is changed. The # below exec will remove this default password. If the user has supplied a root # password it will be set further down with the mysql_user resource. - $rm_pass_cmd = join([ - "mysqladmin -u root --password=\$(grep -o '[^ ]\\+\$' ${secret_file}) password ''", - "rm -f ${secret_file}" - ], ' && ') exec { 'remove install pass': - command => $rm_pass_cmd, - onlyif => "test -f ${secret_file}", - path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin' + command => "mysqladmin -u root --password=\$(grep -o '[^ ]\\+\$' /.mysql_secret) password && (rm -f /.mysql_secret; exit 0) || (rm -f /.mysql_secret; exit 1)", + onlyif => [['test', '-f' ,'/.mysql_secret']], + path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', } # manage root password if it is set - if $mysql::server::create_root_user == true and $mysql::server::root_password != 'UNSET' { + if $mysql::server::create_root_user and $root_password_set { mysql_user { 'root@localhost': ensure => present, - password_hash => mysql::password($mysql::server::root_password), - require => Exec['remove install pass'] + password_hash => Deferred('mysql::password', [$mysql::server::root_password]), + require => Exec['remove install pass'], } } - if $mysql::server::create_root_my_cnf == true and $mysql::server::root_password != 'UNSET' { - file { "${::root_home}/.my.cnf": + if $mysql::server::create_root_my_cnf and $root_password_set { + # TODO: use EPP instead of ERB, as EPP can handle Data of Type Sensitive without further ado + file { "${facts['root_home']}/.my.cnf": content => template('mysql/my.cnf.pass.erb'), owner => 'root', mode => '0600', } # show_diff was added with puppet 3.0 - if versioncmp($::puppetversion, '3.0') >= 0 { - File["${::root_home}/.my.cnf"] { show_diff => false } + if versioncmp($facts['puppetversion'], '3.0') >= 0 { + File["${facts['root_home']}/.my.cnf"] { show_diff => false } } - if $mysql::server::create_root_user == true { - Mysql_user['root@localhost'] -> File["${::root_home}/.my.cnf"] + if $mysql::server::create_root_user { + Mysql_user['root@localhost'] -> File["${facts['root_home']}/.my.cnf"] } } - if $mysql::server::create_root_login_file == true and $mysql::server::root_password != 'UNSET' { - file { "${::root_home}/.mylogin.cnf": + if $mysql::server::create_root_login_file and $root_password_set { + file { "${facts['root_home']}/.mylogin.cnf": source => $login_file, owner => 'root', mode => '0600', diff -pruN 8.1.0-7/manifests/server/service.pp 15.0.0-3/manifests/server/service.pp --- 8.1.0-7/manifests/server/service.pp 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/manifests/server/service.pp 2023-06-19 12:29:51.000000000 +0000 @@ -4,7 +4,7 @@ # @api private # class mysql::server::service { - $options = $mysql::server::options + $options = $mysql::server::_options if $mysql::server::real_service_manage { if $mysql::server::real_service_enabled { @@ -17,7 +17,7 @@ class mysql::server::service { } if $mysql::server::override_options and $mysql::server::override_options['mysqld'] - and $mysql::server::override_options['mysqld']['user'] { + and $mysql::server::override_options['mysqld']['user'] { $mysqluser = $mysql::server::override_options['mysqld']['user'] } else { $mysqluser = $options['mysqld']['user'] @@ -42,20 +42,25 @@ class mysql::server::service { # only establish ordering between config file and service if # we're managing the config file. if $mysql::server::manage_config_file { - File['mysql-config-file'] -> Service['mysqld'] + if $mysql::server::reload_on_config_change { + File['mysql-config-file'] ~> Service['mysqld'] + } else { + File['mysql-config-file'] -> Service['mysqld'] + } } if $mysql::server::override_options and $mysql::server::override_options['mysqld'] - and $mysql::server::override_options['mysqld']['socket'] { + and $mysql::server::override_options['mysqld']['socket'] { $mysqlsocket = $mysql::server::override_options['mysqld']['socket'] } else { $mysqlsocket = $options['mysqld']['socket'] } + $test_command = ['test', '-S', stdlib::shell_escape($mysqlsocket)] if $service_ensure != 'stopped' { exec { 'wait_for_mysql_socket_to_open': - command => "test -S ${mysqlsocket}", - unless => "test -S ${mysqlsocket}", + command => $test_command, + unless => [$test_command], tries => '3', try_sleep => '10', require => Service['mysqld'], diff -pruN 8.1.0-7/manifests/server.pp 15.0.0-3/manifests/server.pp --- 8.1.0-7/manifests/server.pp 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/manifests/server.pp 2023-06-19 12:29:51.000000000 +0000 @@ -11,14 +11,17 @@ # # @param config_file # The location, as a path, of the MySQL configuration file. +# @param config_file_mode +# The MySQL configuration file's permissions mode. # @param includedir # The location, as a path, of !includedir for custom configuration overrides. # @param install_options # Passes [install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) array to managed package resources. You must pass the appropriate options for the specified package manager -# @param install_secret_file -# 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 @@ -27,6 +30,10 @@ # Whether to manage the MySQL server package. Defaults to `true`. # @param package_name # The name of the MySQL server package to install. +# @param package_provider +# Define a specific provider for package install. +# @param package_source +# The location of the package source (require for some package provider) # @param purge_conf_dir # Whether the `includedir` directory should be purged. Valid values are `true`, `false`. Defaults to `false`. # @param remove_default_accounts @@ -35,10 +42,20 @@ # Whether the service should be restarted when things change. Valid values are `true`, `false`. Defaults to `false`. # @param root_group # The name of the group used for root. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). +# @param managed_dirs +# An array containing all directories to be managed. # @param mysql_group # The name of the group of the MySQL daemon user. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). +# @param mycnf_owner +# Name or user-id who owns the mysql-config-file. +# @param mycnf_group +# Name or group-id which owns the mysql-config-file. # @param root_password -# The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. This is required if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. +# The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. This is required +# if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and +# `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. +# Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old +# password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. # @param service_enabled # Specifies whether the service should be enabled. Valid values are `true`, `false`. Defaults to `true`. # @param service_manage @@ -48,56 +65,72 @@ # @param service_provider # The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. # @param create_root_user -# Whether root user should be created. Valid values are `true`, `false`. Defaults to `true`. This is useful for a cluster setup with Galera. The root user has to be created only once. You can set this parameter true on one node and set it to false on the remaining nodes. +# Whether root user should be created. Valid values are `true`, `false`. Defaults to `true`. +# This is useful for a cluster setup with Galera. The root user has to be created only once. +# You can set this parameter true on one node and set it to false on the remaining nodes. # @param create_root_my_cnf -# Whether to create `/root/.my.cnf`. Valid values are `true`, `false`. Defaults to `true`. `create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. +# Whether to create `/root/.my.cnf`. Valid values are `true`, `false`. Defaults to `true`. +# `create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. +# You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. +# @param create_root_login_file +# Whether to create a login file for root. Valid values are 'true', 'false'. +# @param login_file +# Specify the login file. # @param users -# Optional hash of users to create, which are passed to [mysql_user](#mysql_user). +# Optional hash of users to create, which are passed to [mysql_user](#mysql_user). # @param grants -# Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). +# Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). # @param databases -# Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). +# Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). +# @param reload_on_config_change +# By default, a my.cnf change won't reload/restart the database. Turn this flag to true to enable it # @param enabled # _Deprecated_ # @param manage_service # _Deprecated_ # @param old_root_password -# 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. +# 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, - $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 = {}, - + String[1] $config_file = $mysql::params::config_file, + String[1] $config_file_mode = '0644', + Optional[String] $includedir = $mysql::params::includedir, + Optional[Array[String[1]]] $install_options = undef, + Variant[Boolean, String[1]] $manage_config_file = true, + Mysql::Options $options = {}, + Hash $override_options = {}, + Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $package_ensure = 'present', + Boolean $package_manage = true, + String[1] $package_name = $mysql::params::server_package_name, + Optional[String[1]] $package_provider = undef, + Optional[String[1]] $package_source = undef, + Variant[Boolean, String[1]] $purge_conf_dir = false, + Variant[Boolean, String[1]] $remove_default_accounts = false, + Variant[Boolean, String[1]] $restart = false, + String[1] $root_group = $mysql::params::root_group, + Optional[Array[String[1]]] $managed_dirs = $mysql::params::managed_dirs, + String[1] $mysql_group = $mysql::params::mysql_group, + Optional[String[1]] $mycnf_owner = undef, + Optional[String[1]] $mycnf_group = undef, + Variant[String, Sensitive[String]] $root_password = 'UNSET', + Variant[Boolean, String[1]] $service_enabled = true, + Variant[Boolean, String[1]] $service_manage = true, + String[1] $service_name = $mysql::params::server_service_name, + Optional[String[1]] $service_provider = $mysql::params::server_service_provider, + Boolean $create_root_user = true, + Boolean $create_root_my_cnf = true, + Boolean $create_root_login_file = false, + Optional[String[1]] $login_file = undef, + Hash $users = {}, + Hash $grants = {}, + Hash $databases = {}, + Boolean $reload_on_config_change = false, # Deprecated parameters - $enabled = undef, - $manage_service = undef, - $old_root_password = undef + Optional[Variant[String[1], Boolean]] $enabled = undef, + Optional[Variant[String[1], Boolean]] $manage_service = undef, + Optional[Variant[String, Sensitive[String]]] $old_root_password = undef ) inherits mysql::params { - # Deprecated parameters. if $enabled { crit('This parameter has been renamed to service_enabled.') @@ -112,24 +145,32 @@ class mysql::server ( $real_service_manage = $service_manage } if $old_root_password { - warning(translate('The `old_root_password` attribute is no longer used and will be removed in a future release.')) + warning('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::params::default_options.deep_merge($override_options) + if ! empty($options) and ! empty($override_options) { + fail('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 <| |> - include '::mysql::server::config' - include '::mysql::server::install' - include '::mysql::server::binarylog' - include '::mysql::server::installdb' - include '::mysql::server::service' - include '::mysql::server::root_password' - include '::mysql::server::providers' + include 'mysql::server::config' + include 'mysql::server::install' + include 'mysql::server::managed_dirs' + include 'mysql::server::installdb' + include 'mysql::server::service' + include 'mysql::server::root_password' + include 'mysql::server::providers' if $remove_default_accounts { - class { '::mysql::server::account_security': + class { 'mysql::server::account_security': require => Anchor['mysql::server::end'], } } @@ -142,15 +183,20 @@ class mysql::server ( ~> Class['mysql::server::service'] } + if $_options['mysqld']['ssl-disable'] { + notify { 'ssl-disable': + message => 'Disabling SSL is evil! You should never ever do this except + if you are forced to use a mysql version compiled without SSL support', + } + } + Anchor['mysql::server::start'] -> Class['mysql::server::config'] -> Class['mysql::server::install'] - -> Class['mysql::server::binarylog'] + -> Class['mysql::server::managed_dirs'] -> Class['mysql::server::installdb'] -> Class['mysql::server::service'] -> Class['mysql::server::root_password'] -> Class['mysql::server::providers'] -> Anchor['mysql::server::end'] - - } diff -pruN 8.1.0-7/metadata.json 15.0.0-3/metadata.json --- 8.1.0-7/metadata.json 2019-04-03 12:49:55.000000000 +0000 +++ 15.0.0-3/metadata.json 2023-06-19 12:29:51.000000000 +0000 @@ -1,87 +1,89 @@ { "name": "puppetlabs-mysql", - "version": "8.1.0", + "version": "15.0.0", "author": "puppetlabs", "summary": "Installs, configures, and manages the MySQL service.", "license": "Apache-2.0", - "source": "git://github.com/puppetlabs/puppetlabs-mysql.git", + "source": "git://github.com/puppetlabs/puppetlabs-mysql", "project_page": "http://github.com/puppetlabs/puppetlabs-mysql", "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 3.2.0 < 6.0.0" - }, - { - "name": "puppetlabs/translate", - "version_requirement": ">= 1.0.0 < 2.0.0" + "version_requirement": ">= 9.0.0 < 10.0.0" } ], - "data_provider": null, "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "5", - "6", - "7" + "7", + "8", + "9" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "5", - "6", - "7" + "7", + "8" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ - "5", - "6", "7" ] }, { + "operatingsystem": "Debian", + "operatingsystemrelease": [ + "10", + "11" + ] + }, + { "operatingsystem": "Scientific", "operatingsystemrelease": [ - "6", "7" ] }, { "operatingsystem": "SLES", "operatingsystemrelease": [ - "11", "12", "15" ] }, { - "operatingsystem": "Debian", + "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "8", - "9" + "18.04", + "20.04", + "22.04" ] }, { - "operatingsystem": "Ubuntu", + "operatingsystem": "Rocky", + "operatingsystemrelease": [ + "8" + ] + }, + { + "operatingsystem": "AlmaLinux", "operatingsystemrelease": [ - "14.04", - "16.04", - "18.04" + "8" ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.7.0 < 7.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ], "description": "MySQL module", - "template-url": "https://github.com/puppetlabs/pdk-templates", - "template-ref": "heads/master-0-gfde5699", - "pdk-version": "1.8.0" + "template-url": "https://github.com/puppetlabs/pdk-templates#main", + "template-ref": "heads/main-0-ge5b0114", + "pdk-version": "2.7.1" } diff -pruN 8.1.0-7/pdk.yaml 15.0.0-3/pdk.yaml --- 8.1.0-7/pdk.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/pdk.yaml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,2 @@ +--- +ignore: [] diff -pruN 8.1.0-7/provision.yaml 15.0.0-3/provision.yaml --- 8.1.0-7/provision.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/provision.yaml 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,88 @@ +--- +default: + provisioner: docker_exp + images: + - litmusimage/centos:7 +vagrant: + provisioner: vagrant + images: + - centos/7 + - generic/ubuntu1804 +travis_deb: + provisioner: docker + images: + - litmusimage/debian:9 + - litmusimage/debian:10 +travis_ub_5: + provisioner: docker + images: + - litmusimage/ubuntu:16.04 + - litmusimage/ubuntu:18.04 +travis_ub_6: + provisioner: docker + images: + - litmusimage/ubuntu:16.04 + - litmusimage/ubuntu:18.04 + - litmusimage/ubuntu:20.04 +travis_el7: + provisioner: docker_exp + images: + - litmusimage/centos:7 + - litmusimage/oraclelinux:7 + - litmusimage/scientificlinux:7 +travis_el8: + provisioner: docker + images: + - litmusimage/centos:8 +release_checks_5: + provisioner: abs + images: + - redhat-6-x86_64 + - redhat-7-x86_64 + - redhat-8-x86_64 + - centos-6-x86_64 + - centos-7-x86_64 + - centos-8-x86_64 + - oracle-5-x86_64 + - oracle-6-x86_64 + - oracle-7-x86_64 + - scientific-6-x86_64 + - scientific-7-x86_64 + - debian-9-x86_64 + - debian-10-x86_64 + - ubuntu-1604-x86_64 + - ubuntu-1804-x86_64 +release_checks_6: + provisioner: abs + images: + - redhat-6-x86_64 + - redhat-7-x86_64 + - redhat-8-x86_64 + - centos-6-x86_64 + - centos-7-x86_64 + - centos-8-x86_64 + - oracle-5-x86_64 + - oracle-6-x86_64 + - oracle-7-x86_64 + - scientific-6-x86_64 + - scientific-7-x86_64 + - debian-9-x86_64 + - debian-10-x86_64 + - ubuntu-1604-x86_64 + - ubuntu-1804-x86_64 + - ubuntu-2004-x86_64 +release_checks_7: + provisioner: abs + images: + - redhat-7-x86_64 + - redhat-8-x86_64 + - centos-7-x86_64 + - centos-8-x86_64 + - oracle-7-x86_64 + - scientific-7-x86_64 + - sles-12-x86_64 + - sles-15-x86_64 + - debian-9-x86_64 + - debian-10-x86_64 + - ubuntu-1804-x86_64 + - ubuntu-2004-x86_64 diff -pruN 8.1.0-7/readmes/README_ja_JP.md 15.0.0-3/readmes/README_ja_JP.md --- 8.1.0-7/readmes/README_ja_JP.md 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/readmes/README_ja_JP.md 2023-06-19 12:29:51.000000000 +0000 @@ -107,11 +107,11 @@ mysql::db { 'mydb': エクスãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒªã‚½ãƒ¼ã‚¹ã‚’å«ã‚€åˆ¥ã®ãƒªã‚½ãƒ¼ã‚¹åを使用ã™ã‚‹ã«ã¯ã€æ¬¡ã®ã‚ˆã†ã«ã—ã¾ã™ã€‚ ```puppet - @@mysql::db { "mydb_${fqdn}": + @@mysql::db { "mydb_${facts['networking']['fqdn']}": user => 'myuser', password => 'mypass', dbname => 'mydb', - host => ${fqdn}, + host => ${facts['networking']['fqdn']}, grant => ['SELECT', 'UPDATE'], tag => $domain, } @@ -513,7 +513,7 @@ MySQLモジュールã«ã¯ã‚µãƒ³ãƒ—ル゠## 制約事項 -サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るオペレーティングシステムã®ä¸€è¦§ã«ã¤ã„ã¦ã¯ã€[metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/master/metadata.json)ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 +サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るオペレーティングシステムã®ä¸€è¦§ã«ã¤ã„ã¦ã¯ã€[metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/main/metadata.json)ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 **注æ„：** mysqlbackup.shã¯ã€MySQL 5.7以é™ã§ã¯å‹•ä½œã›ãšã€ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 diff -pruN 8.1.0-7/spec/acceptance/locales_spec.rb 15.0.0-3/spec/acceptance/locales_spec.rb --- 8.1.0-7/spec/acceptance/locales_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/locales_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -require 'spec_helper_acceptance' -require 'beaker/i18n_helper' - -describe 'mysql localization', if: (os[:family] == 'debian' || os[:family] == 'redhat') && (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5')) do - before :all do - hosts.each do |host| - on(host, "sed -i \"96i FastGettext.locale='ja'\" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb") - change_locale_on(host, 'ja_JP.utf-8') - end - end - - context 'when triggering puppet simple string error' do - # 'service_enabled' being set to false can cause random failures in Debian 9 - let(:os_variant) do - if os[:family] == 'debian' && os[:release].to_i == 9 - 'true' - else - 'false' - end - end - let(:pp) do - <<-MANIFEST - class { 'mysql::server': - config_file => '/tmp/mysql.sFlJdV/my.cnf', - includedir => '/tmp/mysql.sFlJdV/include', - manage_config_file => 'true', - override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }}, - package_ensure => 'present', - purge_conf_dir => 'true', - remove_default_accounts => 'true', - restart => 'true', - root_group => 'root', - root_password => 'test', - old_root_password => 'kittensnmittens', - service_enabled => '#{os_variant}', - } - MANIFEST - end - - it 'displays Japanese error' do - execute_manifest(pp, catch_error: true) do |r| - expect(r.stderr).to match(%r{`old_root_password`属性ã¯å»ƒæ­¢äºˆå®šã§ã‚ã‚Šã€ä»Šå¾Œã®ãƒªãƒªãƒ¼ã‚¹ã§å»ƒæ­¢ã•ã‚Œã¾ã™ã€‚}i) - end - end - end - - context 'when triggering puppet interpolated string failure' do - let(:pp) do - <<-MANIFEST - class { 'mysql::server': root_password => 'password' } - class { 'mysql::server::backup': - backupuser => 'myuser', - backuppassword => 'mypassword', - backupdir => '/tmp/backups', - backupcompress => true, - prescript => true, - provider => 'mysqldump', - execpath => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', - } - MANIFEST - end - - it 'displays Japanese failure' do - execute_manifest(pp, catch_failures: true) do |r| - expect(r.stderr).to match(%r{'prescript'オプションã¯ã€ç¾åœ¨ã€mysqldumpãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—プロãƒã‚¤ãƒ€å‘ã‘ã«ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。}i) - end - end - end - - context 'when triggering ruby simple string failure' do - let(:pp) do - <<-MANIFEST - mysql::db { 'mydb': - user => 'thisisalongusernametestfortodayandtomorrowandthenextdayandthedayafteeeeeeerrrrrrrrrrrrrrr', - password => 'mypass', - host => 'localhost', - grant => ['SELECT', 'UPDATE'], - } - MANIFEST - end - - it 'displays Japanese failure' do - execute_manifest(pp, expect_failures: true) do |r| - expect(r.stderr).to match(%r{MySQLユーザåã¯æœ€å¤§\d{2}文字ã«åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ã€‚}i) - end - end - end - - context 'when triggering ruby interpolated string error' do - let(:pp) do - <<-MANIFEST - mysql_user{ '"name@localhost': - ensure => 'present', - } - MANIFEST - end - - it 'displays Japanese error' do - execute_manifest(pp, expect_failures: true) do |r| - expect(r.stderr).to match(%r{無効ãªãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ¦ãƒ¼ã‚¶"name@localhost}i) - end - end - end - - after :all do - hosts.each do |host| - on(host, 'sed -i "96d" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb') - change_locale_on(host, 'en_US') - end - end -end diff -pruN 8.1.0-7/spec/acceptance/mysql_backup_spec.rb 15.0.0-3/spec/acceptance/mysql_backup_spec.rb --- 8.1.0-7/spec/acceptance/mysql_backup_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/mysql_backup_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -require 'spec_helper_acceptance' -require 'puppet/util/package' -require_relative './mysql_helper.rb' - -describe 'mysql::server::backup class' do - context 'should work with no errors' do - pp = <<-MANIFEST - class { 'mysql::server': root_password => 'password' } - mysql::db { [ - 'backup1', - 'backup2' - ]: - user => 'backup', - password => 'secret', - } - - class { 'mysql::server::backup': - backupuser => 'myuser', - backuppassword => 'mypassword', - backupdir => '/tmp/backups', - backupcompress => true, - postscript => [ - 'rm -rf /var/tmp/mysqlbackups', - 'rm -f /var/tmp/mysqlbackups.done', - 'cp -r /tmp/backups /var/tmp/mysqlbackups', - 'touch /var/tmp/mysqlbackups.done', - ], - execpath => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', - } - MANIFEST - it 'when configuring mysql backups' do - idempotent_apply(default, pp, {}) - end - end - - describe 'mysqlbackup.sh' do - before(:all) do - pre_run - end - - it 'runs mysqlbackup.sh with no errors' do - unless version_is_greater_than('5.7.0') - shell('/usr/local/sbin/mysqlbackup.sh') do |r| - expect(r.stderr).to eq('') - end - end - end - - it 'dumps all databases to single file' do - unless version_is_greater_than('5.7.0') - shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r| - expect(r.stdout).to match(%r{1}) - expect(r.exit_code).to be_zero - end - end - end - - context 'should create one file per database per run' do - it 'executes mysqlbackup.sh a second time' do - unless version_is_greater_than('5.7.0') - shell('sleep 1') - shell('/usr/local/sbin/mysqlbackup.sh') - end - end - - it 'creates at least one backup tarball' do - unless version_is_greater_than('5.7.0') - shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r| - expect(r.stdout).to match(%r{2}) - expect(r.exit_code).to be_zero - end - end - end - end - # rubocop:enable RSpec/MultipleExpectations, RSpec/ExampleLength - end - - context 'with one file per database' do - context 'should work with no errors' do - pp = <<-MANIFEST - class { 'mysql::server': root_password => 'password' } - mysql::db { [ - 'backup1', - 'backup2' - ]: - user => 'backup', - password => 'secret', - } - - class { 'mysql::server::backup': - backupuser => 'myuser', - backuppassword => 'mypassword', - backupdir => '/tmp/backups', - backupcompress => true, - file_per_database => true, - postscript => [ - 'rm -rf /var/tmp/mysqlbackups', - 'rm -f /var/tmp/mysqlbackups.done', - 'cp -r /tmp/backups /var/tmp/mysqlbackups', - 'touch /var/tmp/mysqlbackups.done', - ], - execpath => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', - } - MANIFEST - it 'when configuring mysql backups' do - idempotent_apply(default, pp, {}) - end - end - - describe 'mysqlbackup.sh' do - before(:all) do - pre_run - end - - it 'runs mysqlbackup.sh with no errors without root credentials' do - unless version_is_greater_than('5.7.0') - shell('HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh') do |r| - expect(r.stderr).to eq('') - end - end - end - - it 'creates one file per database' do - unless version_is_greater_than('5.7.0') - ['backup1', 'backup2'].each do |database| - shell("ls -l /tmp/backups/mysql_backup_#{database}_*-*.sql.bz2 | wc -l") do |r| - expect(r.stdout).to match(%r{1}) - expect(r.exit_code).to be_zero - end - end - end - end - - it 'executes mysqlbackup.sh a second time' do - unless version_is_greater_than('5.7.0') - shell('sleep 1') - shell('HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh') - end - end - - it 'has one file per database per run' do - unless version_is_greater_than('5.7.0') - ['backup1', 'backup2'].each do |database| - shell("ls -l /tmp/backups/mysql_backup_#{database}_*-*.sql.bz2 | wc -l") do |r| - expect(r.stdout).to match(%r{2}) - expect(r.exit_code).to be_zero - end - end - end - end - # rubocop:enable RSpec/MultipleExpectations, RSpec/ExampleLength - end - end -end diff -pruN 8.1.0-7/spec/acceptance/mysql_db_spec.rb 15.0.0-3/spec/acceptance/mysql_db_spec.rb --- 8.1.0-7/spec/acceptance/mysql_db_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/mysql_db_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'mysql::db define' do - describe 'creating a database with post-sql' do - let(:pp) do - <<-MANIFEST - class { 'mysql::server': override_options => { 'root_password' => 'password' } } - file { '/tmp/spec.sql': - ensure => file, - content => 'CREATE TABLE table1 (id int);', - before => Mysql::Db['spec2'], - } - mysql::db { 'spec2': - user => 'root1', - password => 'password', - sql => '/tmp/spec.sql', - } - MANIFEST - end - - it_behaves_like 'a idempotent resource' - - describe command("mysql -e 'show tables;' spec2") do - its(:exit_status) { is_expected.to eq 0 } - its(:stdout) { is_expected.to match %r{^table1$} } - end - end -end diff -pruN 8.1.0-7/spec/acceptance/mysql_helper.rb 15.0.0-3/spec/acceptance/mysql_helper.rb --- 8.1.0-7/spec/acceptance/mysql_helper.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/acceptance/mysql_helper.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -def pre_run - execute_manifest("class { 'mysql::server': root_password => 'password' }", catch_failures: true) - @mysql_version = (on default, 'mysql --version').output.chomp.match(%r{\d+\.\d+\.\d+})[0] -end - -def version_is_greater_than(version) - Puppet::Util::Package.versioncmp(@mysql_version, version) > 0 -end diff -pruN 8.1.0-7/spec/acceptance/mysql_server_spec.rb 15.0.0-3/spec/acceptance/mysql_server_spec.rb --- 8.1.0-7/spec/acceptance/mysql_server_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/mysql_server_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'mysql class' do - describe 'advanced config' do - let(:pp) do - <<-MANIFEST - class { 'mysql::server': - manage_config_file => 'true', - override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }}, - package_ensure => 'present', - purge_conf_dir => 'true', - remove_default_accounts => 'true', - restart => 'true', - root_group => 'root', - root_password => 'test', - service_enabled => 'true', - service_manage => 'true', - users => { - 'someuser@localhost' => { - ensure => 'present', - max_connections_per_hour => '0', - max_queries_per_hour => '0', - max_updates_per_hour => '0', - max_user_connections => '0', - password_hash => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF', - }}, - grants => { - 'someuser@localhost/somedb.*' => { - ensure => 'present', - options => ['GRANT'], - privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'], - table => 'somedb.*', - user => 'someuser@localhost', - }, - }, - databases => { - 'somedb' => { - ensure => 'present', - charset => 'utf8', - }, - } - } - MANIFEST - end - - it_behaves_like 'a idempotent resource' - end - - describe 'syslog configuration' do - let(:pp) do - <<-MANIFEST - class { 'mysql::server': - override_options => { 'mysqld' => { 'log-error' => undef }, 'mysqld_safe' => { 'log-error' => false, 'syslog' => true }}, - } - MANIFEST - end - - it_behaves_like 'a idempotent resource' - end -end diff -pruN 8.1.0-7/spec/acceptance/nodesets/centos-7-x64.yml 15.0.0-3/spec/acceptance/nodesets/centos-7-x64.yml --- 8.1.0-7/spec/acceptance/nodesets/centos-7-x64.yml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/acceptance/nodesets/centos-7-x64.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -HOSTS: - centos-7-x64: - roles: - - agent - - default - platform: el-7-x86_64 - hypervisor: vagrant - box: puppetlabs/centos-7.2-64-nocm -CONFIG: - type: foss diff -pruN 8.1.0-7/spec/acceptance/nodesets/debian-8-x64.yml 15.0.0-3/spec/acceptance/nodesets/debian-8-x64.yml --- 8.1.0-7/spec/acceptance/nodesets/debian-8-x64.yml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/acceptance/nodesets/debian-8-x64.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -HOSTS: - debian-8-x64: - roles: - - agent - - default - platform: debian-8-amd64 - hypervisor: vagrant - box: puppetlabs/debian-8.2-64-nocm -CONFIG: - type: foss diff -pruN 8.1.0-7/spec/acceptance/nodesets/default.yml 15.0.0-3/spec/acceptance/nodesets/default.yml --- 8.1.0-7/spec/acceptance/nodesets/default.yml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/acceptance/nodesets/default.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - roles: - - agent - - default - platform: ubuntu-14.04-amd64 - hypervisor: vagrant - box: puppetlabs/ubuntu-14.04-64-nocm -CONFIG: - type: foss diff -pruN 8.1.0-7/spec/acceptance/nodesets/docker/centos-7.yml 15.0.0-3/spec/acceptance/nodesets/docker/centos-7.yml --- 8.1.0-7/spec/acceptance/nodesets/docker/centos-7.yml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/acceptance/nodesets/docker/centos-7.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -HOSTS: - centos-7-x64: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - # install various tools required to get the image up to usable levels - docker_image_commands: - - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts' -CONFIG: - trace_limit: 200 diff -pruN 8.1.0-7/spec/acceptance/nodesets/docker/debian-8.yml 15.0.0-3/spec/acceptance/nodesets/docker/debian-8.yml --- 8.1.0-7/spec/acceptance/nodesets/docker/debian-8.yml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/acceptance/nodesets/docker/debian-8.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen' -CONFIG: - trace_limit: 200 diff -pruN 8.1.0-7/spec/acceptance/nodesets/docker/ubuntu-14.04.yml 15.0.0-3/spec/acceptance/nodesets/docker/ubuntu-14.04.yml --- 8.1.0-7/spec/acceptance/nodesets/docker/ubuntu-14.04.yml 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/acceptance/nodesets/docker/ubuntu-14.04.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 diff -pruN 8.1.0-7/spec/acceptance/sql_task_spec.rb 15.0.0-3/spec/acceptance/sql_task_spec.rb --- 8.1.0-7/spec/acceptance/sql_task_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/sql_task_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# run a test task -require 'spec_helper_acceptance' - -describe 'mysql tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && os[:family] != 'sles' do - describe 'execute some sql' do - pp = <<-MANIFEST - class { 'mysql::server': root_password => 'password' } - mysql::db { 'spec1': - user => 'root1', - password => 'password', - } - MANIFEST - - it 'sets up a mysql instance' do - execute_manifest_on(hosts, pp, catch_failures: true) - end - - it 'execute arbitary sql' do - result = run_task(task_name: 'mysql::sql', params: 'sql="show databases;" password=password') - expect_multiple_regexes(result: result, regexes: [%r{information_schema}, %r{#{task_summary_line}}]) - end - end -end diff -pruN 8.1.0-7/spec/acceptance/types/mysql_database_spec.rb 15.0.0-3/spec/acceptance/types/mysql_database_spec.rb --- 8.1.0-7/spec/acceptance/types/mysql_database_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/types/mysql_database_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'mysql_database' do - describe 'setup' do - pp = <<-MANIFEST - class { 'mysql::server': } - MANIFEST - it 'works with no errors' do - execute_manifest(pp, catch_failures: true) - end - end - - describe 'creating database' do - pp = <<-MANIFEST - mysql_database { 'spec_db': - ensure => present, - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the database #stdout' do - shell("mysql -NBe \"SHOW DATABASES LIKE 'spec_db'\"") do |r| - expect(r.stdout).to match(%r{^spec_db$}) - end - end - it 'finds the database #stderr' do - shell("mysql -NBe \"SHOW DATABASES LIKE 'spec_db'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'charset and collate' do - pp = <<-MANIFEST - mysql_database { 'spec_latin1': - charset => 'latin1', - collate => 'latin1_swedish_ci', - } - mysql_database { 'spec_utf8': - charset => 'utf8', - collate => 'utf8_general_ci', - } - MANIFEST - it 'creates two db of different types idempotently' do - idempotent_apply(default, pp, {}) - end - - it 'finds latin1 db #stdout' do - shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_latin1") do |r| - expect(r.stdout).to match(%r{^character_set_database\tlatin1\ncollation_database\tlatin1_swedish_ci$}) - end - end - it 'finds latin1 db #stderr' do - shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_latin1") do |r| - expect(r.stderr).to be_empty - end - end - - it 'finds utf8 db #stdout' do - shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_utf8") do |r| - expect(r.stdout).to match(%r{^character_set_database\tutf8\ncollation_database\tutf8_general_ci$}) - end - end - it 'finds utf8 db #stderr' do - shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_utf8") do |r| - expect(r.stderr).to be_empty - end - end - end -end diff -pruN 8.1.0-7/spec/acceptance/types/mysql_grant_spec.rb 15.0.0-3/spec/acceptance/types/mysql_grant_spec.rb --- 8.1.0-7/spec/acceptance/types/mysql_grant_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/acceptance/types/mysql_grant_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,748 +0,0 @@ -require 'spec_helper_acceptance' -require 'puppet/util/package' -require_relative '../mysql_helper.rb' - -describe 'mysql_grant' do - before(:all) do - pp = <<-MANIFEST - class { 'mysql::server': - root_password => 'password', - } - MANIFEST - - execute_manifest(pp, catch_failures: true) - end - - describe 'missing privileges for user' do - pp = <<-MANIFEST - mysql_user { 'test1@tester': - ensure => present, - } - mysql_grant { 'test1@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test1@tester', - require => Mysql_user['test1@tester'], - } - MANIFEST - it 'fails' do - expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`privileges` `parameter` is required}) - end - - it 'does not find the user' do - expect(shell('mysql -NBe "SHOW GRANTS FOR test1@tester"', acceptable_exit_codes: 1).stderr).to match(%r{There is no such grant defined for user 'test1' on host 'tester'}) - end - end - - describe 'missing table for user' do - pp = <<-MANIFEST - mysql_user { 'atest@tester': - ensure => present, - } - mysql_grant { 'atest@tester/test.*': - ensure => 'present', - user => 'atest@tester', - privileges => ['ALL'], - require => Mysql_user['atest@tester'], - } - MANIFEST - it 'fails' do - execute_manifest(pp, expect_failures: true) - end - - it 'does not find the user' do - expect(shell('mysql -NBe "SHOW GRANTS FOR atest@tester"', acceptable_exit_codes: 1).stderr).to match(%r{There is no such grant defined for user 'atest' on host 'tester'}) - end - end - - describe 'adding privileges' do - pp = <<-MANIFEST - mysql_user { 'test2@tester': - ensure => present, - } - mysql_grant { 'test2@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test2@tester', - privileges => ['SELECT', 'UPDATE'], - require => Mysql_user['test2@tester'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR test2@tester"') do |r| - expect(r.stdout).to match(%r{GRANT SELECT, UPDATE.*TO 'test2'@'tester'}) - end - end - it 'finds the user #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR test2@tester"') do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'adding privileges with special character in name' do - pp = <<-MANIFEST - mysql_user { 'test-2@tester': - ensure => present, - } - mysql_grant { 'test-2@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test-2@tester', - privileges => ['SELECT', 'UPDATE'], - require => Mysql_user['test-2@tester'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test-2'@tester\"") do |r| - expect(r.stdout).to match(%r{GRANT SELECT, UPDATE.*TO 'test-2'@'tester'}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test-2'@tester\"") do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'adding option' do - pp = <<-MANIFEST - mysql_user { 'test3@tester': - ensure => present, - } - mysql_grant { 'test3@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test3@tester', - options => ['GRANT'], - privileges => ['SELECT', 'UPDATE'], - require => Mysql_user['test3@tester'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR test3@tester"') do |r| - expect(r.stdout).to match(%r{GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$}) - end - end - it 'finds the user #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR test3@tester"') do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'adding all privileges without table' do - pp = <<-MANIFEST - mysql_user { 'test4@tester': - ensure => present, - } - mysql_grant { 'test4@tester/test.*': - ensure => 'present', - user => 'test4@tester', - options => ['GRANT'], - privileges => ['SELECT', 'UPDATE', 'ALL'], - require => Mysql_user['test4@tester'], - } - MANIFEST - it 'fails' do - expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`table` `parameter` is required.}) - end - end - - describe 'adding all privileges' do - pp = <<-MANIFEST - mysql_user { 'test4@tester': - ensure => present, - } - mysql_grant { 'test4@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test4@tester', - options => ['GRANT'], - privileges => ['SELECT', 'UPDATE', 'ALL'], - require => Mysql_user['test4@tester'], - } - MANIFEST - it 'onlies try to apply ALL' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR test4@tester"') do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION}) - end - end - it 'finds the user #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR test4@tester"') do |r| - expect(r.stderr).to be_empty - end - end - end - - # Test combinations of user@host to ensure all cases work. - describe 'short hostname' do - pp = <<-MANIFEST - mysql_user { 'test@short': - ensure => present, - } - mysql_grant { 'test@short/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@short', - privileges => 'ALL', - require => Mysql_user['test@short'], - } - mysql_user { 'test@long.hostname.com': - ensure => present, - } - mysql_grant { 'test@long.hostname.com/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@long.hostname.com', - privileges => 'ALL', - require => Mysql_user['test@long.hostname.com'], - } - mysql_user { 'test@192.168.5.6': - ensure => present, - } - mysql_grant { 'test@192.168.5.6/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@192.168.5.6', - privileges => 'ALL', - require => Mysql_user['test@192.168.5.6'], - } - mysql_user { 'test@2607:f0d0:1002:0051:0000:0000:0000:0004': - ensure => present, - } - mysql_grant { 'test@2607:f0d0:1002:0051:0000:0000:0000:0004/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@2607:f0d0:1002:0051:0000:0000:0000:0004', - privileges => 'ALL', - require => Mysql_user['test@2607:f0d0:1002:0051:0000:0000:0000:0004'], - } - mysql_user { 'test@::1/128': - ensure => present, - } - mysql_grant { 'test@::1/128/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@::1/128', - privileges => 'ALL', - require => Mysql_user['test@::1/128'], - } - MANIFEST - it 'applies' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds short hostname #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR test@short"') do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'}) - end - end - it 'finds short hostname #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR test@short"') do |r| - expect(r.stderr).to be_empty - end - end - - it 'finds long hostname #stdout' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'long.hostname.com'}) - end - end - it 'finds long hostname #stderr' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r| - expect(r.stderr).to be_empty - end - end - - it 'finds ipv4 #stdout' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.6'}) - end - end - it 'finds ipv4 #stderr' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r| - expect(r.stderr).to be_empty - end - end - - it 'finds ipv6 #stdout' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'}) - end - end - it 'finds ipv6 #stderr' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r| - expect(r.stderr).to be_empty - end - end - - it 'finds short ipv6 #stdout' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'::1\/128'}) - end - end - it 'finds short ipv6 @stderr' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'complex test' do - pp = <<-MANIFEST - $dbSubnet = '10.10.10.%' - - mysql_database { 'foo': - ensure => present, - } - - exec { 'mysql-create-table': - command => '/usr/bin/mysql -NBe "CREATE TABLE foo.bar (name VARCHAR(20))"', - environment => "HOME=${::root_home}", - unless => '/usr/bin/mysql -NBe "SELECT 1 FROM foo.bar LIMIT 1;"', - require => Mysql_database['foo'], - } - - Mysql_grant { - ensure => present, - options => ['GRANT'], - privileges => ['ALL'], - table => '*.*', - require => [ Mysql_database['foo'], Exec['mysql-create-table'] ], - } - - mysql_user { "user1@${dbSubnet}": - ensure => present, - } - mysql_grant { "user1@${dbSubnet}/*.*": - user => "user1@${dbSubnet}", - require => Mysql_user["user1@${dbSubnet}"], - } - mysql_user { "user2@${dbSubnet}": - ensure => present, - } - mysql_grant { "user2@${dbSubnet}/foo.bar": - privileges => ['SELECT', 'INSERT', 'UPDATE'], - user => "user2@${dbSubnet}", - table => 'foo.bar', - require => Mysql_user["user2@${dbSubnet}"], - } - mysql_user { "user3@${dbSubnet}": - ensure => present, - } - mysql_grant { "user3@${dbSubnet}/foo.*": - privileges => ['SELECT', 'INSERT', 'UPDATE'], - user => "user3@${dbSubnet}", - table => 'foo.*', - require => Mysql_user["user3@${dbSubnet}"], - } - mysql_user { 'web@%': - ensure => present, - } - mysql_grant { 'web@%/*.*': - user => 'web@%', - require => Mysql_user['web@%'], - } - mysql_user { "web@${dbSubnet}": - ensure => present, - } - mysql_grant { "web@${dbSubnet}/*.*": - user => "web@${dbSubnet}", - require => Mysql_user["web@${dbSubnet}"], - } - mysql_user { "web@${fqdn}": - ensure => present, - } - mysql_grant { "web@${fqdn}/*.*": - user => "web@${fqdn}", - require => Mysql_user["web@${fqdn}"], - } - mysql_user { 'web@localhost': - ensure => present, - } - mysql_grant { 'web@localhost/*.*': - user => 'web@localhost', - require => Mysql_user['web@localhost'], - } - MANIFEST - it 'setup mysql::server' do - execute_manifest(pp, catch_failures: true) - execute_manifest(pp, catch_changes: true) - end - end - - describe 'lower case privileges' do - pp_one = <<-MANIFEST - mysql_user { 'lowercase@localhost': - ensure => present, - } - mysql_grant { 'lowercase@localhost/*.*': - user => 'lowercase@localhost', - privileges => 'ALL', - table => '*.*', - require => Mysql_user['lowercase@localhost'], - } - MANIFEST - it 'create ALL privs' do - execute_manifest(pp_one, catch_failures: true) - end - - pp_two = <<-MANIFEST - mysql_user { 'lowercase@localhost': - ensure => present, - } - mysql_grant { 'lowercase@localhost/*.*': - user => 'lowercase@localhost', - privileges => 'all', - table => '*.*', - require => Mysql_user['lowercase@localhost'], - } - MANIFEST - it 'create lowercase all privs' do - expect(execute_manifest(pp_two, catch_failures: true).exit_code).to eq(0) - end - end - - describe 'adding procedure privileges' do - pp = <<-MANIFEST - exec { 'simpleproc-create': - command => 'mysql --user="root" --password="password" --database=mysql --delimiter="//" -NBe "CREATE PROCEDURE simpleproc (OUT param1 INT) BEGIN SELECT COUNT(*) INTO param1 FROM t; end//"', - path => '/usr/bin/', - before => Mysql_user['test2@tester'], - } - mysql_user { 'test2@tester': - ensure => present, - } - mysql_grant { 'test2@tester/PROCEDURE mysql.simpleproc': - ensure => 'present', - table => 'PROCEDURE mysql.simpleproc', - user => 'test2@tester', - privileges => ['EXECUTE'], - require => Mysql_user['test2@tester'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR test2@tester"') do |r| - expect(r.stdout).to match(%r{GRANT EXECUTE ON PROCEDURE `mysql`.`simpleproc` TO 'test2'@'tester'}) - end - end - it 'finds the user #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR test2@tester"') do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'adding function privileges' do - it 'works without errors' do - pp = <<-EOS - exec { 'simplefunc-create': - command => '/usr/bin/mysql --user="root" --password="password" --database=mysql -NBe "CREATE FUNCTION simplefunc (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT(\\'Hello, \\', s, \\'!\\')"', - before => Mysql_user['test3@tester'], - } - - mysql_user { 'test3@tester': - ensure => 'present', - } - - mysql_grant { 'test3@tester/FUNCTION mysql.simplefunc': - ensure => 'present', - table => 'FUNCTION mysql.simplefunc', - user => 'test3@tester', - privileges => ['EXECUTE'], - require => Mysql_user['test3@tester'], - } - EOS - - execute_manifest(pp, catch_failures: true) - end - # rubocop:enable RSpec/ExampleLength - it 'finds the user' do - shell('mysql -NBe "SHOW GRANTS FOR test3@tester"') do |r| - expect(r.stdout).to match(%r{GRANT EXECUTE ON FUNCTION `mysql`.`simplefunc` TO 'test3'@'tester'}) - expect(r.stderr).to be_empty - end - end - # rubocop:enable RSpec/MultipleExpectations - end - - describe 'proxy privilieges' do - pre_run - - describe 'adding proxy privileges', if: version_is_greater_than('5.5.0') do - pp = <<-MANIFEST - mysql_user { 'proxy1@tester': - ensure => present, - } - mysql_grant { 'proxy1@tester/proxy_user@proxy_host': - ensure => 'present', - table => 'proxy_user@proxy_host', - user => 'proxy1@tester', - privileges => ['PROXY'], - require => Mysql_user['proxy1@tester'], - } - MANIFEST - it 'works without errors when version greater than 5.5.0' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR proxy1@tester"') do |r| - expect(r.stdout).to match(%r{GRANT PROXY ON 'proxy_user'@'proxy_host' TO 'proxy1'@'tester'}) - end - end - it 'finds the user #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR proxy1@tester"') do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'removing proxy privileges', if: version_is_greater_than('5.5.0') do - pp = <<-MANIFEST - mysql_user { 'proxy1@tester': - ensure => present, - } - mysql_grant { 'proxy1@tester/proxy_user@proxy_host': - ensure => 'absent', - table => 'proxy_user@proxy_host', - user => 'proxy1@tester', - privileges => ['PROXY'], - require => Mysql_user['proxy1@tester'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the user #stdout' do - shell('mysql -NBe "SHOW GRANTS FOR proxy1@tester"') do |r| - expect(r.stdout).not_to match(%r{GRANT PROXY ON 'proxy_user'@'proxy_host' TO 'proxy1'@'tester'}) - end - end - it 'finds the user #stderr' do - shell('mysql -NBe "SHOW GRANTS FOR proxy1@tester"') do |r| - expect(r.stderr).to be_empty - end - end - end - - describe 'adding proxy privileges with other privileges', if: version_is_greater_than('5.5.0') do - pp = <<-MANIFEST - mysql_user { 'proxy2@tester': - ensure => present, - } - mysql_grant { 'proxy2@tester/proxy_user@proxy_host': - ensure => 'present', - table => 'proxy_user@proxy_host', - user => 'proxy2@tester', - privileges => ['PROXY', 'SELECT'], - require => Mysql_user['proxy2@tester'], - } - MANIFEST - it 'fails' do - expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`privileges` `parameter`: PROXY can only be specified by itself}) - end - - it 'does not find the user' do - expect(shell('mysql -NBe "SHOW GRANTS FOR proxy2@tester"', acceptable_exit_codes: 1).stderr).to match(%r{There is no such grant defined for user 'proxy2' on host 'tester'}) - end - end - - describe 'adding proxy privileges with mysql version less than 5.5.0', unless: version_is_greater_than('5.5.0') do - pp = <<-MANIFEST - mysql_user { 'proxy3@tester': - ensure => present, - } - mysql_grant { 'proxy3@tester/proxy_user@proxy_host': - ensure => 'present', - table => 'proxy_user@proxy_host', - user => 'proxy3@tester', - privileges => ['PROXY', 'SELECT'], - require => Mysql_user['proxy3@tester'], - } - MANIFEST - it 'fails' do - expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{PROXY user not supported on mysql versions < 5\.5\.0}i) - end - - it 'does not find the user' do - expect(shell('mysql -NBe "SHOW GRANTS FOR proxy2@tester"', acceptable_exit_codes: 1).stderr).to match(%r{There is no such grant defined for user 'proxy2' on host 'tester'}) - end - end - - describe 'adding proxy privileges with invalid proxy user', if: version_is_greater_than('5.5.0') do - pp = <<-MANIFEST - mysql_user { 'proxy3@tester': - ensure => present, - } - mysql_grant { 'proxy3@tester/invalid_proxy_user': - ensure => 'present', - table => 'invalid_proxy_user', - user => 'proxy3@tester', - privileges => ['PROXY'], - require => Mysql_user['proxy3@tester'], - } - MANIFEST - it 'fails' do - expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`table` `property` for PROXY should be specified as proxy_user@proxy_host.}) - end - - it 'does not find the user' do - expect(shell('mysql -NBe "SHOW GRANTS FOR proxy3@tester"', acceptable_exit_codes: 1).stderr).to match(%r{There is no such grant defined for user 'proxy3' on host 'tester'}) - end - end - end - - describe 'grants with skip-name-resolve specified' do - pp_one = <<-MANIFEST - class { 'mysql::server': - override_options => { - 'mysqld' => {'skip-name-resolve' => true} - }, - restart => true, - } - MANIFEST - it 'setup mysql::server' do - execute_manifest(pp_one, catch_failures: true) - end - - pp_two = <<-MANIFEST - mysql_user { 'test@fqdn.com': - ensure => present, - } - mysql_grant { 'test@fqdn.com/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@fqdn.com', - privileges => 'ALL', - require => Mysql_user['test@fqdn.com'], - } - mysql_user { 'test@192.168.5.7': - ensure => present, - } - mysql_grant { 'test@192.168.5.7/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@192.168.5.7', - privileges => 'ALL', - require => Mysql_user['test@192.168.5.7'], - } - MANIFEST - it 'applies' do - execute_manifest(pp_two, catch_failures: true) - end - - it 'fails with fqdn' do - pre_run - unless version_is_greater_than('5.7.0') - expect(shell('mysql -NBe "SHOW GRANTS FOR test@fqdn.com"', acceptable_exit_codes: 1).stderr).to match(%r{There is no such grant defined for user 'test' on host 'fqdn.com'}) - end - end - - it 'finds ipv4 #stdout' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.7'\"") do |r| - expect(r.stdout).to match(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.7'}) - end - end - it 'finds ipv4 #stderr' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.7'\"") do |r| - expect(r.stderr).to be_empty - end - end - - pp_three = <<-MANIFEST - mysql_user { 'test@fqdn.com': - ensure => present, - } - mysql_grant { 'test@fqdn.com/test.*': - ensure => 'present', - table => 'test.*', - user => 'test@fqdn.com', - privileges => 'ALL', - require => Mysql_user['test@fqdn.com'], - } - MANIFEST - it 'fails to execute while applying' do - mysql_cmd = shell('which mysql').stdout.chomp - shell("mv #{mysql_cmd} #{mysql_cmd}.bak") - expect(execute_manifest(pp_three, expect_failures: true).stderr).to match(%r{Could not find a suitable provider for mysql_grant}) - shell("mv #{mysql_cmd}.bak #{mysql_cmd}") - end - - pp_four = <<-MANIFEST - class { 'mysql::server': - restart => true, - } - MANIFEST - it 'reset mysql::server config' do - execute_manifest(pp_four, catch_failures: true) - end - end - - describe 'adding privileges to specific table' do - # Using puppet_apply as a helper - pp_one = <<-MANIFEST - class { 'mysql::server': override_options => { 'root_password' => 'password' } } - MANIFEST - it 'setup mysql server' do - execute_manifest(pp_one, catch_failures: true) - end - - pp_two = <<-MANIFEST - mysql_user { 'test@localhost': - ensure => present, - } - mysql_grant { 'test@localhost/grant_spec_db.grant_spec_table': - user => 'test@localhost', - privileges => ['SELECT'], - table => 'grant_spec_db.grant_spec_table', - require => Mysql_user['test@localhost'], - } - MANIFEST - it 'creates grant on missing table will fail' do - expect(execute_manifest(pp_two, expect_failures: true).stderr).to match(%r{Table 'grant_spec_db\.grant_spec_table' doesn't exist}) - end - - pp_three = <<-MANIFEST - file { '/tmp/grant_spec_table.sql': - ensure => file, - content => 'CREATE TABLE grant_spec_table (id int);', - before => Mysql::Db['grant_spec_db'], - } - mysql::db { 'grant_spec_db': - user => 'root1', - password => 'password', - sql => '/tmp/grant_spec_table.sql', - } - MANIFEST - it 'creates table' do - execute_manifest(pp_three, catch_failures: true) - end - - it 'has the table' do - expect(shell("mysql -e 'show tables;' grant_spec_db|grep grant_spec_table").exit_code).to be_zero - end - end -end diff -pruN 8.1.0-7/spec/acceptance/types/mysql_plugin_spec.rb 15.0.0-3/spec/acceptance/types/mysql_plugin_spec.rb --- 8.1.0-7/spec/acceptance/types/mysql_plugin_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/acceptance/types/mysql_plugin_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -require 'spec_helper_acceptance' - -# Different operating systems (and therefore different versions/forks -# of mysql) have varying levels of support for plugins and have -# different plugins available. Choose a plugin that works or don't try -# to test plugins if not available. -if fact('osfamily') == 'redhat' - if os[:release].to_i == 5 - plugin = nil # Plugins not supported on mysql on RHEL 5 - elsif os[:release].to_i == 6 - plugin = 'example' - plugin_lib = 'ha_example.so' - elsif os[:release].to_i == 7 - plugin = 'pam' - plugin_lib = 'auth_pam.so' - end -elsif fact('osfamily') == 'debian' - if os[:family] == 'ubuntu' - if os[:release] =~ %r{^16\.04|^18\.04} - # On Xenial running 5.7.12, the example plugin does not appear to be available. - plugin = 'validate_password' - plugin_lib = 'validate_password.so' - else - plugin = 'example' - plugin_lib = 'ha_example.so' - end - end -elsif fact('osfamily') == 'suse' - plugin = nil # Plugin library path is broken on Suse http://lists.opensuse.org/opensuse-bugs/2013-08/msg01123.html -end - -describe 'mysql_plugin' do - if plugin # if plugins are supported - describe 'setup' do - it 'works with no errors' do - pp = <<-MANIFEST - class { 'mysql::server': } - MANIFEST - - execute_manifest(pp, catch_failures: true) - end - end - - describe 'load plugin' do - pp = <<-MANIFEST - mysql_plugin { #{plugin}: - ensure => present, - soname => '#{plugin_lib}', - } - MANIFEST - it 'works without errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'finds the plugin #stdout' do - shell("mysql -NBe \"select plugin_name from information_schema.plugins where plugin_name='#{plugin}'\"") do |r| - expect(r.stdout).to match(%r{^#{plugin}$}i) - end - end - it 'finds the plugin #stderr' do - shell("mysql -NBe \"select plugin_name from information_schema.plugins where plugin_name='#{plugin}'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - end -end diff -pruN 8.1.0-7/spec/acceptance/types/mysql_user_spec.rb 15.0.0-3/spec/acceptance/types/mysql_user_spec.rb --- 8.1.0-7/spec/acceptance/types/mysql_user_spec.rb 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/spec/acceptance/types/mysql_user_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -require 'spec_helper_acceptance' -require_relative '../mysql_helper.rb' - -describe 'mysql_user' do - describe 'setup' do - pp_one = <<-MANIFEST - class { 'mysql::server': } - MANIFEST - it 'works with no errors' do - execute_manifest(pp_one, catch_failures: true) - end - end - - context 'using ashp@localhost' do - describe 'adding user' do - pp_two = <<-MANIFEST - mysql_user { 'ashp@localhost': - password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', - } - MANIFEST - it 'works without errors' do - execute_manifest(pp_two, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout).to match(%r{^1$}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - - it 'has no SSL options #stdout' do - shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout).to match(%r{^\s*$}) - end - end - it 'has no SSL options #stderr' do - shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - - pre_run - describe 'changing authentication plugin', if: version_is_greater_than('5.5.0') do - it 'works without errors' do - pp = <<-EOS - mysql_user { 'ashp@localhost': - plugin => 'auth_socket', - } - EOS - - execute_manifest(pp, catch_failures: true) - end - - it 'has the correct plugin' do - shell("mysql -NBe \"select plugin from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout.rstrip).to eq('auth_socket') - expect(r.stderr).to be_empty - end - end - - it 'does not have a password' do - pre_run - table = if version_is_greater_than('5.7.0') - 'authentication_string' - else - 'password' - end - shell("mysql -NBe \"select #{table} from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout.rstrip).to be_empty - expect(r.stderr).to be_empty - end - end - end - # rubocop:enable RSpec/ExampleLength, RSpec/MultipleExpectations - end - - context 'using ashp-dash@localhost' do - describe 'adding user' do - pp_three = <<-MANIFEST - mysql_user { 'ashp-dash@localhost': - password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', - } - MANIFEST - it 'works without errors' do - execute_manifest(pp_three, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp-dash@localhost'\"") do |r| - expect(r.stdout).to match(%r{^1$}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp-dash@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - end - - context 'using foo@bar@localhost' do - describe 'adding user' do - pp_three = <<-MANIFEST - mysql_user { 'foo@bar@localhost': - password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', - } - MANIFEST - it 'works without errors' do - execute_manifest(pp_three, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'foo@bar@localhost'\"") do |r| - expect(r.stdout).to match(%r{^1$}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'foo@bar@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - end - - context 'using ashp@LocalHost' do - describe 'adding user' do - pp_four = <<-MANIFEST - mysql_user { 'ashp@LocalHost': - password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', - } - MANIFEST - it 'works without errors' do - execute_manifest(pp_four, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout).to match(%r{^1$}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - end - context 'using resource should throw no errors' do - describe 'find users' do - it do - on default, puppet('resource mysql_user'), catch_failures: true do |r| - expect(r.stdout).not_to match(%r{Error:}) - end - end - it do - on default, puppet('resource mysql_user'), catch_failures: true do |r| - expect(r.stdout).not_to match(%r{must be properly quoted, invalid character:}) - end - end - end - end - context 'using user-w-ssl@localhost with SSL' do - describe 'adding user' do - pp_five = <<-MANIFEST - mysql_user { 'user-w-ssl@localhost': - password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', - tls_options => ['SSL'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp_five, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'user-w-ssl@localhost'\"") do |r| - expect(r.stdout).to match(%r{^1$}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'user-w-ssl@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - - it 'shows correct ssl_type #stdout' do - shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'user-w-ssl@localhost'\"") do |r| - expect(r.stdout).to match(%r{^ANY$}) - end - end - it 'shows correct ssl_type #stderr' do - shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'user-w-ssl@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - end - context 'using user-w-x509@localhost with X509' do - describe 'adding user' do - pp_six = <<-MANIFEST - mysql_user { 'user-w-x509@localhost': - password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', - tls_options => ['X509'], - } - MANIFEST - it 'works without errors' do - execute_manifest(pp_six, catch_failures: true) - end - - it 'finds the user #stdout' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'user-w-x509@localhost'\"") do |r| - expect(r.stdout).to match(%r{^1$}) - end - end - it 'finds the user #stderr' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'user-w-x509@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - - it 'shows correct ssl_type #stdout' do - shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'user-w-x509@localhost'\"") do |r| - expect(r.stdout).to match(%r{^X509$}) - end - end - it 'shows correct ssl_type #stderr' do - shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'user-w-x509@localhost'\"") do |r| - expect(r.stderr).to be_empty - end - end - end - end -end diff -pruN 8.1.0-7/spec/classes/graceful_failures_spec.rb 15.0.0-3/spec/classes/graceful_failures_spec.rb --- 8.1.0-7/spec/classes/graceful_failures_spec.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/classes/graceful_failures_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -require 'spec_helper' - -describe 'mysql::server' do - context 'on an unsupported OS' do - let(:facts) do - { - osfamily: 'UNSUPPORTED', - operatingsystem: 'UNSUPPORTED', - } - end - - it 'gracefully fails' do - is_expected.to compile.and_raise_error(%r{Unsupported platform:}) - end - end -end diff -pruN 8.1.0-7/spec/classes/mycnf_template_spec.rb 15.0.0-3/spec/classes/mycnf_template_spec.rb --- 8.1.0-7/spec/classes/mycnf_template_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/classes/mycnf_template_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -require 'spec_helper' - -describe 'mysql::server' do - on_supported_os.each do |os, facts| - context "my.cnf template - on #{os}" do - let(:facts) do - facts.merge(root_home: '/root') - end - - context 'normal entry' do - let(:params) { { override_options: { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } } } - - it do - is_expected.to contain_file('mysql-config-file').with(mode: '0644', - selinux_ignore_defaults: true).with_content(%r{socket = \/var\/lib\/mysql\/mysql.sock}) - end - end - - describe 'array entry' do - let(:params) { { override_options: { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2'] } } } } - - it do - is_expected.to contain_file('mysql-config-file').with_content( - %r{.*replicate-do-db = base1\nreplicate-do-db = base2.*}, - ) - end - end - - describe 'skip-name-resolve set to an empty string' do - let(:params) { { override_options: { 'mysqld' => { 'skip-name-resolve' => '' } } } } - - it { is_expected.to contain_file('mysql-config-file').with_content(%r{^skip-name-resolve$}) } - end - - describe 'ssl set to true' do - let(:params) { { override_options: { 'mysqld' => { 'ssl' => true } } } } - - it { is_expected.to contain_file('mysql-config-file').with_content(%r{ssl}) } - it { is_expected.to contain_file('mysql-config-file').without_content(%r{ssl = true}) } - end - - describe 'ssl set to false' do - let(:params) { { override_options: { 'mysqld' => { 'ssl' => false } } } } - - it { is_expected.to contain_file('mysql-config-file').with_content(%r{ssl = false}) } - end - - # ssl-disable (and ssl) are special cased within mysql. - describe 'possibility of disabling ssl completely' do - let(:params) { { override_options: { 'mysqld' => { 'ssl' => true, 'ssl-disable' => true } } } } - - it { is_expected.to contain_file('mysql-config-file').without_content(%r{ssl = true}) } - end - - describe 'a non ssl option set to true' do - let(:params) { { override_options: { 'mysqld' => { 'test' => true } } } } - - it { is_expected.to contain_file('mysql-config-file').with_content(%r{^test$}) } - it { is_expected.to contain_file('mysql-config-file').without_content(%r{test = true}) } - end - - context 'with includedir' do - let(:params) { { includedir: '/etc/my.cnf.d' } } - - it 'makes the directory' do - is_expected.to contain_file('/etc/my.cnf.d').with(ensure: :directory, - mode: '0755') - end - - it { is_expected.to contain_file('mysql-config-file').with_content(%r{!includedir}) } - end - - context 'without includedir' do - let(:params) { { includedir: '' } } - - it 'shouldnt contain the directory' do - is_expected.not_to contain_file('mysql-config-file').with(ensure: :directory, - mode: '0755') - end - - it { is_expected.to contain_file('mysql-config-file').without_content(%r{!includedir}) } - end - end - end -end diff -pruN 8.1.0-7/spec/classes/mysql_bindings_spec.rb 15.0.0-3/spec/classes/mysql_bindings_spec.rb --- 8.1.0-7/spec/classes/mysql_bindings_spec.rb 2018-05-23 17:51:58.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_bindings_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -require 'spec_helper' - -describe 'mysql::bindings' do - on_supported_os.each do |os, facts| - next if facts[:osfamily] == 'Archlinux' - context "on #{os}" do - let(:facts) do - facts.merge(root_home: '/root') - end - - let(:params) do - { - 'java_enable' => true, - 'perl_enable' => true, - 'php_enable' => true, - 'python_enable' => true, - 'ruby_enable' => true, - 'client_dev' => true, - 'daemon_dev' => true, - 'client_dev_package_name' => 'libmysqlclient-devel', - 'daemon_dev_package_name' => 'mysql-devel', - } - end - - it { is_expected.to contain_package('mysql-connector-java') } - it { is_expected.to contain_package('perl_mysql') } - it { is_expected.to contain_package('python-mysqldb') } - it { is_expected.to contain_package('ruby_mysql') } - it { is_expected.to contain_package('mysql-client_dev') } - it { is_expected.to contain_package('mysql-daemon_dev') } - end - end -end diff -pruN 8.1.0-7/spec/classes/mysql_client_spec.rb 15.0.0-3/spec/classes/mysql_client_spec.rb --- 8.1.0-7/spec/classes/mysql_client_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_client_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -require 'spec_helper' - -describe 'mysql::client' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge(root_home: '/root') - end - - context 'with defaults' do - it { is_expected.not_to contain_class('mysql::bindings') } - it { is_expected.to contain_package('mysql_client') } - end - - context 'with bindings enabled' do - let(:params) { { bindings_enable: true } } - - it { is_expected.to contain_class('mysql::bindings') } - it { is_expected.to contain_package('mysql_client') } - end - - context 'with package_manage set to true' do - let(:params) { { package_manage: true } } - - it { is_expected.to contain_package('mysql_client') } - end - - context 'with package_manage set to false' do - let(:params) { { package_manage: false } } - - it { is_expected.not_to contain_package('mysql_client') } - end - end - end -end diff -pruN 8.1.0-7/spec/classes/mysql_server_account_security_spec.rb 15.0.0-3/spec/classes/mysql_server_account_security_spec.rb --- 8.1.0-7/spec/classes/mysql_server_account_security_spec.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_server_account_security_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -require 'spec_helper' - -describe 'mysql::server::account_security' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:pre_condition) do - <<-EOF - anchor {'mysql::server::end': } - EOF - end - - context 'with fqdn==myhost.mydomain' do - let(:facts) do - facts.merge(root_home: '/root', - fqdn: 'myhost.mydomain', - hostname: 'myhost') - end - - ['root@myhost.mydomain', - 'root@127.0.0.1', - 'root@::1', - '@myhost.mydomain', - '@localhost', - '@%'].each do |user| - it "removes Mysql_User[#{user}]" do # rubocop:disable RSpec/RepeatedExample - is_expected.to contain_mysql_user(user).with_ensure('absent') - end - end - - # When the hostname doesn't match the fqdn we also remove these. - # We don't need to test the inverse as when they match they are - # covered by the above list. - ['root@myhost', '@myhost'].each do |user| - it "removes Mysql_User[#{user}]" do # rubocop:disable RSpec/RepeatedExample - is_expected.to contain_mysql_user(user).with_ensure('absent') - end - end - - it 'removes Mysql_database[test]' do - is_expected.to contain_mysql_database('test').with_ensure('absent') - end - end - - context 'with fqdn==localhost' do - let(:facts) do - facts.merge(root_home: '/root', - fqdn: 'localhost', - hostname: 'localhost') - end - - ['root@127.0.0.1', - 'root@::1', - '@localhost', - 'root@localhost.localdomain', - '@localhost.localdomain', - '@%'].each do |user| - it "removes Mysql_User[#{user}] for fqdn==localhost" do - is_expected.to contain_mysql_user(user).with_ensure('absent') - end - end - end - - context 'with fqdn==localhost.localdomain' do - let(:facts) do - facts.merge(root_home: '/root', - fqdn: 'localhost.localdomain', - hostname: 'localhost') - end - - ['root@127.0.0.1', - 'root@::1', - '@localhost', - 'root@localhost.localdomain', - '@localhost.localdomain', - '@%'].each do |user| - it "removes Mysql_User[#{user}] for fqdn==localhost.localdomain" do - is_expected.to contain_mysql_user(user).with_ensure('absent') - end - end - end - end - end -end diff -pruN 8.1.0-7/spec/classes/mysql_server_backup_spec.rb 15.0.0-3/spec/classes/mysql_server_backup_spec.rb --- 8.1.0-7/spec/classes/mysql_server_backup_spec.rb 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_server_backup_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,417 +0,0 @@ -require 'spec_helper' - -describe 'mysql::server::backup' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:pre_condition) do - <<-EOF - class { 'mysql::server': } - EOF - end - let(:facts) do - facts.merge(root_home: '/root') - end - - let(:default_params) do - { 'backupuser' => 'testuser', - 'backuppassword' => 'testpass', - 'backupdir' => '/tmp', - 'backuprotate' => '25', - 'delete_before_dump' => true, - 'execpath' => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', - 'maxallowedpacket' => '1M' } - end - - context 'standard conditions' do - let(:params) { default_params } - - # Cannot use that_requires here, doesn't work on classes. - it { - is_expected.to contain_mysql_user('testuser@localhost').with( - require: 'Class[Mysql::Server::Root_password]', - ) - } - - it { - is_expected.to contain_mysql_grant('testuser@localhost/*.*').with( - privileges: ['SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS'], - ).that_requires('Mysql_user[testuser@localhost]') - } - - context 'with triggers included' do - let(:params) do - { include_triggers: true }.merge(default_params) - end - - it { - is_expected.to contain_mysql_grant('testuser@localhost/*.*').with( - privileges: ['SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS', 'TRIGGER'], - ).that_requires('Mysql_user[testuser@localhost]') - } - end - - it { - is_expected.to contain_cron('mysql-backup').with( - command: '/usr/local/sbin/mysqlbackup.sh', - ensure: 'present', - ) - } - - it { - is_expected.to contain_file('mysqlbackup.sh').with( - path: '/usr/local/sbin/mysqlbackup.sh', - ensure: 'present', - ) - } - - it { - is_expected.to contain_file('mysqlbackupdir').with( - path: '/tmp', - ensure: 'directory', - ) - } - - it 'has compression by default' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{bzcat -zc}, - ) - end - - it 'skips backing up events table by default' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="--ignore-table=mysql.event"}, - ) - end - - it 'does not mention triggers by default because file_per_database is false' do - is_expected.to contain_file('mysqlbackup.sh').without_content( - %r{.*triggers.*}, - ) - end - - it 'does not mention routines by default because file_per_database is false' do - is_expected.to contain_file('mysqlbackup.sh').without_content( - %r{.*routines.*}, - ) - end - - it 'has 25 days of rotation' do - # MySQL counts from 0 - is_expected.to contain_file('mysqlbackup.sh').with_content(%r{.*ROTATE=24.*}) - end - - it 'has a standard PATH' do - is_expected.to contain_file('mysqlbackup.sh').with_content(%r{PATH=/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin}) - end - end - - context 'custom ownership and mode for backupdir' do - let(:params) do - { backupdirmode: '0750', - backupdirowner: 'testuser', - backupdirgroup: 'testgrp' }.merge(default_params) - end - - it { - is_expected.to contain_file('mysqlbackupdir').with( - path: '/tmp', ensure: 'directory', - mode: '0750', owner: 'testuser', - group: 'testgrp' - ) - } - end - - context 'with compression disabled' do - let(:params) do - { backupcompress: false }.merge(default_params) - end - - it { - is_expected.to contain_file('mysqlbackup.sh').with( - path: '/usr/local/sbin/mysqlbackup.sh', - ensure: 'present', - ) - } - - it 'is able to disable compression' do - is_expected.to contain_file('mysqlbackup.sh').without_content( - %r{.*bzcat -zc.*}, - ) - end - end - - context 'with mysql.events backedup' do - let(:params) do - { ignore_events: false }.merge(default_params) - end - - it { - is_expected.to contain_file('mysqlbackup.sh').with( - path: '/usr/local/sbin/mysqlbackup.sh', - ensure: 'present', - ) - } - - it 'is able to backup events table' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="--events"}, - ) - end - end - - context 'with database list specified' do - let(:params) do - { backupdatabases: ['mysql'] }.merge(default_params) - end - - it { - is_expected.to contain_file('mysqlbackup.sh').with( - path: '/usr/local/sbin/mysqlbackup.sh', - ensure: 'present', - ) - } - - it 'has a backup file for each database' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{mysql | bzcat -zc \${DIR}\\\${PREFIX}mysql_`date'}, - ) - end - - it 'skips backup triggers by default' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-triggers"}, - ) - end - - it 'skips backing up routines by default' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-routines"}, - ) - end - - context 'with include_triggers set to true' do - let(:params) do - default_params.merge(backupdatabases: ['mysql'], - include_triggers: true) - end - - it 'backups triggers when asked' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --triggers"}, - ) - end - end - - context 'with include_triggers set to false' do - let(:params) do - default_params.merge(backupdatabases: ['mysql'], - include_triggers: false) - end - - it 'skips backing up triggers when asked to skip' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-triggers"}, - ) - end - end - - context 'with include_routines set to true' do - let(:params) do - default_params.merge(backupdatabases: ['mysql'], - include_routines: true) - end - - it 'backups routines when asked' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --routines"}, - ) - end - end - - context 'with include_routines set to false' do - let(:params) do - default_params.merge(backupdatabases: ['mysql'], - include_triggers: true) - end - - it 'skips backing up routines when asked to skip' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-routines"}, - ) - end - end - end - - context 'with file per database' do - let(:params) do - default_params.merge(file_per_database: true) - end - - it 'loops through backup all databases' do - is_expected.to contain_file('mysqlbackup.sh').with_content(%r{.*SHOW DATABASES.*}) - end - - context 'with compression disabled' do - let(:params) do - default_params.merge(file_per_database: true, backupcompress: false) - end - - it 'loops through backup all databases without compression #show databases' do - is_expected.to contain_file('mysqlbackup.sh').with_content(%r{.*SHOW DATABASES.*}) - end - it 'loops through backup all databases without compression #bzcat' do - is_expected.to contain_file('mysqlbackup.sh').without_content(%r{.*bzcat -zc.*}) - end - end - - it 'skips backup triggers by default' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-triggers"}, - ) - end - - it 'skips backing up routines by default' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-routines"}, - ) - end - - context 'with include_triggers set to true' do - let(:params) do - default_params.merge(file_per_database: true, - include_triggers: true) - end - - it 'backups triggers when asked' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --triggers"}, - ) - end - end - - context 'with include_triggers set to false' do - let(:params) do - default_params.merge(file_per_database: true, - include_triggers: false) - end - - it 'skips backing up triggers when asked to skip' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-triggers"}, - ) - end - end - - context 'with include_routines set to true' do - let(:params) do - default_params.merge(file_per_database: true, - include_routines: true) - end - - it 'backups routines when asked' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --routines"}, - ) - end - end - - context 'with include_routines set to false' do - let(:params) do - default_params.merge(file_per_database: true, - include_triggers: true) - end - - it 'skips backing up routines when asked to skip' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-routines"}, - ) - end - end - end - - context 'with postscript' do - let(:params) do - default_params.merge(postscript: 'rsync -a /tmp backup01.local-lan:') - end - - it 'is add postscript' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{rsync -a \/tmp backup01.local-lan:}, - ) - end - end - - context 'with postscripts' do - let(:params) do - default_params.merge(postscript: [ - 'rsync -a /tmp backup01.local-lan:', - 'rsync -a /tmp backup02.local-lan:', - ]) - end - - it 'is add postscript' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - %r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*}, - ) - end - end - - context 'with the xtrabackup provider' do - let(:params) do - default_params.merge(provider: 'xtrabackup') - end - - it 'contains the wrapper script' do - is_expected.to contain_file('xtrabackup.sh').with_content( - %r{(\n*^xtrabackup\s+.*\$@)}, - ) - end - - context 'with prescript defined' do - let(:params) do - default_params.merge(provider: 'xtrabackup', - prescript: [ - 'rsync -a /tmp backup01.local-lan:', - 'rsync -a /tmp backup02.local-lan:', - ]) - end - - it 'contains the prescript' do - is_expected.to contain_file('xtrabackup.sh').with_content( - %r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*}, - ) - end - end - - context 'with postscript defined' do - let(:params) do - default_params.merge(provider: 'xtrabackup', - postscript: [ - 'rsync -a /tmp backup01.local-lan:', - 'rsync -a /tmp backup02.local-lan:', - ]) - end - - it 'contains the prostscript' do - is_expected.to contain_file('xtrabackup.sh').with_content( - %r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*}, - ) - end - end - context 'with mariabackup' do - let(:params) do - default_params.merge(provider: 'xtrabackup', - backupmethod: 'mariabackup') - end - - it 'contain the mariabackup executor' do - is_expected.to contain_file('xtrabackup.sh').with_content( - %r{(\n*^mariabackup\s+.*\$@)}, - ) - end - end - end - end - end - # rubocop:enable RSpec/NestedGroups -end diff -pruN 8.1.0-7/spec/classes/mysql_server_monitor_spec.rb 15.0.0-3/spec/classes/mysql_server_monitor_spec.rb --- 8.1.0-7/spec/classes/mysql_server_monitor_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_server_monitor_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -require 'spec_helper' -describe 'mysql::server::monitor' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge(root_home: '/root') - end - - let :pre_condition do - "include 'mysql::server'" - end - - let :default_params do - { - mysql_monitor_username: 'monitoruser', - mysql_monitor_password: 'monitorpass', - mysql_monitor_hostname: 'monitorhost', - } - end - - let :params do - default_params - end - - it { is_expected.to contain_mysql_user('monitoruser@monitorhost') } - - it { - is_expected.to contain_mysql_grant('monitoruser@monitorhost/*.*').with( - ensure: 'present', user: 'monitoruser@monitorhost', - table: '*.*', privileges: ['PROCESS', 'SUPER'], - require: 'Mysql_user[monitoruser@monitorhost]' - ) - } - end - end -end diff -pruN 8.1.0-7/spec/classes/mysql_server_mysqltuner_spec.rb 15.0.0-3/spec/classes/mysql_server_mysqltuner_spec.rb --- 8.1.0-7/spec/classes/mysql_server_mysqltuner_spec.rb 2018-10-25 13:53:59.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_server_mysqltuner_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -require 'spec_helper' - -describe 'mysql::server::mysqltuner' do - context 'ensure => present' do - it { is_expected.to compile } - it { - is_expected.to contain_file('/usr/local/bin/mysqltuner') - } - end - - context 'ensure => absent' do - let(:params) { { ensure: 'absent' } } - - it { is_expected.to compile } - it { is_expected.to contain_file('/usr/local/bin/mysqltuner').with(ensure: 'absent') } - end - - context 'custom version' do - let(:params) { { version: 'v1.2.0' } } - - it { is_expected.to compile } - it { - is_expected.to contain_file('/usr/local/bin/mysqltuner') - } - end - - context 'custom source' do - let(:params) { { source: '/tmp/foo' } } - - it { is_expected.to compile } - it { - is_expected.to contain_file('/usr/local/bin/mysqltuner') - } - end -end diff -pruN 8.1.0-7/spec/classes/mysql_server_spec.rb 15.0.0-3/spec/classes/mysql_server_spec.rb --- 8.1.0-7/spec/classes/mysql_server_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/classes/mysql_server_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -require 'spec_helper' - -describe 'mysql::server' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge(root_home: '/root') - end - - context 'with defaults' do - it { is_expected.to contain_class('mysql::server::install') } - it { is_expected.to contain_class('mysql::server::config') } - it { is_expected.to contain_class('mysql::server::service') } - it { is_expected.to contain_class('mysql::server::root_password') } - it { is_expected.to contain_class('mysql::server::providers') } - end - - context 'with remove_default_accounts set' do - let(:params) { { remove_default_accounts: true } } - - it { is_expected.to contain_class('mysql::server::account_security') } - end - - context 'when not managing config file' do - let(:params) { { manage_config_file: false } } - - it { is_expected.to compile.with_all_deps } - end - - context 'when not managing the service' do - let(:params) { { service_manage: false } } - - it { is_expected.to compile.with_all_deps } - it { is_expected.not_to contain_service('mysqld') } - end - - context 'mysql::server::install' do - it 'contains the package by default' do - is_expected.to contain_package('mysql-server').with(ensure: :present) - end - context 'with package_manage set to true' do - let(:params) { { package_manage: true } } - - it { is_expected.to contain_package('mysql-server') } - end - context 'with package_manage set to false' do - let(:params) { { package_manage: false } } - - it { is_expected.not_to contain_package('mysql-server') } - end - context 'with datadir overridden' do - let(:params) { { override_options: { 'mysqld' => { 'datadir' => '/tmp' } } } } - - it { is_expected.to contain_mysql_datadir('/tmp') } - end - end - - context 'mysql::server::service' do - context 'with defaults' do - it { is_expected.to contain_service('mysqld') } - end - context 'with package_manage set to true' do - let(:params) { { package_manage: true } } - - it { is_expected.to contain_service('mysqld').that_requires('Package[mysql-server]') } - end - context 'with package_manage set to false' do - let(:params) { { package_manage: false } } - - it { is_expected.to contain_service('mysqld') } - it { is_expected.not_to contain_service('mysqld').that_requires('Package[mysql-server]') } - end - context 'service_enabled set to false' do - let(:params) { { service_enabled: false } } - - it do - is_expected.to contain_service('mysqld').with(ensure: :stopped) - end - context 'with package_manage set to true' do - let(:params) { { package_manage: true } } - - it { is_expected.to contain_package('mysql-server') } - end - context 'with package_manage set to false' do - let(:params) { { package_manage: false } } - - it { is_expected.not_to contain_package('mysql-server') } - end - context 'with datadir overridden' do - let(:params) { { override_options: { 'mysqld' => { 'datadir' => '/tmp' } } } } - - it { is_expected.to contain_mysql_datadir('/tmp') } - end - end - context 'with log-error overridden' do - let(:params) { { override_options: { 'mysqld' => { 'log-error' => '/tmp/error.log' } } } } - - it { is_expected.to contain_file('/tmp/error.log') } - end - context 'default bind-address' do - it { is_expected.to contain_file('mysql-config-file').with_content(%r{^bind-address = 127.0.0.1}) } - end - context 'with defined bind-address' do - let(:params) { { override_options: { 'mysqld' => { 'bind-address' => '1.1.1.1' } } } } - - it { is_expected.to contain_file('mysql-config-file').with_content(%r{^bind-address = 1.1.1.1}) } - end - context 'without bind-address' do - let(:params) { { override_options: { 'mysqld' => { 'bind-address' => :undef } } } } - - it { is_expected.to contain_file('mysql-config-file').without_content(%r{^bind-address}) } - end - end - - context 'mysql::server::root_password' do - describe 'when defaults' do - it { - is_expected.to contain_exec('remove install pass').with( - command: 'mysqladmin -u root --password=$(grep -o \'[^ ]\\+$\' /.mysql_secret) password \'\' && rm -f /.mysql_secret', - onlyif: 'test -f /.mysql_secret', - path: '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', - ) - } - it { is_expected.not_to contain_mysql_user('root@localhost') } - it { is_expected.not_to contain_file('/root/.my.cnf') } - end - describe 'when root_password set' do - let(:params) { { root_password: 'SET' } } - - it { is_expected.to contain_mysql_user('root@localhost') } - if Puppet.version.to_f >= 3.0 - it { is_expected.to contain_file('/root/.my.cnf').with(show_diff: false).that_requires('Mysql_user[root@localhost]') } - else - it { is_expected.to contain_file('/root/.my.cnf').that_requires('Mysql_user[root@localhost]') } - end - end - describe 'when root_password set, create_root_user set to false' do - let(:params) { { root_password: 'SET', create_root_user: false } } - - it { is_expected.not_to contain_mysql_user('root@localhost') } - if Puppet.version.to_f >= 3.0 - it { is_expected.to contain_file('/root/.my.cnf').with(show_diff: false) } - else - it { is_expected.to contain_file('/root/.my.cnf') } - end - end - describe 'when root_password set, create_root_my_cnf set to false' do - let(:params) { { root_password: 'SET', create_root_my_cnf: false } } - - it { is_expected.to contain_mysql_user('root@localhost') } - it { is_expected.not_to contain_file('/root/.my.cnf') } - end - describe 'when root_password set, create_root_user and create_root_my_cnf set to false' do - let(:params) { { root_password: 'SET', create_root_user: false, create_root_my_cnf: false } } - - it { is_expected.not_to contain_mysql_user('root@localhost') } - it { is_expected.not_to contain_file('/root/.my.cnf') } - end - describe 'when install_secret_file set to /root/.mysql_secret' do - let(:params) { { install_secret_file: '/root/.mysql_secret' } } - - it { - is_expected.to contain_exec('remove install pass').with( - command: 'mysqladmin -u root --password=$(grep -o \'[^ ]\\+$\' /root/.mysql_secret) password \'\' && rm -f /root/.mysql_secret', - onlyif: 'test -f /root/.mysql_secret', - ) - } - end - end - - context 'mysql::server::providers' do - describe 'with users' do - let(:params) do - { users: { - 'foo@localhost' => { - 'max_connections_per_hour' => '1', - 'max_queries_per_hour' => '2', - 'max_updates_per_hour' => '3', - 'max_user_connections' => '4', - 'password_hash' => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF', - }, - 'foo2@localhost' => {}, - } } - end - - it { - is_expected.to contain_mysql_user('foo@localhost').with( - max_connections_per_hour: '1', max_queries_per_hour: '2', - max_updates_per_hour: '3', max_user_connections: '4', - password_hash: '*F3A2A51A9B0F2BE2468926B4132313728C250DBF' - ) - } - it { - is_expected.to contain_mysql_user('foo2@localhost').with( - max_connections_per_hour: nil, max_queries_per_hour: nil, - max_updates_per_hour: nil, max_user_connections: nil, - password_hash: nil - ) - } - end - - describe 'with grants' do - let(:params) do - { grants: { - 'foo@localhost/somedb.*' => { - 'user' => 'foo@localhost', - 'table' => 'somedb.*', - 'privileges' => ['SELECT', 'UPDATE'], - 'options' => ['GRANT'], - }, - 'foo2@localhost/*.*' => { - 'user' => 'foo2@localhost', - 'table' => '*.*', - 'privileges' => ['SELECT'], - }, - } } - end - - it { - is_expected.to contain_mysql_grant('foo@localhost/somedb.*').with( - user: 'foo@localhost', table: 'somedb.*', - privileges: ['SELECT', 'UPDATE'], options: ['GRANT'] - ) - } - it { - is_expected.to contain_mysql_grant('foo2@localhost/*.*').with( - user: 'foo2@localhost', table: '*.*', - privileges: ['SELECT'], options: nil - ) - } - end - - describe 'with databases' do - let(:params) do - { databases: { - 'somedb' => { - 'charset' => 'latin1', - 'collate' => 'latin1', - }, - 'somedb2' => {}, - } } - end - - it { - is_expected.to contain_mysql_database('somedb').with( - charset: 'latin1', - collate: 'latin1', - ) - } - it { is_expected.to contain_mysql_database('somedb2') } - end - end - end - end - # rubocop:enable RSpec/NestedGroups -end diff -pruN 8.1.0-7/spec/default_facts.yml 15.0.0-3/spec/default_facts.yml --- 8.1.0-7/spec/default_facts.yml 2019-01-23 13:25:53.000000000 +0000 +++ 15.0.0-3/spec/default_facts.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# Use default_module_facts.yml for module specific facts. -# -# Facts specified here will override the values provided by rspec-puppet-facts. ---- -ipaddress: "172.16.254.254" -is_pe: false -macaddress: "AA:AA:AA:AA:AA:AA" diff -pruN 8.1.0-7/spec/defines/mysql_db_spec.rb 15.0.0-3/spec/defines/mysql_db_spec.rb --- 8.1.0-7/spec/defines/mysql_db_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/defines/mysql_db_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -require 'spec_helper' - -describe 'mysql::db', type: :define do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge(root_home: '/root') - end - - let(:title) { 'test_db' } - - let(:params) do - { 'user' => 'testuser', - 'password' => 'testpass', - 'mysql_exec_path' => '' } - end - - it 'does not notify the import sql exec if no sql script was provided' do - is_expected.to contain_mysql_database('test_db').without_notify - end - - it 'subscribes to database if sql script is given' do - params['sql'] = 'test_sql' - is_expected.to contain_mysql_database('test_db') - is_expected.to contain_exec('test_db-import').with_subscribe('Mysql_database[test_db]') - end - - it 'onlies import sql script on creation if not enforcing' do - params.merge!('sql' => 'test_sql', 'enforce_sql' => false) - is_expected.to contain_exec('test_db-import').with_refreshonly(true) - end - - it 'imports sql script on creation' do - params.merge!('sql' => 'test_sql', 'enforce_sql' => true) - # ' if enforcing #refreshonly' - is_expected.to contain_exec('test_db-import').with_refreshonly(false) - # 'if enforcing #command' - is_expected.to contain_exec('test_db-import').with_command('cat test_sql | mysql test_db') - end - - it 'imports sql script with custom command on creation ' do - params.merge!('sql' => 'test_sql', 'enforce_sql' => true, 'import_cat_cmd' => 'zcat') - # if enforcing #refreshonly - is_expected.to contain_exec('test_db-import').with_refreshonly(false) - # if enforcing #command - is_expected.to contain_exec('test_db-import').with_command('zcat test_sql | mysql test_db') - end - - it 'imports sql scripts when more than one is specified' do - params['sql'] = ['test_sql', 'test_2_sql'] - is_expected.to contain_exec('test_db-import').with_command('cat test_sql test_2_sql | mysql test_db') - end - - it 'does not create database' do - params.merge!('ensure' => 'absent', 'host' => 'localhost') - is_expected.to contain_mysql_database('test_db').with_ensure('absent') - is_expected.to contain_mysql_user('testuser@localhost').with_ensure('absent') - end - - it 'creates with an appropriate collate and charset' do - params.merge!('charset' => 'utf8', 'collate' => 'utf8_danish_ci') - is_expected.to contain_mysql_database('test_db').with('charset' => 'utf8', - 'collate' => 'utf8_danish_ci') - end - - it 'uses dbname parameter as database name instead of name' do - params['dbname'] = 'real_db' - is_expected.to contain_mysql_database('real_db') - end - - it 'uses tls_options for user when set' do - params['tls_options'] = ['SSL'] - is_expected.to contain_mysql_user('testuser@localhost').with_tls_options(['SSL']) - end - - it 'uses grant_options for grant when set' do - params['grant_options'] = ['GRANT'] - is_expected.to contain_mysql_grant('testuser@localhost/test_db.*').with_options(['GRANT']) - end - end - end -end diff -pruN 8.1.0-7/spec/functions/mysql_password_spec.rb 15.0.0-3/spec/functions/mysql_password_spec.rb --- 8.1.0-7/spec/functions/mysql_password_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/functions/mysql_password_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -require 'spec_helper' - -describe 'mysql::password' do - it 'exists' do - is_expected.not_to eq(nil) - end - - it 'raises a ArgumentError if there is less than 1 arguments' do - is_expected.to run.with_params.and_raise_error(ArgumentError) - end - - it 'raises a ArgumentError if there is more than 1 arguments' do - is_expected.to run.with_params('foo', 'bar').and_raise_error(ArgumentError) - end - - it 'converts password into a hash' do - is_expected.to run.with_params('password').and_return('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19') - end - - it 'password should be String' do - is_expected.to run.with_params(123).and_raise_error(ArgumentError) - end - - it 'converts an empty password into a empty string' do - is_expected.to run.with_params('').and_return('') - end - - it 'does not convert a password that is already a hash' do - is_expected.to run.with_params('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19').and_return('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19') - end -end diff -pruN 8.1.0-7/spec/functions/mysql_strip_hash_spec.rb 15.0.0-3/spec/functions/mysql_strip_hash_spec.rb --- 8.1.0-7/spec/functions/mysql_strip_hash_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/functions/mysql_strip_hash_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -require 'spec_helper' - -describe 'mysql::strip_hash' do - it 'exists' do - is_expected.not_to eq(nil) - end - - it 'raises a ArgumentError if there is less than 1 arguments' do - is_expected.to run.with_params.and_raise_error(ArgumentError) - end - - it 'raises a ArgumentError if there is more than 1 arguments' do - is_expected.to run.with_params({ 'foo' => 1 }, 'bar' => 2).and_raise_error(ArgumentError) - end - - it 'raises a ArgumentError if argument is not a hash' do - is_expected.to run.with_params('foo').and_raise_error(ArgumentError) - end - - it 'passes a hash without blanks through' do - is_expected.to run.with_params('one' => 1, 'two' => 2, 'three' => 3).and_return('one' => 1, 'two' => 2, 'three' => 3) - end - - it 'removes blank hash elements' do - is_expected.to run.with_params('one' => 1, 'two' => '', 'three' => nil, 'four' => 4).and_return('one' => 1, 'three' => nil, 'four' => 4) - end -end diff -pruN 8.1.0-7/spec/spec_helper.rb 15.0.0-3/spec/spec_helper.rb --- 8.1.0-7/spec/spec_helper.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/spec_helper.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -require 'puppetlabs_spec_helper/module_spec_helper' -require 'rspec-puppet-facts' - -require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb')) - -include RspecPuppetFacts - -default_facts = { - puppetversion: Puppet.version, - facterversion: Facter.version, -} - -default_fact_files = [ - File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')), - File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')), -] - -default_fact_files.each do |f| - next unless File.exist?(f) && File.readable?(f) && File.size?(f) - - begin - default_facts.merge!(YAML.safe_load(File.read(f), [], [], true)) - rescue => e - RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" - end -end - -RSpec.configure do |c| - c.default_facts = default_facts - c.before :each do - # set to strictest setting for testing - # by default Puppet runs at warning level - Puppet.settings[:strict] = :warning - end - c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] - c.after(:suite) do - end -end - -def ensure_module_defined(module_name) - module_name.split('::').reduce(Object) do |last_module, next_module| - last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false) - last_module.const_get(next_module, false) - end -end - -# 'spec_overrides' from sync.yml will appear below this line -require 'spec_helper_local' diff -pruN 8.1.0-7/spec/spec_helper_acceptance.rb 15.0.0-3/spec/spec_helper_acceptance.rb --- 8.1.0-7/spec/spec_helper_acceptance.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/spec_helper_acceptance.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -require 'beaker-pe' -require 'beaker-puppet' -require 'puppet' -require 'beaker-rspec' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' -require 'beaker/i18n_helper' -require 'beaker-task_helper' -require 'beaker/testmode_switcher' -require 'beaker/testmode_switcher/dsl' - -run_puppet_install_helper -configure_type_defaults_on(hosts) -install_ca_certs unless pe_install? -install_bolt_on(hosts) unless pe_install? -install_module_on(hosts) -install_module_dependencies_on(hosts) - -def idempotent_apply(hosts, manifest, opts = {}, &block) - block_on hosts, opts do |host| - file_path = host.tmpfile('apply_manifest.pp') - create_remote_file(host, file_path, manifest + "\n") - - puppet_apply_opts = { :verbose => nil, 'detailed-exitcodes' => nil } - on_options = { acceptable_exit_codes: [0, 2] } - on host, puppet('apply', file_path, puppet_apply_opts), on_options, &block - puppet_apply_opts2 = { :verbose => nil, 'detailed-exitcodes' => nil } - on_options2 = { acceptable_exit_codes: [0] } - on host, puppet('apply', file_path, puppet_apply_opts2), on_options2, &block - end -end - -RSpec.configure do |c| - # Readable test descriptions - c.formatter = :documentation - - # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case - # also note how fact('puppetversion') is not available because of PUP-4359 - if os[:family] == 'debian' && os[:release].to_i == 8 && shell('puppet --version').stdout =~ %r{^4\.2} - c.filter_run_excluding skip_pup_5016: true - end - - # Configure all nodes in nodeset - c.before :suite do - run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0')) - hosts.each do |host| - # This will be removed, this is temporary to test localisation. - - if os[:family] == 'debian' - # install language on debian systems - install_language_on(host, 'ja_JP.utf-8') if not_controller(host) - # This will be removed, this is temporary to test localisation. - end - # Required for binding tests. - if os[:family] == 'redhat' - if os[:release].to_i == 7 || os[:family] == 'fedora' - shell('yum install -y bzip2') - end - end - on host, puppet('module', 'install', 'stahnma/epel') - end - end -end - -shared_examples 'a idempotent resource' do - it 'applies with no errors' do - execute_manifest(pp, catch_failures: true) - end - - it 'applies a second time without changes', :skip_pup_5016 do - execute_manifest(pp, catch_changes: true) - end -end diff -pruN 8.1.0-7/spec/spec_helper_local.rb 15.0.0-3/spec/spec_helper_local.rb --- 8.1.0-7/spec/spec_helper_local.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/spec_helper_local.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -require 'rspec-puppet-facts' -include RspecPuppetFacts - -if ENV['COVERAGE'] == 'yes' - require 'simplecov' - require 'simplecov-console' - require 'codecov' - - SimpleCov.formatters = [ - SimpleCov::Formatter::HTMLFormatter, - SimpleCov::Formatter::Console, - SimpleCov::Formatter::Codecov, - ] - SimpleCov.start do - track_files 'lib/**/*.rb' - - add_filter '/spec' - - # do not track vendored files - add_filter '/vendor' - add_filter '/.vendor' - - # do not track gitignored files - # this adds about 4 seconds to the coverage check - # this could definitely be optimized - add_filter do |f| - # system returns true if exit status is 0, which with git-check-ignore means file is ignored - system("git check-ignore --quiet #{f.filename}") - end - end -end diff -pruN 8.1.0-7/spec/unit/facter/mysql_server_id_spec.rb 15.0.0-3/spec/unit/facter/mysql_server_id_spec.rb --- 8.1.0-7/spec/unit/facter/mysql_server_id_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/unit/facter/mysql_server_id_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -require 'spec_helper' - -describe Facter::Util::Fact.to_s do - before(:each) do - Facter.clear - end - - describe 'mysql_server_id' do - context "igalic's laptop" do - before :each do - Facter.fact(:macaddress).stubs(:value).returns('3c:97:0e:69:fb:e1') - end - it do - Facter.fact(:mysql_server_id).value.to_s.should == '4116385' - end - end - - context 'node with lo only' do - before :each do - Facter.fact(:macaddress).stubs(:value).returns('00:00:00:00:00:00') - end - it do - Facter.fact(:mysql_server_id).value.to_s.should == '0' - end - end - - context 'test nil case' do - before :each do - Facter.fact(:macaddress).stubs(:value).returns(nil) - end - it do - Facter.fact(:mysql_server_id).value.to_s.should == '' - end - end - end -end diff -pruN 8.1.0-7/spec/unit/facter/mysql_version_spec.rb 15.0.0-3/spec/unit/facter/mysql_version_spec.rb --- 8.1.0-7/spec/unit/facter/mysql_version_spec.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/unit/facter/mysql_version_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe Facter::Util::Fact.to_s do - before(:each) do - Facter.clear - end - - describe 'mysql_version' do - context 'with value' do - before :each do - Facter::Util::Resolution.stubs(:exec).with('mysql --version').returns('mysql Ver 14.12 Distrib 5.0.95, for redhat-linux-gnu (x86_64) using readline 5.1') - end - it { - expect(Facter.fact(:mysql_version).value).to eq('5.0.95') - } - end - end -end diff -pruN 8.1.0-7/spec/unit/facter/mysqld_version_spec.rb 15.0.0-3/spec/unit/facter/mysqld_version_spec.rb --- 8.1.0-7/spec/unit/facter/mysqld_version_spec.rb 2018-09-13 14:14:13.000000000 +0000 +++ 15.0.0-3/spec/unit/facter/mysqld_version_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe Facter::Util::Fact.to_s do - before(:each) do - Facter.clear - end - - describe 'mysqld_version' do - context 'with value' do - before :each do - Facter::Util::Resolution.stubs(:exec).with('mysqld --no-defaults -V 2>/dev/null').returns('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)') - end - it { - expect(Facter.fact(:mysqld_version).value).to eq('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)') - } - end - end -end diff -pruN 8.1.0-7/spec/unit/puppet/functions/mysql_password_spec.rb 15.0.0-3/spec/unit/puppet/functions/mysql_password_spec.rb --- 8.1.0-7/spec/unit/puppet/functions/mysql_password_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/functions/mysql_password_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -require 'spec_helper' - -describe 'the mysql_password function' do - before :all do # rubocop:disable RSpec/BeforeAfterAll - Puppet::Parser::Functions.autoloader.loadall - end - - let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - - it 'exists' do - expect(Puppet::Parser::Functions.function('mysql_password')).to eq('function_mysql_password') - end - - it 'raises a ParseError if there is less than 1 arguments' do - expect { scope.function_mysql_password([]) }.to(raise_error(Puppet::ParseError)) - end - - it 'raises a ParseError if there is more than 1 arguments' do - expect { scope.function_mysql_password(['foo', 'bar']) }.to(raise_error(Puppet::ParseError)) - end - - it 'converts password into a hash' do - result = scope.function_mysql_password(['password']) - expect(result).to(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19')) - end - - it 'converts an empty password into a empty string' do - result = scope.function_mysql_password(['']) - expect(result).to(eq('')) - end - - it 'does not convert a password that is already a hash' do - result = scope.function_mysql_password(['*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19']) - expect(result).to(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19')) - end -end diff -pruN 8.1.0-7/spec/unit/puppet/provider/mysql_database/mysql_spec.rb 15.0.0-3/spec/unit/puppet/provider/mysql_database/mysql_spec.rb --- 8.1.0-7/spec/unit/puppet/provider/mysql_database/mysql_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/provider/mysql_database/mysql_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:mysql_database).provider(:mysql) do - let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' } - let(:parsed_databases) { ['information_schema', 'mydb', 'mysql', 'performance_schema', 'test'] } - let(:provider) { resource.provider } - let(:instance) { provider.class.instances.first } - let(:resource) do - Puppet::Type.type(:mysql_database).new( - ensure: :present, charset: 'latin1', - collate: 'latin1_swedish_ci', name: 'new_database', - provider: described_class.name - ) - end - let(:raw_databases) do - <<-SQL_OUTPUT -information_schema -mydb -mysql -performance_schema -test - SQL_OUTPUT - # rubocop:enable Layout/IndentHeredoc - end - - before :each do - Facter.stubs(:value).with(:root_home).returns('/root') - Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql') - File.stubs(:file?).with('/root/.my.cnf').returns(true) - provider.class.stubs(:mysql_caller).with('show databases', 'regular').returns('new_database') - provider.class.stubs(:mysql_caller).with(["show variables like '%_database'", 'new_database'], 'regular').returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") # rubocop:disable Metrics/LineLength - end - - describe 'self.instances' do - it 'returns an array of databases' do - provider.class.stubs(:mysql_caller).with('show databases', 'regular').returns(raw_databases) - raw_databases.each_line do |db| - provider.class.stubs(:mysql_caller).with(["show variables like '%_database'", db.chomp], 'regular').returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") # rubocop:disable Metrics/LineLength - end - databases = provider.class.instances.map { |x| x.name } - expect(parsed_databases).to match_array(databases) - end - end - - describe 'self.prefetch' do - it 'exists' do - provider.class.instances - provider.class.prefetch({}) - end - end - - describe 'create' do - it 'makes a database' do - provider.class.expects(:mysql_caller).with("create database if not exists `#{resource[:name]}` character set `#{resource[:charset]}` collate `#{resource[:collate]}`", 'regular') - provider.expects(:exists?).returns(true) - expect(provider.create).to be_truthy - end - end - - describe 'destroy' do - it 'removes a database if present' do - provider.class.expects(:mysql_caller).with("drop database if exists `#{resource[:name]}`", 'regular') - provider.expects(:exists?).returns(false) - expect(provider.destroy).to be_truthy - end - end - - describe 'exists?' do - it 'checks if database exists' do - expect(instance).to be_exists - end - end - - describe 'self.defaults_file' do - it 'sets --defaults-extra-file' do - File.stubs(:file?).with('/root/.my.cnf').returns(true) - expect(provider.defaults_file).to eq '--defaults-extra-file=/root/.my.cnf' - end - it 'fails if file missing' do - File.stubs(:file?).with('/root/.my.cnf').returns(false) - expect(provider.defaults_file).to be_nil - end - end - - describe 'charset' do - it 'returns a charset' do - expect(instance.charset).to eq('latin1') - end - end - - describe 'charset=' do - it 'changes the charset' do - provider.class.expects(:mysql_caller).with("alter database `#{resource[:name]}` CHARACTER SET blah", 'regular').returns('0') - - provider.charset = 'blah' - end - end - - describe 'collate' do - it 'returns a collate' do - expect(instance.collate).to eq('latin1_swedish_ci') - end - end - - describe 'collate=' do - it 'changes the collate' do - provider.class.expects(:mysql_caller).with("alter database `#{resource[:name]}` COLLATE blah", 'regular').returns('0') - - provider.collate = 'blah' - end - end -end diff -pruN 8.1.0-7/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb 15.0.0-3/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb --- 8.1.0-7/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:mysql_plugin).provider(:mysql) do - let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' } - let(:provider) { resource.provider } - let(:instance) { provider.class.instances.first } - let(:resource) do - Puppet::Type.type(:mysql_plugin).new( - ensure: :present, - soname: 'auth_socket.so', - name: 'auth_socket', - provider: described_class.name, - ) - end - - before :each do - Facter.stubs(:value).with(:root_home).returns('/root') - Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql') - File.stubs(:file?).with('/root/.my.cnf').returns(true) - provider.class.stubs(:mysql_caller).with('show plugins', 'regular').returns('auth_socket ACTIVE AUTHENTICATION auth_socket.so GPL') - end - - describe 'self.prefetch' do - it 'exists' do - provider.class.instances - provider.class.prefetch({}) - end - end - - describe 'create' do - it 'loads a plugin' do - provider.class.expects(:mysql_caller).with("install plugin #{resource[:name]} soname '#{resource[:soname]}'", 'regular') - provider.expects(:exists?).returns(true) - expect(provider.create).to be_truthy - end - end - - describe 'destroy' do - it 'unloads a plugin if present' do - provider.class.expects(:mysql_caller).with("uninstall plugin #{resource[:name]}", 'regular') - provider.expects(:exists?).returns(false) - expect(provider.destroy).to be_truthy - end - end - - describe 'exists?' do - it 'checks if plugin exists' do - expect(instance).to be_exists - end - end - - describe 'self.defaults_file' do - it 'sets --defaults-extra-file' do - File.stubs(:file?).with('/root/.my.cnf').returns(true) - expect(provider.defaults_file).to eq '--defaults-extra-file=/root/.my.cnf' - end - it 'fails if file missing' do - File.stubs(:file?).with('/root/.my.cnf').returns(false) - expect(provider.defaults_file).to be_nil - end - end - - describe 'soname' do - it 'returns a soname' do - expect(instance.soname).to eq('auth_socket.so') - end - end -end diff -pruN 8.1.0-7/spec/unit/puppet/provider/mysql_user/mysql_spec.rb 15.0.0-3/spec/unit/puppet/provider/mysql_user/mysql_spec.rb --- 8.1.0-7/spec/unit/puppet/provider/mysql_user/mysql_spec.rb 2018-10-25 13:53:59.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/provider/mysql_user/mysql_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,394 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:mysql_user).provider(:mysql) do - # Output of mysqld -V - mysql_version_string_hash = { - 'mysql-5.5' => - { - version: '5.5.46', - string: '/usr/sbin/mysqld Ver 5.5.46-log for Linux on x86_64 (MySQL Community Server (GPL))', - mysql_type: 'mysql', - }, - 'mysql-5.6' => - { - version: '5.6.27', - string: '/usr/sbin/mysqld Ver 5.6.27 for Linux on x86_64 (MySQL Community Server (GPL))', - mysql_type: 'mysql', - }, - 'mysql-5.7.1' => - { - version: '5.7.1', - string: '/usr/sbin/mysqld Ver 5.7.1 for Linux on x86_64 (MySQL Community Server (GPL))', - mysql_type: 'mysql', - }, - 'mysql-5.7.6' => - { - version: '5.7.8', - string: '/usr/sbin/mysqld Ver 5.7.8-rc for Linux on x86_64 (MySQL Community Server (GPL))', - mysql_type: 'mysql', - }, - 'mariadb-10.0' => - { - version: '10.0.21', - string: '/usr/sbin/mysqld Ver 10.0.21-MariaDB for Linux on x86_64 (MariaDB Server)', - mysql_type: 'mariadb', - }, - 'mariadb-10.0-deb8' => - { - version: '10.0.23', - string: '/usr/sbin/mysqld (mysqld 10.0.23-MariaDB-0+deb8u1)', - mysql_type: 'mariadb', - }, - 'percona-5.5' => - { - version: '5.5.39', - string: 'mysqld Ver 5.5.39-36.0-55 for Linux on x86_64 (Percona XtraDB Cluster (GPL), Release rel36.0, Revision 824, WSREP version 25.11, wsrep_25.11.r4023)', - mysql_type: 'percona', - }, - } - - let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' } - let(:system_database) { '--database=mysql' } - let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' } - - let(:raw_users) do - <<-SQL_OUTPUT -root@127.0.0.1 -root@::1 -@localhost -debian-sys-maint@localhost -root@localhost -usvn_user@localhost -@vagrant-ubuntu-raring-64 - SQL_OUTPUT - # rubocop:enable Layout/IndentHeredoc - end - - let(:parsed_users) { ['root@127.0.0.1', 'root@::1', '@localhost', 'debian-sys-maint@localhost', 'root@localhost', 'usvn_user@localhost', '@vagrant-ubuntu-raring-64'] } - let(:provider) { resource.provider } - let(:instance) { provider.class.instances.first } - let(:resource) do - Puppet::Type.type(:mysql_user).new( - ensure: :present, - password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4', - name: 'joe@localhost', - max_user_connections: '10', - max_connections_per_hour: '10', - max_queries_per_hour: '10', - max_updates_per_hour: '10', - provider: described_class.name, - ) - end - - before :each do - # Set up the stubs for an instances call. - Facter.stubs(:value).with(:root_home).returns('/root') - Facter.stubs(:value).with(:mysql_version).returns('5.6.24') - provider.class.instance_variable_set(:@mysqld_version_string, '5.6.24') - Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql') - Puppet::Util.stubs(:which).with('mysqld').returns('/usr/sbin/mysqld') - File.stubs(:file?).with('/root/.my.cnf').returns(true) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns('joe@localhost') - provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = 'joe@localhost'", 'regular').returns('10 10 10 10 *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4') # rubocop:disable Metrics/LineLength - end - - describe 'self.instances' do - it 'returns an array of users MySQL 5.5' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.5'][:string]) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns(raw_users) - parsed_users.each { |user| provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'", 'regular').returns('10 10 10 10 ') } # rubocop:disable Metrics/LineLength - - usernames = provider.class.instances.map { |x| x.name } - expect(parsed_users).to match_array(usernames) - end - it 'returns an array of users MySQL 5.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.6'][:string]) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns(raw_users) - parsed_users.each { |user| provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'", 'regular').returns('10 10 10 10 ') } # rubocop:disable Metrics/LineLength - - usernames = provider.class.instances.map { |x| x.name } - expect(parsed_users).to match_array(usernames) - end - it 'returns an array of users MySQL >= 5.7.0 < 5.7.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.1'][:string]) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns(raw_users) - parsed_users.each { |user| provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'", 'regular').returns('10 10 10 10 ') } # rubocop:disable Metrics/LineLength - - usernames = provider.class.instances.map { |x| x.name } - expect(parsed_users).to match_array(usernames) - end - it 'returns an array of users MySQL >= 5.7.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string]) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns(raw_users) - parsed_users.each { |user| provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, AUTHENTICATION_STRING, PLUGIN FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'", 'regular').returns('10 10 10 10 ') } # rubocop:disable Metrics/LineLength - - usernames = provider.class.instances.map { |x| x.name } - expect(parsed_users).to match_array(usernames) - end - it 'returns an array of users mariadb 10.0' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mariadb-10.0'][:string]) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns(raw_users) - parsed_users.each { |user| provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'", 'regular').returns('10 10 10 10 ') } # rubocop:disable Metrics/LineLength - - usernames = provider.class.instances.map { |x| x.name } - expect(parsed_users).to match_array(usernames) - end - it 'returns an array of users percona 5.5' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['percona-5.5'][:string]) - provider.class.stubs(:mysql_caller).with("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').returns(raw_users) - parsed_users.each { |user| provider.class.stubs(:mysql_caller).with("SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'", 'regular').returns('10 10 10 10 ') } # rubocop:disable Metrics/LineLength - - usernames = provider.class.instances.map { |x| x.name } - expect(parsed_users).to match_array(usernames) - end - end - - describe 'mysql version and type detection' do - mysql_version_string_hash.each do |_name, line| - version = line[:version] - string = line[:string] - mysql_type = line[:mysql_type] - it "detects version '#{version}'" do - provider.class.instance_variable_set(:@mysqld_version_string, string) - expect(provider.mysqld_version).to eq(version) - end - it "detects type '#{mysql_type}'" do - provider.class.instance_variable_set(:@mysqld_version_string, string) - expect(provider.mysqld_type).to eq(mysql_type) - end - end - end - - describe 'self.prefetch' do - it 'exists' do - provider.class.instances - provider.class.prefetch({}) - end - end - - describe 'create' do - it 'makes a user' do - provider.class.expects(:mysql_caller).with("CREATE USER 'joe'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system') - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' WITH MAX_USER_CONNECTIONS 10 MAX_CONNECTIONS_PER_HOUR 10 MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 10", 'system') # rubocop:disable Metrics/LineLength - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' REQUIRE NONE", 'system') - provider.expects(:exists?).returns(true) - expect(provider.create).to be_truthy - end - it 'creates a user using IF NOT EXISTS' do - provider.class.instance_variable_set(:@mysqld_version_string, '5.7.6') - - provider.class.expects(:mysql_caller).with("CREATE USER IF NOT EXISTS 'joe'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system') # rubocop:disable Metrics/LineLength - provider.class.expects(:mysql_caller).with("ALTER USER IF EXISTS 'joe'@'localhost' WITH MAX_USER_CONNECTIONS 10 MAX_CONNECTIONS_PER_HOUR 10 MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 10", 'system') # rubocop:disable Metrics/LineLength - provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' REQUIRE NONE", 'system') - provider.expects(:exists?).returns(true) - expect(provider.create).to be_truthy - end - end - - describe 'destroy' do - it 'removes a user if present' do - provider.class.expects(:mysql_caller).with("DROP USER 'joe'@'localhost'", 'system') - provider.expects(:exists?).returns(false) - expect(provider.destroy).to be_truthy - end - it 'removes a user using IF EXISTS' do - provider.class.instance_variable_set(:@mysqld_version_string, '5.7.1') - - provider.class.expects(:mysql_caller).with("DROP USER IF EXISTS 'joe'@'localhost'", 'system') - expect(provider.destroy).to be_truthy - end - end - - describe 'exists?' do - it 'checks if user exists' do - expect(instance).to be_exists - end - end - - describe 'self.mysqld_version' do - it 'uses the mysqld_version fact if unset' do - provider.class.instance_variable_set(:@mysqld_version_string, nil) - Facter.stubs(:value).with(:mysqld_version).returns('5.6.24') - expect(provider.mysqld_version).to eq '5.6.24' - end - it 'returns 5.7.6 for "mysqld Ver 5.7.6 for Linux on x86_64 (MySQL Community Server (GPL))"' do - provider.class.instance_variable_set(:@mysqld_version_string, 'mysqld Ver 5.7.6 for Linux on x86_64 (MySQL Community Server (GPL))') - expect(provider.mysqld_version).to eq '5.7.6' - end - it 'returns 5.7.6 for "mysqld Ver 5.7.6-rc for Linux on x86_64 (MySQL Community Server (GPL))"' do - provider.class.instance_variable_set(:@mysqld_version_string, 'mysqld Ver 5.7.6-rc for Linux on x86_64 (MySQL Community Server (GPL))') - expect(provider.mysqld_version).to eq '5.7.6' - end - it 'detects >= 5.7.6 for 5.7.7-log' do - provider.class.instance_variable_set(:@mysqld_version_string, 'mysqld Ver 5.7.7-log for Linux on x86_64 (MySQL Community Server (GPL))') - expect(Puppet::Util::Package.versioncmp(provider.mysqld_version, '5.7.6')).to be >= 0 - end - it 'detects < 5.7.6 for 5.7.5-log' do - provider.class.instance_variable_set(:@mysqld_version_string, 'mysqld Ver 5.7.5-log for Linux on x86_64 (MySQL Community Server (GPL))') - expect(Puppet::Util::Package.versioncmp(provider.mysqld_version, '5.7.6')).to be < 0 - end - end - - describe 'self.defaults_file' do - it 'sets --defaults-extra-file' do - File.stubs(:file?).with('/root/.my.cnf').returns(true) - expect(provider.defaults_file).to eq '--defaults-extra-file=/root/.my.cnf' - end - it 'fails if file missing' do - File.expects(:file?).with('/root/.my.cnf').returns(false) - expect(provider.defaults_file).to be_nil - end - end - - describe 'password_hash' do - it 'returns a hash' do - expect(instance.password_hash).to eq('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4') - end - end - - describe 'password_hash=' do - it 'changes the hash mysql 5.5' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.5'][:string]) - provider.class.expects(:mysql_caller).with("SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') - - provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5') - provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' - end - it 'changes the hash mysql 5.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.6'][:string]) - provider.class.expects(:mysql_caller).with("SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') - - provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5') - provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' - end - it 'changes the hash mysql < 5.7.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.1'][:string]) - provider.class.expects(:mysql_caller).with("SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') - - provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5') - provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' - end - it 'changes the hash MySQL >= 5.7.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string]) - provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH mysql_native_password AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') # rubocop:disable Metrics/LineLength - - provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5') - provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' - end - it 'changes the hash mariadb-10.0' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mariadb-10.0'][:string]) - provider.class.expects(:mysql_caller).with("SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') - - provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5') - provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' - end - it 'changes the hash percona-5.5' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['percona-5.5'][:string]) - provider.class.expects(:mysql_caller).with("SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') - - provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5') - provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' - end - end - - describe 'plugin=' do - context 'auth_socket' do - context 'MySQL < 5.7.6' do - it 'changes the authentication plugin' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.1'][:string]) - provider.class.expects(:mysql_caller).with("UPDATE mysql.user SET plugin = 'auth_socket', password = '' WHERE CONCAT(user, '@', host) = 'joe@localhost'", 'system').returns('0') - - provider.expects(:plugin).returns('auth_socket') - provider.plugin = 'auth_socket' - end - end - - context 'MySQL >= 5.7.6' do - it 'changes the authentication plugin' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string]) - provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH 'auth_socket'", 'system').returns('0') - - provider.expects(:plugin).returns('auth_socket') - provider.plugin = 'auth_socket' - end - end - end - - context 'mysql_native_password' do - context 'MySQL < 5.7.6' do - it 'changes the authentication plugin' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.1'][:string]) - provider.class.expects(:mysql_caller).with("UPDATE mysql.user SET plugin = 'mysql_native_password', password = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' WHERE CONCAT(user, '@', host) = 'joe@localhost'", 'system').returns('0') # rubocop:disable Metrics/LineLength - - provider.expects(:plugin).returns('mysql_native_password') - provider.plugin = 'mysql_native_password' - end - end - - context 'MySQL >= 5.7.6' do - it 'changes the authentication plugin' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string]) - provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system').returns('0') # rubocop:disable Metrics/LineLength - - provider.expects(:plugin).returns('mysql_native_password') - provider.plugin = 'mysql_native_password' - end - end - end - # rubocop:enable RSpec/NestedGroups - end - - describe 'tls_options=' do - it 'adds SSL option grant in mysql 5.5' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.5'][:string]) - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' REQUIRE NONE", 'system').returns('0') - - provider.expects(:tls_options).returns(['NONE']) - provider.tls_options = ['NONE'] - end - it 'adds SSL option grant in mysql 5.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.6'][:string]) - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' REQUIRE NONE", 'system').returns('0') - - provider.expects(:tls_options).returns(['NONE']) - provider.tls_options = ['NONE'] - end - it 'adds SSL option grant in mysql < 5.7.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.1'][:string]) - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' REQUIRE NONE", 'system').returns('0') - - provider.expects(:tls_options).returns(['NONE']) - provider.tls_options = ['NONE'] - end - it 'adds SSL option grant in mysql >= 5.7.6' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string]) - provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' REQUIRE NONE", 'system').returns('0') - - provider.expects(:tls_options).returns(['NONE']) - provider.tls_options = ['NONE'] - end - it 'adds SSL option grant in mariadb-10.0' do - provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mariadb-10.0'][:string]) - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' REQUIRE NONE", 'system').returns('0') - - provider.expects(:tls_options).returns(['NONE']) - provider.tls_options = ['NONE'] - end - end - - ['max_user_connections', 'max_connections_per_hour', 'max_queries_per_hour', 'max_updates_per_hour'].each do |property| - describe property do - it "returns #{property}" do - expect(instance.send(property.to_s.to_sym)).to eq('10') - end - end - - describe "#{property}=" do - it "changes #{property}" do - provider.class.expects(:mysql_caller).with("GRANT USAGE ON *.* TO 'joe'@'localhost' WITH #{property.upcase} 42", 'system').returns('0') - provider.expects(property.to_sym).returns('42') - provider.send("#{property}=".to_sym, '42') - end - end - end -end diff -pruN 8.1.0-7/spec/unit/puppet/type/mysql_database_spec.rb 15.0.0-3/spec/unit/puppet/type/mysql_database_spec.rb --- 8.1.0-7/spec/unit/puppet/type/mysql_database_spec.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/type/mysql_database_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -require 'puppet' -require 'puppet/type/mysql_database' -describe Puppet::Type.type(:mysql_database) do - let(:user) { Puppet::Type.type(:mysql_database).new(name: 'test', charset: 'utf8', collate: 'utf8_blah_ci') } - - it 'accepts a database name' do - expect(user[:name]).to eq('test') - end - - it 'accepts a charset' do - user[:charset] = 'latin1' - expect(user[:charset]).to eq('latin1') - end - - it 'accepts a collate' do - user[:collate] = 'latin1_swedish_ci' - expect(user[:collate]).to eq('latin1_swedish_ci') - end - - it 'requires a name' do - expect { - Puppet::Type.type(:mysql_database).new({}) - }.to raise_error(Puppet::Error, 'Title or name must be provided') - end -end diff -pruN 8.1.0-7/spec/unit/puppet/type/mysql_grant_spec.rb 15.0.0-3/spec/unit/puppet/type/mysql_grant_spec.rb --- 8.1.0-7/spec/unit/puppet/type/mysql_grant_spec.rb 2018-08-02 10:39:14.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/type/mysql_grant_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -require 'puppet' -require 'puppet/type/mysql_grant' -require 'spec_helper' -describe Puppet::Type.type(:mysql_grant) do - let(:user) { Puppet::Type.type(:mysql_grant).new(name: 'foo@localhost/*.*', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost') } - - it 'accepts a grant name' do - expect(user[:name]).to eq('foo@localhost/*.*') - end - - it 'accepts ALL privileges' do - user[:privileges] = 'ALL' - expect(user[:privileges]).to eq(['ALL']) - end - - context 'PROXY privilege with mysql greater than or equal to 5.5.0' do - before :each do - Facter.stubs(:value).with(:mysql_version).returns('5.5.0') - end - - it 'does not raise error' do - user[:privileges] = 'PROXY' - user[:table] = 'proxy_user@proxy_host' - expect(user[:privileges]).to eq(['PROXY']) - end - end - - context 'PROXY privilege with mysql greater than or equal to 5.4.0' do - before :each do - Facter.stubs(:value).with(:mysql_version).returns('5.4.0') - end - - it 'raises error' do - expect { - user[:privileges] = 'PROXY' - }.to raise_error(Puppet::ResourceError, %r{PROXY user not supported on mysql versions < 5.5.0}) - end - end - - it 'accepts a table' do - user[:table] = '*.*' - expect(user[:table]).to eq('*.*') - end - - it 'accepts @ for table' do - user[:table] = '@' - expect(user[:table]).to eq('@') - end - - it 'accepts proxy user for table' do - user[:table] = 'proxy_user@proxy_host' - expect(user[:table]).to eq('proxy_user@proxy_host') - end - - it 'accepts a user' do - user[:user] = 'foo@localhost' - expect(user[:user]).to eq('foo@localhost') - end - - it 'requires a name' do - expect { - Puppet::Type.type(:mysql_grant).new({}) - }.to raise_error(Puppet::Error, 'Title or name must be provided') - end - - it 'requires the name to match the user and table #general' do - expect { - Puppet::Type.type(:mysql_grant).new(name: 'foo@localhost/*.*', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost') - }.not_to raise_error - end - it 'requires the name to match the user and table #specific' do - expect { - Puppet::Type.type(:mysql_grant).new(name: 'foo', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost') - }.to raise_error %r{`name` `parameter` must match user@host\/table format} - end - - describe 'it should munge privileges' do - it 'to just ALL' do - user = Puppet::Type.type(:mysql_grant).new( - name: 'foo@localhost/*.*', table: ['*.*'], user: 'foo@localhost', - privileges: ['ALL'] - ) - expect(user[:privileges]).to eq(['ALL']) - end - - it 'to upcase and ordered' do - user = Puppet::Type.type(:mysql_grant).new( - name: 'foo@localhost/*.*', table: ['*.*'], user: 'foo@localhost', - privileges: ['select', 'Insert'] - ) - expect(user[:privileges]).to eq(['INSERT', 'SELECT']) - end - - it 'ordered including column privileges' do - user = Puppet::Type.type(:mysql_grant).new( - name: 'foo@localhost/*.*', table: ['*.*'], user: 'foo@localhost', - privileges: ['SELECT(Host,Address)', 'Insert'] - ) - expect(user[:privileges]).to eq(['INSERT', 'SELECT (Address, Host)']) - end - end -end diff -pruN 8.1.0-7/spec/unit/puppet/type/mysql_plugin_spec.rb 15.0.0-3/spec/unit/puppet/type/mysql_plugin_spec.rb --- 8.1.0-7/spec/unit/puppet/type/mysql_plugin_spec.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/type/mysql_plugin_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -require 'puppet' -require 'puppet/type/mysql_plugin' -describe Puppet::Type.type(:mysql_plugin) do - let(:plugin) { Puppet::Type.type(:mysql_plugin).new(name: 'test', soname: 'test.so') } - - it 'accepts a plugin name' do - expect(plugin[:name]).to eq('test') - end - - it 'accepts a library name' do - plugin[:soname] = 'test.so' - expect(plugin[:soname]).to eq('test.so') - end - - it 'requires a name' do - expect { - Puppet::Type.type(:mysql_plugin).new({}) - }.to raise_error(Puppet::Error, 'Title or name must be provided') - end -end diff -pruN 8.1.0-7/spec/unit/puppet/type/mysql_user_spec.rb 15.0.0-3/spec/unit/puppet/type/mysql_user_spec.rb --- 8.1.0-7/spec/unit/puppet/type/mysql_user_spec.rb 2019-03-20 16:51:23.000000000 +0000 +++ 15.0.0-3/spec/unit/puppet/type/mysql_user_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -require 'puppet' -require 'puppet/type/mysql_user' -require 'spec_helper' -describe Puppet::Type.type(:mysql_user) do - context 'On MySQL 5.x' do - before :each do - Facter.stubs(:value).with(:mysql_version).returns('5.6.24') - end - - it 'fails with a long user name' do - expect { - Puppet::Type.type(:mysql_user).new(name: '12345678901234567@localhost', password_hash: 'pass') - }.to raise_error %r{MySQL usernames are limited to a maximum of 16 characters} - end - end - - context 'On MariaDB 10.0.0+' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: '12345678901234567@localhost', password_hash: 'pass') } - - before :each do - Facter.stubs(:value).with(:mysql_version).returns('10.0.19') - end - - it 'succeeds with a long user name on MariaDB' do - expect(user[:name]).to eq('12345678901234567@localhost') - end - end - - it 'requires a name' do - expect { - Puppet::Type.type(:mysql_user).new({}) - }.to raise_error(Puppet::Error, 'Title or name must be provided') - end - - context 'using foo@localhost' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: 'foo@localhost', password_hash: 'pass') } - - it 'accepts a user name' do - expect(user[:name]).to eq('foo@localhost') - end - - it 'accepts a password' do - user[:password_hash] = 'foo' - expect(user[:password_hash]).to eq('foo') - end - - it 'accepts an empty password' do - user[:password_hash] = '' - expect(user[:password_hash]).to eq('') - end - end - - context 'using foo@LocalHost' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: 'foo@LocalHost', password_hash: 'pass') } - - it 'lowercases the user name' do - expect(user[:name]).to eq('foo@localhost') - end - end - - context 'using foo@192.168.1.0/255.255.255.0' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: 'foo@192.168.1.0/255.255.255.0', password_hash: 'pass') } - - it 'creates the user with the netmask' do - expect(user[:name]).to eq('foo@192.168.1.0/255.255.255.0') - end - end - - context 'using allo_wed$char@localhost' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: 'allo_wed$char@localhost', password_hash: 'pass') } - - it 'accepts a user name' do - expect(user[:name]).to eq('allo_wed$char@localhost') - end - end - - context 'ensure the default \'debian-sys-main\'@localhost user can be parsed' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: '\'debian-sys-maint\'@localhost', password_hash: 'pass') } - - it 'accepts a user name' do - expect(user[:name]).to eq('\'debian-sys-maint\'@localhost') - end - end - - context 'using a quoted 16 char username' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: '"debian-sys-maint"@localhost', password_hash: 'pass') } - - it 'accepts a user name' do - expect(user[:name]).to eq('"debian-sys-maint"@localhost') - end - end - - context 'using a quoted username that is too long ' do - before :each do - Facter.stubs(:value).with(:mysql_version).returns('5.6.24') - end - - it 'fails with a size error' do - expect { - Puppet::Type.type(:mysql_user).new(name: '"debian-sys-maint2"@localhost', password_hash: 'pass') - }.to raise_error %r{MySQL usernames are limited to a maximum of 16 characters} - end - end - - context 'using `speci!al#`@localhost' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: '`speci!al#`@localhost', password_hash: 'pass') } - - it 'accepts a quoted user name with special chatracters' do - expect(user[:name]).to eq('`speci!al#`@localhost') - end - end - - context 'using in-valid@localhost' do - let(:user) { Puppet::Type.type(:mysql_user).new(name: 'in-valid@localhost', password_hash: 'pass') } - - it 'accepts a user name with special chatracters' do - expect(user[:name]).to eq('in-valid@localhost') - end - end - - context 'using "misquoted@localhost' do - it 'fails with a misquoted username is used' do - expect { - Puppet::Type.type(:mysql_user).new(name: '"misquoted@localhost', password_hash: 'pass') - }.to raise_error %r{Invalid database user "misquoted@localhost} - end - end - - context 'using invalid options' do - it 'fails with an invalid option' do - expect { - Puppet::Type.type(:mysql_user).new(name: 'misquoted@localhost', password_hash: 'pass', tls_options: ['SOMETHING_ELSE']) - }.to raise_error %r{Invalid tls option} - end - end -end diff -pruN 8.1.0-7/tasks/export.rb 15.0.0-3/tasks/export.rb --- 8.1.0-7/tasks/export.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/tasks/export.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,4 +1,6 @@ #!/opt/puppetlabs/puppet/bin/ruby +# frozen_string_literal: true + require 'json' require 'open3' require 'puppet' @@ -9,12 +11,13 @@ def get(file, database, user, password) cmd_string << " --user=#{user}" unless user.nil? cmd_string << " --password=#{password}" unless password.nil? cmd_string << " > #{file}" unless file.nil? - stdout, _stderr, status = Open3.capture3(cmd_string) - raise Puppet::Error, _("stderr: ' %{stderr}') % { stderr: stderr }") if status != 0 + stdout, stderr, status = Open3.capture3(cmd_string) + raise Puppet::Error, _("stderr: '%{stderr}'" % { stderr: stderr }) if status != 0 + { status: stdout.strip } end -params = JSON.parse(STDIN.read) +params = JSON.parse($stdin.read) database = params['database'] user = params['user'] password = params['password'] diff -pruN 8.1.0-7/tasks/sql.rb 15.0.0-3/tasks/sql.rb --- 8.1.0-7/tasks/sql.rb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/tasks/sql.rb 2023-06-19 12:29:51.000000000 +0000 @@ -1,4 +1,6 @@ #!/opt/puppetlabs/puppet/bin/ruby +# frozen_string_literal: true + require 'json' require 'open3' require 'puppet' @@ -8,12 +10,13 @@ def get(sql, database, user, password) cmd << "--database=#{database}" unless database.nil? cmd << "--user=#{user}" unless user.nil? cmd << "--password=#{password}" unless password.nil? - stdout, stderr, status = Open3.capture3(*cmd) # rubocop:disable Lint/UselessAssignment - raise Puppet::Error, _("stderr: ' %{stderr}') % { stderr: stderr }") if status != 0 + stdout, stderr, status = Open3.capture3(*cmd) + raise Puppet::Error, _("stderr: '%{stderr}'" % { stderr: stderr }) if status != 0 + { status: stdout.strip } end -params = JSON.parse(STDIN.read) +params = JSON.parse($stdin.read) database = params['database'] user = params['user'] password = params['password'] diff -pruN 8.1.0-7/templates/meb.cnf.epp 15.0.0-3/templates/meb.cnf.epp --- 8.1.0-7/templates/meb.cnf.epp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/templates/meb.cnf.epp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,18 @@ +### MANAGED BY PUPPET ### + +<% $options.map |Any $k, Any $v| { -%> +<% if $v.is_a(Hash) { -%> +[<%= $k %>] +<% $v.map |Any $ki, Any $vi| { -%> +<% if $vi == true or $v == '' {-%> +<%= $ki %> +<% } elsif $vi.is_a(Hash) { -%> +<% $vi.each |$vii| { -%> +<%= $ki %> = <%= $vii %> +<% } -%> +<% } elsif !($vi == '' or $vi == undef ) { -%> +<%= $ki %> = <%= $vi %> +<% } -%> +<% } -%> +<% } %> +<% } -%> diff -pruN 8.1.0-7/templates/meb.cnf.erb 15.0.0-3/templates/meb.cnf.erb --- 8.1.0-7/templates/meb.cnf.erb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/templates/meb.cnf.erb 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -### MANAGED BY PUPPET ### - -<% @options.sort.map do |k,v| -%> -<% if v.is_a?(Hash) -%> -[<%= k %>] -<% v.sort.map do |ki, vi| -%> -<% if vi == true or v == '' -%> -<%= ki %> -<% elsif vi.is_a?(Array) -%> -<% vi.each do |vii| -%> -<%= ki %> = <%= vii %> -<% end -%> -<% elsif ![nil, '', :undef].include?(vi) -%> -<%= ki %> = <%= vi %> -<% end -%> -<% end -%> -<% end %> -<% end -%> diff -pruN 8.1.0-7/templates/my.cnf.erb 15.0.0-3/templates/my.cnf.erb --- 8.1.0-7/templates/my.cnf.erb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/templates/my.cnf.erb 2023-06-19 12:29:51.000000000 +0000 @@ -4,7 +4,7 @@ <% if v.is_a?(Hash) -%> [<%= k %>] <% v.sort.map do |ki, vi| -%> -<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) -%> +<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) or (ki =~ /^ssl-/ and v['ssl'] == false) -%> <% next %> <% elsif vi == true or vi == '' -%> <%= ki %> diff -pruN 8.1.0-7/templates/my.cnf.pass.erb 15.0.0-3/templates/my.cnf.pass.erb --- 8.1.0-7/templates/my.cnf.pass.erb 2018-04-23 16:14:25.000000000 +0000 +++ 15.0.0-3/templates/my.cnf.pass.erb 2023-06-19 12:29:51.000000000 +0000 @@ -4,8 +4,8 @@ [<%= section -%>] user=root host=localhost -<% unless scope.lookupvar('mysql::server::root_password') == 'UNSET' -%> -password='<%= scope.lookupvar('mysql::server::root_password') %>' +<% if @root_password_set -%> +password='<%= @root_password %>' <% end -%> socket=<%= @options['client']['socket'] %> <% end %> diff -pruN 8.1.0-7/templates/mysqlbackup.sh.erb 15.0.0-3/templates/mysqlbackup.sh.erb --- 8.1.0-7/templates/mysqlbackup.sh.erb 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/templates/mysqlbackup.sh.erb 2023-06-19 12:29:51.000000000 +0000 @@ -15,18 +15,14 @@ ##### START CONFIG ################################################### USER=<%= @backupuser %> -PASS='<%= @backuppassword %>' +PASS='<%= @backuppassword_unsensitive %>' MAX_ALLOWED_PACKET=<%= @maxallowedpacket %> DIR=<%= @backupdir %> ROTATE=<%= [ Integer(@backuprotate) - 1, 0 ].max %> # Create temporary mysql cnf file. TMPFILE=`mktemp /tmp/backup.XXXXXX` || exit 1 -<%- if @kernel == 'SunOS' -%> -echo "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE -<%- else -%> echo -e "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE -<%- end -%> <% if @prescript -%> <%- [@prescript].flatten.compact.each do |script|%> @@ -76,11 +72,7 @@ set -o pipefail cleanup() { -<%- if @kernel == 'SunOS' -%> - gfind "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | gxargs -0 -r rm -f -<%- else -%> find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f -<%- end -%> } <% if @delete_before_dump -%> @@ -89,29 +81,33 @@ cleanup <% end -%> <% if @backupdatabases.empty? -%> <% if @file_per_database -%> +<% if @excludedatabases.empty? -%> mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | while read dbname +<% else -%> +mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | grep -v '^\(<%= @excludedatabases.join('|') %>\)$' | while read dbname +<% end -%> do <%= @backupmethod -%> --defaults-extra-file=$TMPFILE --opt --flush-logs --single-transaction \ ${ADDITIONAL_OPTIONS} \ - ${dbname} <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end %> + ${dbname} <% if @backupcompress %>| <%= @compression_command %> <% end %>> ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %><%= @compression_extension %><% end %> done <% else -%> <%= @backupmethod -%> --defaults-extra-file=$TMPFILE --opt --flush-logs --single-transaction \ ${ADDITIONAL_OPTIONS} \ - --all-databases <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end %> + --all-databases <% if @backupcompress %>| <%= @compression_command %> <% end %>> ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %><%= @compression_extension %><% end %> <% end -%> <% else -%> <% @backupdatabases.each do |db| -%> <%= @backupmethod -%> --defaults-extra-file=$TMPFILE --opt --flush-logs --single-transaction \ ${ADDITIONAL_OPTIONS} \ - <%= db %><% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}<%= db %>_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end %> + <%= db %><% if @backupcompress %>| <%= @compression_command %> <% end %>> ${DIR}/${PREFIX}<%= db %>_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %><%= @compression_extension %><% end %> <% end -%> <% end -%> <% unless @delete_before_dump -%> if [ $? -eq 0 ] ; then cleanup - touch /tmp/mysqlbackup_success + touch <%= @backup_success_file_path %> fi <% end -%> diff -pruN 8.1.0-7/templates/xtrabackup.sh.erb 15.0.0-3/templates/xtrabackup.sh.erb --- 8.1.0-7/templates/xtrabackup.sh.erb 2019-04-03 12:48:44.000000000 +0000 +++ 15.0.0-3/templates/xtrabackup.sh.erb 2023-06-19 12:29:51.000000000 +0000 @@ -25,11 +25,7 @@ set -o pipefail cleanup() { - <%- if @kernel == 'SunOS' -%> - gfind "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | gxargs -0 -r rm -f - <%- else -%> - find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f - <%- end -%> + find "${DIR}/" -mindepth 1 -maxdepth 1 -mtime +${ROTATE} -print0 | xargs -0 -r rm -rf } <% if @delete_before_dump -%> @@ -39,8 +35,12 @@ cleanup <%- _innobackupex_args = '' -%> -<%- if @backupuser and @backuppassword -%> - <%- _innobackupex_args = '--user="' + @backupuser + '" --password="' + @backuppassword + '"' -%> +<%- if @backupuser and @backuppassword_unsensitive -%> + <%- _innobackupex_args = '--user="' + @backupuser + '" --password="' + @backuppassword_unsensitive + '"' -%> +<%- end -%> + +<%- if @backupcompress -%> + <%- _innobackupex_args = _innobackupex_args + ' --compress' -%> <%- end -%> <%- if @backupdatabases and @backupdatabases.is_a?(Array) and !@backupdatabases.empty? -%> @@ -59,7 +59,9 @@ cleanup <% unless @delete_before_dump -%> if [ $? -eq 0 ] ; then cleanup - touch /tmp/mysqlbackup_success + <% if @backup_success_file_path -%> + touch <%= @backup_success_file_path %> + <% end -%> fi <% end -%> diff -pruN 8.1.0-7/types/options.pp 15.0.0-3/types/options.pp --- 8.1.0-7/types/options.pp 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-3/types/options.pp 2023-06-19 12:29:51.000000000 +0000 @@ -0,0 +1,6 @@ +# @summary 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. +type Mysql::Options = Hash[ + String, + Hash, +]