Mercurial > repos > other > Puppet
changeset 256:0ebd8efeef04
Merge Puppet divergences and fix SSL chain issues it caused
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 29 Dec 2019 15:31:28 +0000 |
| parents | d4b2bdfe47a6 (current diff) 47750947f4dc (diff) |
| children | 241fbf45e6f3 |
| files | manifests/templates.pp modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb modules/mysql/lib/puppet/parser/functions/mysql_dirname.rb modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb modules/mysql/spec/acceptance/nodesets/centos-510-x64.yml modules/mysql/spec/acceptance/nodesets/centos-59-x64.yml modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml modules/mysql/spec/acceptance/nodesets/centos-65-x64.yml modules/mysql/spec/acceptance/nodesets/default.yml modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml modules/mysql/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml modules/mysql/spec/spec.opts modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb modules/private/manifests modules/private/templates/apache modules/website/manifests/https.pp modules/website/manifests/https/redir.pp modules/website/manifests/init.pp |
| diffstat | 170 files changed, 12671 insertions(+), 3125 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/RPM-GPG-KEY-EPEL-7 Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB +OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm +jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP +vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM +jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5 +S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ +n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB +9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95 +T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj +GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf +uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB +tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk +5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q +ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu +MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re +9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax +CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv +HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB +VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q +thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc +ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4 +vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt +RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw== +=hdPa +-----END PGP PUBLIC KEY BLOCK-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/RPM-GPG-KEY-EPEL-8 Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2 +dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018 ++eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy +a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL +/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi +ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh +yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0 +Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U +pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4 +ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL +MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB +tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW +oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE +0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF +alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw +NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI +WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4 +bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz +xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv +9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0 +SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp +n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7 +zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog== +=84m8 +-----END PGP PUBLIC KEY BLOCK-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/named.conf-ibbvps.vs.mythic-beasts.com Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,63 @@ +// +// named.conf +// +// Provided by Red Hat bind package to configure the ISC BIND named(8) DNS +// server as a caching only nameserver (as a localhost DNS resolver only). +// +// See /usr/share/doc/bind*/sample/ for example named configuration files. +// + +options { + listen-on port 53 { 127.0.0.1; }; + listen-on-v6 port 53 { ::1; }; + directory "/var/named"; + dump-file "/var/named/data/cache_dump.db"; + statistics-file "/var/named/data/named_stats.txt"; + memstatistics-file "/var/named/data/named_mem_stats.txt"; + allow-query { localhost; }; + + /* + - If you are building an AUTHORITATIVE DNS server, do NOT enable recursion. + - If you are building a RECURSIVE (caching) DNS server, you need to enable + recursion. + - If your recursive DNS server has a public IP address, you MUST enable access + control to limit queries to your legitimate users. Failing to do so will + cause your server to become part of large scale DNS amplification + attacks. Implementing BCP38 within your network would greatly + reduce such attack surface + */ + recursion yes; + max-cache-size 10m; + + forwarders { + 2a00:1098:0:80:1000:3b:0:1 + 2a00:1098:0:82:1000:3b:0:1 + }; + + dnssec-enable yes; + dnssec-validation yes; + + /* Path to ISC DLV key */ + bindkeys-file "/etc/named.iscdlv.key"; + + managed-keys-directory "/var/named/dynamic"; + + pid-file "/run/named/named.pid"; + session-keyfile "/run/named/session.key"; +}; + +logging { + channel default_debug { + file "data/named.run"; + severity dynamic; + }; +}; + +zone "." IN { + type hint; + file "named.ca"; +}; + +include "/etc/named.rfc1912.zones"; +include "/etc/named.root.key"; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/sysconfig-named Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,1 @@ +OPTIONS="-4"
--- a/manifests/nodes.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/manifests/nodes.pp Sun Dec 29 15:31:28 2019 +0000 @@ -33,3 +33,17 @@ firewall_cmd => 'iptables', } } +node 'ibbvps.vs.mythic-beasts.com' { + class { 'ibboardvpsnode': + primary_ip => '2a00:1098:82:52::1', + mailserver => 'mail.ibboard.co.uk', + imapserver => 'imap.ibboard.co.uk', + firewall_cmd => 'iptables', + } + # If the console fails to start, you may need to run "restorecon /etc/systemd/system/getty.target.wants/*" + # to reset the SELinux context of the file + service { 'serial-getty@ttyS0': + ensure => 'running', + enable => 'true', + } +}
--- a/manifests/templates.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/manifests/templates.pp Sun Dec 29 15:31:28 2019 +0000 @@ -2,12 +2,15 @@ YumRepo<| |> -> Package<| |> # Make sure all files are in place before starting services -File<| |> -> Service<| |> +File<| tag != 'post-service' |> -> Service<| |> + +# Set some shortcut variables +#$os = $operatingsystem +$osver = $operatingsystemmajrelease +$server = '' class basenode { - $os = $operatingsystem - $osver = "v${operatingsystemrelease}" include sudo include defaultusers @@ -45,7 +48,7 @@ require repos include basenode - include private + include privat include dnsresolver include ssh::server include vcs::server @@ -163,7 +166,10 @@ file { '/etc/named.conf': ensure => present, - source => 'puppet:///common/named.conf', + source => [ + "puppet:///common/named.conf-${::hostname}", + "puppet:///common/named.conf", + ], group => 'named', require => Package['bind'], notify => Service['named'], @@ -177,13 +183,18 @@ file { '/etc/sysconfig/named': ensure => present, - content => 'OPTIONS="-4"', + source => [ + "puppet:///common/sysconfig-named-${::hostname}", + "puppet:///common/sysconfig-named", + ], require => Package['bind'], } file { '/etc/resolv.conf': ensure => present, - content => "nameserver 127.0.0.1" + content => "nameserver 127.0.0.1", + require => Service['named'], + tag => 'post-service', } } @@ -194,22 +205,25 @@ enabled => 1, failovermethod => 'priority', gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6', + gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$osver", } - file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6': + file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$osver": ensure => present, - source => 'puppet:///common/RPM-GPG-KEY-EPEL-6' + source => "puppet:///common/RPM-GPG-KEY-EPEL-$osver" } - yumrepo { 'ibboard': - baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/', - descr => 'Extra packages from IBBoard', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard', - } - file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard': - ensure => present, - source => 'puppet:///common/RPM-GPG-KEY-ibboard' + if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '7') >= 0 and versioncmp($operatingsystemrelease, '8') < 0 { + # We only have extra packages for CentOS 7 + yumrepo { 'ibboard': + baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/', + descr => 'Extra packages from IBBoard', + enabled => 1, + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard', + } + file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard': + ensure => present, + source => 'puppet:///common/RPM-GPG-KEY-ibboard' + } } yumrepo { 'webtatic': ensure => absent, @@ -233,7 +247,7 @@ } class tools { - $packages = [ 'sqlite', 'bash-completion', 'nano', 'bzip2', 'mlocate', 'patch' ] + $packages = [ 'sqlite', 'bash-completion', 'nano', 'bzip2', 'mlocate', 'patch', 'tmux' ] package { $packages: ensure => installed; } @@ -411,21 +425,40 @@ # Use Remi's PHP 7.3 for now - 7.4 is still VERY new $php_suffix = '' - yumrepo { 'remirepo-safe': - mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror', - descr => "Extra CentOS packages from Remi", - enabled => 1, - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', - } - yumrepo { 'remirepo-php': - mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/mirror', - descr => "PHP7.3 for CentOS from Remi", - enabled => 1, - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', + if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 { + yumrepo { 'remirepo-safe': + mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/$basearch/mirror', + descr => "Extra CentOS packages from Remi", + enabled => 1, + failovermethod => 'priority', + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', + } + yumrepo { 'remirepo-php': + mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/$basearch/mirror', + descr => "PHP7.3 for CentOS from Remi", + enabled => 1, + failovermethod => 'priority', + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', + } + } else { + yumrepo { 'remirepo-safe': + mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror', + descr => "Extra CentOS packages from Remi", + enabled => 1, + failovermethod => 'priority', + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', + } + yumrepo { 'remirepo-php': + mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/mirror', + descr => "PHP7.3 for CentOS from Remi", + enabled => 1, + failovermethod => 'priority', + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', + } } file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi': ensure => present, @@ -442,7 +475,7 @@ #Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user - if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 { + if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '7') >= 0 { $mysqlpackage = 'mariadb' $mysqlsuffix = '' @@ -472,7 +505,7 @@ class ibboardvpsnode ( $primary_ip, - $secondary_ip, + $secondary_ip = $primary_ip, $mailserver, $imapserver, $firewall_cmd = 'iptables', @@ -495,8 +528,8 @@ apache::mod { $mods:; } - if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 { - apache::mod { + if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '7') >= 0 { + apache::mod { 'authn_core':; } } @@ -508,7 +541,7 @@ #Configure our sites, using templates for the custom fragments where the extra content is too long include adminsite website::https::multitld { 'www.ibboard': - custom_fragment => template("private/apache/ibboard.fragment"), + custom_fragment => template("privat/apache/ibboard.fragment"), letsencrypt_name => 'ibboard.co.uk', csp_override => { "report-uri" => "https://ibboard.report-uri.com/r/d/csp/enforce", @@ -537,7 +570,7 @@ website::https::multitld { 'admin.ibboard': force_no_index => false, ssl_ca_chain => '', - custom_fragment => template("private/apache/admin.fragment"), + custom_fragment => template("privat/apache/admin.fragment"), } cron { 'loadavg': command => '/usr/local/bin/run-loadavg-logger', @@ -556,15 +589,15 @@ website::https::multitld { 'www.hiveworldterra': force_no_www => false, letsencrypt_name => 'hiveworldterra.co.uk', - custom_fragment => template("private/apache/hwt.fragment"), + custom_fragment => template("privat/apache/hwt.fragment"), } website::https::multitld { 'forums.hiveworldterra': letsencrypt_name => 'hiveworldterra.co.uk', - custom_fragment => template("private/apache/forums.fragment"), + custom_fragment => template("privat/apache/forums.fragment"), } website::https::multitld { 'skins.hiveworldterra': letsencrypt_name => 'hiveworldterra.co.uk', - custom_fragment => template("private/apache/skins.fragment"), + custom_fragment => template("privat/apache/skins.fragment"), } website::https::redir { 'hiveworldterra.ibboard.co.uk': redir => 'https://www.hiveworldterra.co.uk/', @@ -578,7 +611,7 @@ docroot_owner => $defaultusers::secondary_user, docroot_group => 'editors', letsencrypt_name => 'bdstrike.co.uk', - custom_fragment => template("private/apache/bdstrike.fragment"), + custom_fragment => template("privat/apache/bdstrike.fragment"), csp_override => {"frame-ancestors" => "'self'"}, csp_report_override => { "font-src" => "'self' https://fonts.gstatic.com/", @@ -629,14 +662,14 @@ website::https::multitld { 'www.warfoundry': letsencrypt_name => 'warfoundry.co.uk', - custom_fragment => template("private/apache/warfoundry.fragment"), + custom_fragment => template("privat/apache/warfoundry.fragment"), } website::https::multitld { 'dev.ibboard': #Make sure we're the first one hit for the tiny fraction of "no support" cases we care about (potentially Python for Mercurial!) # http://en.wikipedia.org/wiki/Server_Name_Indication#No_support priority => 1, letsencrypt_name => 'dev.ibboard.co.uk', - custom_fragment => template("private/apache/dev.fragment"), + custom_fragment => template("privat/apache/dev.fragment"), force_no_index => false, } } @@ -646,7 +679,7 @@ website::https { 'webmail.ibboard.co.uk': force_no_index => false, ssl_ca_chain => '', - custom_fragment => template("private/apache/webmail.fragment"), + custom_fragment => template("privat/apache/webmail.fragment"), } website::https { 'pim.ibboard.co.uk': docroot_owner => 'apache', @@ -654,7 +687,7 @@ force_no_index => false, lockdown_requests => false, ssl_ca_chain => '', - custom_fragment => template("private/apache/pim.fragment"), + custom_fragment => template("privat/apache/pim.fragment"), } cron { 'owncloudcron': command => "/usr/local/bin/owncloud-cron",
--- a/modules/mysql/CHANGELOG.md Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/CHANGELOG.md Sun Dec 29 15:31:28 2019 +0000 @@ -1,27 +1,542 @@ -##2015-03-03 - Supported Release 3.3.0 -###Summary +# Change log + +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). + +## [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)) + +# Change log + +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). + +## [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 + +- \(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 +#### Features - Add package_manage parameters to `mysql::server` and `mysql::client` (MODULES-1143) - README improvements - Add `mysqldump`, `mysqlbackup`, and `xtrabackup` backup providers. -####Bugfixes +#### 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 +## 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 +#### 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 +#### Bugfixes - Remove dependency on stdlib >= 4.1.0 (MODULES-1759) - Make grant autorequire user - Remove invalid parameter 'provider' from mysql_user instance (MODULES-1731) @@ -34,16 +549,16 @@ - Test fixes - Lint fixes -##2014-12-16 - Supported Release 3.1.0 -###Summary +## 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 +#### 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 +#### 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) @@ -51,20 +566,20 @@ - 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 +#### 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 +## 2014-11-11 - Supported Release 3.0.0 +### Summary Added several new features including MariaDB support and future parser -####Backwards-incompatible Changes +#### 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 +#### 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 @@ -73,26 +588,26 @@ * `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 +* Ability to install both dev and client dev -####BugFix +#### 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 +## 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 +## 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 +#### 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. @@ -102,38 +617,38 @@ Disable ssl on FreeBSD. Add PROCESS privilege for backups. -####Bugfixes +#### Bugfixes -####Known Bugs +#### Known Bugs * No known bugs -##2014-03-04 - Supported Release 2.2.3 -###Summary +## 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 +#### Features +#### Bugfixes +#### Known Bugs * No known bugs -##2014-03-04 - Supported Release 2.2.2 -###Summary +## 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 +#### Bugfixes - PHP bindings on Suse - Test fixes -####Known Bugs +#### Known Bugs * No known bugs -##2014-02-19 - Version 2.2.1 +## 2014-02-19 - Version 2.2.1 -###Summary +### 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 @@ -142,18 +657,18 @@ Also fixes a bunch of tests on various platforms. -##2014-02-13 - Version 2.2.0 +## 2014-02-13 - Version 2.2.0 -###Summary +### Summary -####Features +#### 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 +#### 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/@. @@ -166,16 +681,16 @@ - 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 +- 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 +## 2013-11-13 - Version 2.1.0 -###Summary +### 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 @@ -188,13 +703,13 @@ externalize all your grants, users, and, databases. Another great set of community submissions helped to make this release. -####Features +#### 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 +#### 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. @@ -204,22 +719,22 @@ - Various test fixes. -##2013-10-21 - Version 2.0.1 +## 2013-10-21 - Version 2.0.1 -###Summary +### 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 +#### 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 +## 2013-10-14 - Version 2.0.0 -###Summary +### Summary (Previously detailed in the changelog for 2.0.0-rc1) @@ -237,53 +752,53 @@ mysql::server. -##2013-10-09 - Version 2.0.0-rc5 +## 2013-10-09 - Version 2.0.0-rc5 -###Summary +### Summary Hopefully the final rc! Further fixes to mysql_grant (stripping out the cleverness so we match a much wider range of input.) -####Bugfixes +#### Bugfixes - Make mysql_grant accept '.*'@'.*' in terms of input for user@host. -##2013-10-09 - Version 2.0.0-rc4 +## 2013-10-09 - Version 2.0.0-rc4 -###Summary +### 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 +#### 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 +## 2013-10-07 - Version 2.0.0-rc3 -###Summary +### Summary Fix mysql::server::monitor's use of mysql_user{}. -####Bugfixes +#### 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 +## 2013-10-03 - Version 2.0.0-rc2 -###Summary +### Summary Bugfixes -####Bugfixes +#### Bugfixes - Fix a duplicate parameter in mysql::server -##2013-10-03 - Version 2.0.0-rc1 +## 2013-10-03 - Version 2.0.0-rc1 -###Summary +### Summary This module has been completely refactored and works significantly different. The changes are broad and touch almost every piece of the module. @@ -299,9 +814,9 @@ mysql::server. --- -##2013-09-23 - Version 1.0.0 +## 2013-09-23 - Version 1.0.0 -###Summary +### Summary This release introduces a number of new type/providers, to eventually replace the database_ ones. The module has been converted to call the @@ -311,38 +826,38 @@ This 1.0.0 release precedes a large refactoring that will be released almost immediately after as 2.0.0. -####Features +#### 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 +#### 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 +## 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 +#### 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 +## 2013-07-05 - Version 0.8.1 +#### Bugfixes - Fix a typo in the Fedora 19 support. -##2013-07-01 - Version 0.8.0 -####Features +## 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. @@ -376,16 +891,16 @@ - `expire_logs_days` - `max_binlog_size` -####Bugfixes +#### 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 +## 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 +## 2013-06-25 - Version 0.7.0 This is a maintenance release for community bugfixes and exposing configuration variables. @@ -435,10 +950,10 @@ * Fix travis support (but still messy) * Fix typos -##2013-01-11 - Version 0.6.1 +## 2013-01-11 - Version 0.6.1 * Fix providers when /root/.my.cnf is absent -##2013-01-09 - Version 0.6.0 +## 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` @@ -455,7 +970,7 @@ * Fix typos * Fix lint warnings -##2012-08-23 - Version 0.5.0 +## 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 @@ -464,122 +979,135 @@ * Change `bind_address` parameter to be optional in my.cnf template * Fix quoting root passwords -##2012-07-24 - Version 0.4.0 +## 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 +## 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-04-11 - Version 0.2.0 -##2012-03-19 - William Van Hevelingen <blkperl@cat.pdx.edu> +## 2012-03-19 - William Van Hevelingen <blkperl@cat.pdx.edu> * (#13203) Add ssl support (f7e0ea5) -##2012-03-18 - Nan Liu <nan@puppetlabs.com> +## 2012-03-18 - Nan Liu <nan@puppetlabs.com> * Travis ci before script needs success exit code. (0ea463b) -##2012-03-18 - Nan Liu <nan@puppetlabs.com> +## 2012-03-18 - Nan Liu <nan@puppetlabs.com> * Fix Puppet 2.6 compilation issues. (9ebbbc4) -##2012-03-16 - Nan Liu <nan@puppetlabs.com> +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> * Add travis.ci for testing multiple puppet versions. (33c72ef) -##2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu> +## 2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu> * (#13163) Datadir should be configurable (f353fc6) -##2012-03-16 - Nan Liu <nan@puppetlabs.com> +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> * Document create_resources dependency. (558a59c) -##2012-03-16 - Nan Liu <nan@puppetlabs.com> +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> * Fix spec test issues related to error message. (eff79b5) -##2012-03-16 - Nan Liu <nan@puppetlabs.com> +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> * Fix mysql service on Ubuntu. (72da2c5) -##2012-03-16 - Dan Bode <dan@puppetlabs.com> +## 2012-03-16 - Dan Bode <dan@puppetlabs.com> * Add more spec test coverage (55e399d) -##2012-03-16 - Nan Liu <nan@puppetlabs.com> +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> * (#11963) Fix spec test due to path changes. (1700349) -##2012-03-07 - François Charlier <fcharlier@ploup.net> +## 2012-03-07 - François Charlier <fcharlier@ploup.net> * Add a test to check path for 'mysqld-restart' (b14c7d1) -##2012-03-07 - François Charlier <fcharlier@ploup.net> +## 2012-03-07 - François Charlier <fcharlier@ploup.net> * Fix path for 'mysqld-restart' (1a9ae6b) -##2012-03-15 - Dan Bode <dan@puppetlabs.com> +## 2012-03-15 - Dan Bode <dan@puppetlabs.com> * Add rspec-puppet tests for mysql::config (907331a) -##2012-03-15 - Dan Bode <dan@puppetlabs.com> +## 2012-03-15 - Dan Bode <dan@puppetlabs.com> * Moved class dependency between sever and config to server (da62ad6) -##2012-03-14 - Dan Bode <dan@puppetlabs.com> +## 2012-03-14 - Dan Bode <dan@puppetlabs.com> * Notify mysql restart from set_mysql_rootpw exec (0832a2c) -##2012-03-15 - Nan Liu <nan@puppetlabs.com> +## 2012-03-15 - Nan Liu <nan@puppetlabs.com> * Add documentation related to osfamily fact. (8265d28) -##2012-03-14 - Dan Bode <dan@puppetlabs.com> +## 2012-03-14 - Dan Bode <dan@puppetlabs.com> * Mention osfamily value in failure message (e472d3b) -##2012-03-14 - Dan Bode <dan@puppetlabs.com> +## 2012-03-14 - Dan Bode <dan@puppetlabs.com> * Fix bug when querying for all database users (015490c) -##2012-02-09 - Nan Liu <nan@puppetlabs.com> +## 2012-02-09 - Nan Liu <nan@puppetlabs.com> * Major refactor of mysql module. (b1f90fd) -##2012-01-11 - Justin Ellison <justin.ellison@buckle.com> +## 2012-01-11 - Justin Ellison <justin.ellison@buckle.com> * Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4) -##2012-01-11 - Justin Ellison <justin.ellison@buckle.com> +## 2012-01-11 - Justin Ellison <justin.ellison@buckle.com> * Per @ghoneycutt, we should fail explicitly and explain why. (09af083) -##2012-01-11 - Justin Ellison <justin.ellison@buckle.com> +## 2012-01-11 - Justin Ellison <justin.ellison@buckle.com> * Removing duplicate declaration (7513d03) -##2012-01-10 - Justin Ellison <justin.ellison@buckle.com> +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> * Use socket value from params class instead of hardcoding. (663e97c) -##2012-01-10 - Justin Ellison <justin.ellison@buckle.com> +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> * Instead of hardcoding the config file target, pull it from mysql::params (031a47d) -##2012-01-10 - Justin Ellison <justin.ellison@buckle.com> +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> * 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 <justin.ellison@buckle.com> +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> * 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 <blkperl@cat.pdx.edu> +## 2012-02-09 - William Van Hevelingen <blkperl@cat.pdx.edu> * Changed the README to use markdown (3b7dfeb) -##2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net> +## 2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net> * (#12412) mysqltuner.pl update (b809e6f) -##2011-11-17 - Matthias Pigulla <mp@webfactory.de> +## 2011-11-17 - Matthias Pigulla <mp@webfactory.de> * (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1) -##2011-12-20 - Jeff McCune <jeff@puppetlabs.com> +## 2011-12-20 - Jeff McCune <jeff@puppetlabs.com> * (minor) Fixup typos in Modulefile metadata (a0ed6a1) -##2011-12-19 - Carl Caum <carl@carlcaum.com> +## 2011-12-19 - Carl Caum <carl@carlcaum.com> * Only notify Exec to import sql if sql is given (0783c74) -##2011-12-19 - Carl Caum <carl@carlcaum.com> +## 2011-12-19 - Carl Caum <carl@carlcaum.com> * (#11508) Only load sql_scripts on DB creation (e3b9fd9) -##2011-12-13 - Justin Ellison <justin.ellison@buckle.com> +## 2011-12-13 - Justin Ellison <justin.ellison@buckle.com> * Require not needed due to implicit dependencies (3058feb) -##2011-12-13 - Justin Ellison <justin.ellison@buckle.com> +## 2011-12-13 - Justin Ellison <justin.ellison@buckle.com> * Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d) -##2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1 +## 2011-06-03 - Dan Bode <dan@puppetlabs.com> - 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 + + +\* *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/skywinder/Github-Changelog-Generator)*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/CODEOWNERS Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,2 @@ +# Setting ownership to the modules team +* @puppetlabs/modules
--- a/modules/mysql/CONTRIBUTING.md Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/CONTRIBUTING.md Sun Dec 29 15:31:28 2019 +0000 @@ -1,63 +1,75 @@ -Checklist (and a short version for the impatient) -================================================= +# Contributing to Puppet modules - * Commits: +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. - - Make commits of logical units. +### Table of Contents - - Check for unnecessary whitespace with "git diff --check" before - committing. - - - Commit using Unix line endings (check the settings around "crlf" in - git-config(1)). - - - Do not check in commented out code or unneeded files. +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) - - The first line of the commit message should be a short - description (50 characters is the soft limit, excluding ticket - number(s)), and should skip the full stop. +## Getting Started + +- Fork the module repository on GitHub and clone to your workspace - - Associate the issue in the message. The first line should include - the issue number in the form "(#XXXX) Rest of message". +- Make your changes! + +## Commit Checklist - - The body should provide a meaningful commit message, which: +### The Basics + +- [x] my commit is a single logical unit of work - - uses the imperative, present tense: "change", not "changed" or - "changes". +- [x] I have checked for unnecessary whitespace with "git diff --check" - - includes motivation for the change, and contrasts its - implementation with the previous behavior. +- [x] my commit does not include commented out code or unneeded files + +### The Content - - Make sure that you have tests for the bug you are fixing, or - feature you are adding. +- [x] my commit includes tests for the bug I fixed or feature I added - - Make sure the test suites passes after your commit: - `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below +- [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 - - When introducing a new feature, make sure it is properly - documented in the README.md +- [x] the first line of my commit message includes: - * Submission: + - [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)) - * Pre-requisites: +- [x] the body of my commit message: - - Make sure you have a [GitHub account](https://github.com/join) + - [x] is meaningful - - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for. + - [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 - * Preferred method: +## Submission - - Fork the repository on GitHub. +### Pre-requisites + +- Make sure you have a [GitHub account](https://github.com/join) - - Push your changes to a topic branch in your fork of the - repository. (the format ticket/1234-short_description_of_change is - usually preferred for this project). +- [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 - - Submit a pull request to the repository in the puppetlabs - organization. +- Push your changes to your fork -The long version -================ +- [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. @@ -104,37 +116,32 @@ GitHub has some pretty good [general documentation](http://help.github.com/) on using their site. They also have documentation on - [creating pull requests](http://help.github.com/send-pull-requests/). + [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. - 3. Update the related GitHub issue. - - If there is a GitHub issue associated with the change you + 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 -======= +# Testing -Getting Started ---------------- +## 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, +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, then use it to install all dependencies needed for this project, -by running +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 +% bundle install --path .bundle/gems Fetching gem metadata from https://rubygems.org/........ Fetching gem metadata from https://rubygems.org/.. Using rake (10.1.0) @@ -148,7 +155,7 @@ Use `bundle show [gemname]` to see where a bundled gem is installed. ``` -NOTE some systems may require you to run this command with sudo. +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: @@ -156,65 +163,109 @@ % bundle update ``` -With all dependencies in place and up-to-date we can now run the tests: +## Running Tests + +With all dependencies in place and up-to-date, run the tests: + +### Unit Tests ```shell -% rake spec +% bundle exec rake spec ``` -This will execute all the [rspec tests](http://rspec-puppet.com/) tests -under [spec/defines](./spec/defines), [spec/classes](./spec/classes), -and so on. rspec tests may have the same kind of dependencies as the -module they are testing. While the module defines in its [Modulefile](./Modulefile), +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). -Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker) -tests. These tests spin up a virtual machine under -[VirtualBox](https://www.virtualbox.org/)) with, controlling it with -[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test -scenarios. In order to run these, you will need both of those tools -installed on your system. +### Acceptance Tests -You can run them by issuing the following command +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 -% rake spec_clean -% rspec spec/acceptance +% 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) +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 -------------- +## 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: -XXX getting started writing tests. +```puppet +file { "a test file": + ensure => present, + path => "/etc/sample", +} +``` + +Sample test: -If you have commit access to the repository -=========================================== +```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. -Even if you have commit access to the repository, you will 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 -developer on the project (that did not write the code) to ensure that -all changes go through a code review process. +```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 + +``` -Having someone other than the author of the topic branch recorded as -performing the merge is the record that they performed the code -review. +# 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 -Additional Resources -==================== - -* [Getting additional help](http://puppetlabs.com/community/get-help) - -* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests) - -* [Patchwork](https://patchwork.puppetlabs.com) - -* [General GitHub documentation](http://help.github.com/) - -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) - +[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
--- a/modules/mysql/Gemfile Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/Gemfile Sun Dec 29 15:31:28 2019 +0000 @@ -1,31 +1,74 @@ -source ENV['GEM_SOURCE'] || "https://rubygems.org" +source ENV['GEM_SOURCE'] || 'https://rubygems.org' + +def location_for(place_or_version, fake_version = nil) + git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?} + file_url_regex = %r{\Afile:\/\/(?<path>.*)} + + 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 -group :development, :unit_tests do - gem 'rake', :require => false - gem 'rspec-core', '3.1.7', :require => false - gem 'rspec-puppet', '~> 1.0', :require => false - gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', :require => false - gem 'simplecov', :require => false - gem 'puppet_facts', :require => false - gem 'json', :require => false +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 "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] + gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] + gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-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 'beaker-rspec', :require => false - gem 'serverspec', :require => false +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 -if facterversion = ENV['FACTER_GEM_VERSION'] - gem 'facter', facterversion, :require => false -else - gem 'facter', :require => false +gems.each do |gem_name, gem_params| + gem gem_name, *gem_params end -if puppetversion = ENV['PUPPET_GEM_VERSION'] - gem 'puppet', puppetversion, :require => false -else - gem 'puppet', :require => false +# 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:ft=ruby +# vim: syntax=ruby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/HISTORY.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,1093 @@ +# Change log + +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). + +## [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 + +- \(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 <blkperl@cat.pdx.edu> +* (#13203) Add ssl support (f7e0ea5) + +## 2012-03-18 - Nan Liu <nan@puppetlabs.com> +* Travis ci before script needs success exit code. (0ea463b) + +## 2012-03-18 - Nan Liu <nan@puppetlabs.com> +* Fix Puppet 2.6 compilation issues. (9ebbbc4) + +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> +* Add travis.ci for testing multiple puppet versions. (33c72ef) + +## 2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu> +* (#13163) Datadir should be configurable (f353fc6) + +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> +* Document create_resources dependency. (558a59c) + +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> +* Fix spec test issues related to error message. (eff79b5) + +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> +* Fix mysql service on Ubuntu. (72da2c5) + +## 2012-03-16 - Dan Bode <dan@puppetlabs.com> +* Add more spec test coverage (55e399d) + +## 2012-03-16 - Nan Liu <nan@puppetlabs.com> +* (#11963) Fix spec test due to path changes. (1700349) + +## 2012-03-07 - François Charlier <fcharlier@ploup.net> +* Add a test to check path for 'mysqld-restart' (b14c7d1) + +## 2012-03-07 - François Charlier <fcharlier@ploup.net> +* Fix path for 'mysqld-restart' (1a9ae6b) + +## 2012-03-15 - Dan Bode <dan@puppetlabs.com> +* Add rspec-puppet tests for mysql::config (907331a) + +## 2012-03-15 - Dan Bode <dan@puppetlabs.com> +* Moved class dependency between sever and config to server (da62ad6) + +## 2012-03-14 - Dan Bode <dan@puppetlabs.com> +* Notify mysql restart from set_mysql_rootpw exec (0832a2c) + +## 2012-03-15 - Nan Liu <nan@puppetlabs.com> +* Add documentation related to osfamily fact. (8265d28) + +## 2012-03-14 - Dan Bode <dan@puppetlabs.com> +* Mention osfamily value in failure message (e472d3b) + +## 2012-03-14 - Dan Bode <dan@puppetlabs.com> +* Fix bug when querying for all database users (015490c) + +## 2012-02-09 - Nan Liu <nan@puppetlabs.com> +* Major refactor of mysql module. (b1f90fd) + +## 2012-01-11 - Justin Ellison <justin.ellison@buckle.com> +* Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4) + +## 2012-01-11 - Justin Ellison <justin.ellison@buckle.com> +* Per @ghoneycutt, we should fail explicitly and explain why. (09af083) + +## 2012-01-11 - Justin Ellison <justin.ellison@buckle.com> +* Removing duplicate declaration (7513d03) + +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> +* Use socket value from params class instead of hardcoding. (663e97c) + +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> +* Instead of hardcoding the config file target, pull it from mysql::params (031a47d) + +## 2012-01-10 - Justin Ellison <justin.ellison@buckle.com> +* 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 <justin.ellison@buckle.com> +* 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 <blkperl@cat.pdx.edu> +* Changed the README to use markdown (3b7dfeb) + +## 2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net> +* (#12412) mysqltuner.pl update (b809e6f) + +## 2011-11-17 - Matthias Pigulla <mp@webfactory.de> +* (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1) + +## 2011-12-20 - Jeff McCune <jeff@puppetlabs.com> +* (minor) Fixup typos in Modulefile metadata (a0ed6a1) + +## 2011-12-19 - Carl Caum <carl@carlcaum.com> +* Only notify Exec to import sql if sql is given (0783c74) + +## 2011-12-19 - Carl Caum <carl@carlcaum.com> +* (#11508) Only load sql_scripts on DB creation (e3b9fd9) + +## 2011-12-13 - Justin Ellison <justin.ellison@buckle.com> +* Require not needed due to implicit dependencies (3058feb) + +## 2011-12-13 - Justin Ellison <justin.ellison@buckle.com> +* Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d) + +## 2011-06-03 - Dan Bode <dan@puppetlabs.com> - 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 + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
--- a/modules/mysql/LICENSE Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/LICENSE Sun Dec 29 15:31:28 2019 +0000 @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -180,13 +181,13 @@ To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate + the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2013 Puppet Labs + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/NOTICE Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,15 @@ +Puppet Module - puppetlabs-mysql + +Copyright 2018 Puppet, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file
--- a/modules/mysql/README.md Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/README.md Sun Dec 29 15:31:28 2019 +0000 @@ -1,115 +1,116 @@ -#MySQL +# mysql -####Table of Contents +#### Table of Contents -1. [Overview](#overview) -2. [Module Description - What the module does and why it is useful](#module-description) -3. [Backwards compatibility information](#backwards-compatibility) -3. [Setup - The basics of getting started with mysql](#setup) +1. [Module Description - What the module does and why it is useful](#module-description) +2. [Setup - The basics of getting started with mysql](#setup) * [Beginning with mysql](#beginning-with-mysql) -4. [Usage - Configuration options and additional functionality](#usage) - * [Customizing Server Options](#customizing-server-options) - * [Creating a Database](#creating-a-database) - * [Custom Configuration](#custom-configuration) -5. [Reference - An under-the-hood peek at what the module is doing and how](#reference) +3. [Usage - Configuration options and additional functionality](#usage) + * [Customize server options](#customize-server-options) + * [Create a database](#create-a-database) + * [Customize configuration](#customize-configuration) + * [Work with an existing server](#work-with-an-existing-server) + * [Specify passwords](#specify-passwords) + * [Install Percona server on CentOS](#install-percona-server-on-centos) + * [Install MariaDB on Ubuntu](#install-mariadb-on-ubuntu) + * [Install Plugins](#install-plugins) +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) -##Overview +## Module Description The mysql module installs, configures, and manages the MySQL service. -##Module Description - -The mysql module manages both the installation and configuration of MySQL, as well as extending Puppet to allow management of MySQL resources, such as databases, users, and grants. +This module manages both the installation and configuration of MySQL, as well as extending Puppet to allow management of MySQL resources, such as databases, users, and grants. -##Setup +## Setup -###What MySQL affects +### Beginning with mysql -* MySQL package -* MySQL configuration files -* MySQL service +To install a server with the default options: -###Beginning with MySQL +`include '::mysql::server'`. -If you want a server installed with the default options you can run -`include '::mysql::server'`. +To customize options, such as the root password or `/etc/my.cnf` settings, you must also pass in an override hash: -If you need to customize options, such as the root -password or `/etc/my.cnf` settings, then you must also pass in an override hash: - -~~~ +```puppet class { '::mysql::server': root_password => 'strongpassword', remove_default_accounts => true, + restart => true, override_options => $override_options } -~~~ +``` -See [**Customizing Server Options**](#customizing-server-options) below for examples of the hash structure for $override_options`. +Nota bene: Configuration changes will only be applied to the running +MySQL server if you pass true as restart to mysql::server. -##Usage +See [**Customize Server Options**](#customize-server-options) below for examples of the hash structure for $override_options. + +## Usage All interaction for the server is done via `mysql::server`. To install the client, use `mysql::client`. To install bindings, use `mysql::bindings`. -###Customizing Server Options +### Customize server options -The hash structure for overrides in `mysql::server` can be structured like a hash in the my.cnf file, so: +To define server options, structure a hash structure of overrides in `mysql::server`. This hash resembles a hash in the my.cnf file: -~~~ +```puppet $override_options = { 'section' => { 'item' => 'thing', } } -~~~ +``` -For items that you would traditionally represent as +For options that you would traditionally represent in this format: -~~~ +``` [section] thing = X -~~~ +``` -you can make an entry like `thing => true`, `thing => value`, or `thing => "` in the hash. Alternatively, you can pass an array, as `thing => ['value', 'value2']`, or list each `thing => value` separately on separate lines. +Entries can be created as `thing => true`, `thing => value`, or `thing => ""` in the hash. Alternatively, you can pass an array as `thing => ['value', 'value2']` or list each `thing => value` separately on individual lines. -MySQL doesn't care if 'thing' is alone or set to a value; it happily accepts both. To keep an option out of the my.cnf file --- e.g., when using `override_options` to revert to a default value --- you can pass `thing => undef`. +You can pass a variable in the hash without setting a value for it; the variable would then use MySQL's default settings. To exclude an option from the `my.cnf` file --- for example, when using `override_options` to revert to a default value --- pass `thing => undef`. -If an option needs multiple instances, you can pass an array. For example, +If an option needs multiple instances, pass an array. For example, -~~~ +```puppet $override_options = { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2'], } } -~~~ +``` produces -~~~ -[mysql] +```puppet +[mysqld] replicate-do-db = base1 replicate-do-db = base2 -~~~ +``` -### Creating a database +To implement version specific parameters, specify the version, such as [mysqld-5.5]. This allows one config for different versions of MySQL. -To use `mysql::db` to create a database with a user and assign some privileges: +### Create a database -~~~ +To create a database with a user and some assigned privileges: + +```puppet mysql::db { 'mydb': user => 'myuser', password => 'mypass', host => 'localhost', grant => ['SELECT', 'UPDATE'], } -~~~ +``` -Or to use a different resource name with exported resources: +To use a different resource name with exported resources: -~~~ +```puppet @@mysql::db { "mydb_${fqdn}": user => 'myuser', password => 'mypass', @@ -118,49 +119,293 @@ grant => ['SELECT', 'UPDATE'], tag => $domain, } -~~~ +``` Then you can collect it on the remote DB server: -~~~ +```puppet Mysql::Db <<| tag == $domain |>> -~~~ +``` + +If you set the sql parameter to a file when creating a database, the file is imported into the new database. -If you set the sql param to a file when creating a database, the file gets imported into the new database. +For large sql files, increase the `import_timeout` parameter, which defaults to 300 seconds. -For large sql files, you should raise the $import_timeout parameter, set by default to 300 seconds. +If you have installed the mysql client in a non standard bin/sbin path you can set this with `mysql_exec_path` . -~~~ +```puppet mysql::db { 'mydb': user => 'myuser', password => 'mypass', host => 'localhost', grant => ['SELECT', 'UPDATE'], - sql => '/path/to/sqlfile', + sql => '/path/to/sqlfile.gz', + import_cat_cmd => 'zcat', import_timeout => 900, + mysql_exec_path => '/opt/rh/rh-myql57/root/bin' } -~~~ +``` + +### Customize configuration + +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`. + +### 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 +[client] +user=root +host=localhost +password=secret +``` + +This module uses the `mysqld_version` fact to discover the server version being used. By default, this is set to the output of `mysqld -V`. If you're working with a remote MySQL server, you may need to set a custom fact for `mysqld_version` to ensure correct behaviour. + +When working with a remote server, do *not* use the `mysql::server` class in your Puppet manifests. + +### Specify passwords + +In addition to passing passwords as plain text, you can input them as hashes. For example: + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +If required, the password can also be an empty string to allow connections without an password. + +### Install Percona server on CentOS + +This example shows how to do a minimal installation of a Percona server on a +CentOS system. This sets up the Percona server, client, and bindings (including Perl and Python bindings). You can customize this usage and update the version as needed. + +This usage has been tested on Puppet 4.4, 5.5 and 6.3.0 / CentOS 7 / Percona Server 5.7. + +**Note:** The installation of the yum repository is not part of this package +and is here only to show a full example of how you can install. + +```puppet +yumrepo { 'percona': + descr => 'CentOS $releasever - Percona', + baseurl => 'http://repo.percona.com/percona/yum/release/$releasever/RPMS/$basearch', + gpgkey => 'https://repo.percona.com/yum/PERCONA-PACKAGING-KEY', + enabled => 1, + gpgcheck => 1, +} -###Custom Configuration +class {'mysql::server': + package_name => 'Percona-Server-server-57', + service_name => 'mysql', + config_file => '/etc/my.cnf', + includedir => '/etc/my.cnf.d', + root_password => 'PutYourOwnPwdHere', + override_options => { + mysqld => { + log-error => '/var/log/mysqld.log', + pid-file => '/var/run/mysqld/mysqld.pid', + }, + 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' +} + +# 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', +} -To add custom MySQL configuration, drop additional files into -`includedir`. Dropping files into `includedir` allows you to override settings or add additional ones, which is helpful if you choose not to use `override_options` in `mysql::server`. The `includedir` location is by default set to /etc/mysql/conf.d. +# Dependencies definition +Yumrepo['percona']-> +Class['mysql::server'] + +Yumrepo['percona']-> +Class['mysql::client'] + +Yumrepo['percona']-> +Class['mysql::bindings'] +``` + +### Install MariaDB on Ubuntu + +#### 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. -##Reference +**Note:** `sfo1.mirrors.digitalocean.com` is one of many mirrors available. You can use any official mirror. + +```puppet +include apt + +apt::source { 'mariadb': + location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu', + release => $::lsbdistcodename, + repos => 'main', + key => { + id => '199369E5404BD5FC7D2FE43BCBCB082A1BB943DB', + server => 'hkp://keyserver.ubuntu.com:80', + }, + include => { + src => false, + deb => true, + }, +} +``` -###Classes +#### 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. + +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. + +All the values set here are an example of a working minimal configuration. + +Specify the version of the package you want with the `package_ensure` parameter. + +```puppet +class {'::mysql::server': + package_name => 'mariadb-server', + package_ensure => '10.1.14+maria-1~trusty', + service_name => 'mysql', + root_password => 'AVeryStrongPasswordUShouldEncrypt!', + override_options => { + mysqld => { + 'log-error' => '/var/log/mysql/mariadb.log', + 'pid-file' => '/var/run/mysqld/mysqld.pid', + }, + 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'] + +``` + +#### Install the MariaDB client + +This example shows how to install the MariaDB client and all of the bindings at once. You can do this installation separately from the server installation. + +Specify the version of the package you want with the `package_ensure` parameter. + +```puppet +class {'::mysql::client': + package_name => 'mariadb-client', + package_ensure => '10.1.14+maria-1~trusty', + 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'] +``` + +### Install MySQL Community server on CentOS + +You can install MySQL Community Server on CentOS using the mysql module and Hiera. This example was tested with the following versions: + +* MySQL Community Server 5.6 +* Centos 7.3 +* Puppet 3.8.7 using Hiera +* puppetlabs-mysql module v3.9.0 + +In Puppet: -####Public classes -* `mysql::server`: Installs and configures MySQL. -* `mysql::server::account_security`: Deletes default MySQL accounts. -* `mysql::server::monitor`: Sets up a monitoring user. -* `mysql::server::mysqltuner`: Installs MySQL tuner script. -* `mysql::server::backup`: Sets up MySQL backups via cron. -* `mysql::bindings`: Installs various MySQL language bindings. -* `mysql::client`: Installs MySQL client (for non-servers). +```puppet +include ::mysql::server + +create_resources(yumrepo, hiera('yumrepo', {})) + +Yumrepo['repo.mysql.com'] -> Anchor['mysql::server::start'] +Yumrepo['repo.mysql.com'] -> Package['mysql_client'] + +create_resources(mysql::db, hiera('mysql::server::db', {})) +``` + +In Hiera: + +```yaml +--- + +# Centos 7.3 +yumrepo: + 'repo.mysql.com': + baseurl: "http://repo.mysql.com/yum/mysql-5.6-community/el/%{::operatingsystemmajrelease}/$basearch/" + descr: 'repo.mysql.com' + enabled: 1 + gpgcheck: true + gpgkey: 'http://repo.mysql.com/RPM-GPG-KEY-mysql' -####Private classes +mysql::client::package_name: "mysql-community-client" # required for proper MySQL installation +mysql::server::package_name: "mysql-community-server" # required for proper MySQL installation +mysql::server::package_ensure: 'installed' # do not specify version here, unfortunately yum fails with error that package is already installed +mysql::server::root_password: "change_me_i_am_insecure" +mysql::server::manage_config_file: true +mysql::server::service_name: 'mysqld' # required for puppet module +mysql::server::override_options: + 'mysqld': + 'bind-address': '127.0.0.1' + 'log-error': '/var/log/mysqld.log' # required for proper MySQL installation + 'mysqld_safe': + 'log-error': '/var/log/mysqld.log' # required for proper MySQL installation + +# create database + account with access, passwords are not encrypted +mysql::server::db: + "dev": + user: "dev" + password: "devpass" + host: "127.0.0.1" + grant: + - "ALL" + +``` + +### Install Plugins + +Plugins can be installed by using the `mysql_plugin` defined type. See `examples/mysql_plugin.pp` for futher examples. +## Reference + +### Classes + +#### 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). + +#### Private classes + * `mysql::server::install`: Installs packages. +* `mysql::server::installdb`: Implements setup of mysqld data directory (e.g. /var/lib/mysql) * `mysql::server::config`: Configures MYSQL. * `mysql::server::service`: Manages service. * `mysql::server::account_security`: Deletes default MySQL accounts. @@ -176,623 +421,114 @@ * `mysql::client::install`: Installs MySQL client. * `mysql::backup::mysqldump`: Implements mysqldump backups. * `mysql::backup::mysqlbackup`: Implements backups with Oracle MySQL Enterprise Backup. -* `mysql::backup::xtrabackup`: Implements backups with XtraBackup from Percona. +* `mysql::backup::xtrabackup`: Implements backups with XtraBackup from Percona or Mariabackup. -###Parameters +### Parameters + +#### mysql::server -####mysql::server +##### `create_root_user` + +Whether root user should be created. -#####`create_root_user` +Valid values are `true`, `false`. -Specify whether root user should be created. Valid values are 'true', 'false'. Defaults to 'true'. +Defaults to `true`. -This is useful for a cluster setup with Galera. The root user has to -be created only once. `create_root_user` can be set to 'true' on one node while -it is set to 'false' on the remaining nodes. +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. -#####`create_root_my_cnf` +##### `create_root_my_cnf` + +Whether to create `/root/.my.cnf`. -If set to 'true', creates `/root/.my.cnf`. Valid values are 'true', 'false'. Defaults to 'true'. +Valid values are `true`, `false`. + +Defaults to `true`. -`create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. This can be used for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. +`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. -#####`root_password` +##### `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. - -#####`old_root_password` - -The previous root password. Required if you want to change the root password via Puppet. - -#####`override_options` - -The hash of override options to pass into MySQL. Structured like a hash in the my.cnf file: - -~~~ -$override_options = { - 'section' => { - 'item' => 'thing', - } -} -~~~ +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. -See [**Customizing Server Options**](#customizing-server-options) above for usage details. - -#####`config_file` - -The location, as a path, of the MySQL configuration file. - -#####`manage_config_file` - -Whether the MySQL configuration file should be managed. Valid values are 'true', 'false'. Defaults to 'true'. - -#####`includedir` -The location, as a path, of !includedir for custom configuration overrides. - -#####`install_options` -Pass [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. - -#####`purge_conf_dir` +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. -Whether the `includedir` directory should be purged. Valid values are 'true', 'false'. Defaults to 'false'. - -#####`restart` - -Whether the service should be restarted when things change. Valid values are 'true', 'false'. Defaults to 'false'. - -#####`root_group` - -The name of the group used for root. Can be a group name or a group ID. See more about the [`group` file attribute](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). - -#####`package_ensure` - -Whether the package exists or should be a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Defaults to 'present'. - -#####`package_manage` - -Whether to manage the mysql server package. Defaults to true. +##### `old_root_password` -#####`package_name` - -The name of the MySQL server package to install. - -#####`remove_default_accounts` - -Specify whether to automatically include `mysql::server::account_security`. Valid values are 'true', 'false'. Defaults to 'false'. - -#####`service_enabled` - -Specify whether the service should be enabled. Valid values are 'true', 'false'. Defaults to 'true'. - -#####`service_manage` - -Specify whether the service should be managed. Valid values are 'true', 'false'. Defaults to 'true'. - -#####`service_name` - -The name of the MySQL server service. Defaults are OS dependent, defined in params.pp. +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. -#####`service_provider` - -The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. - -#####`users` - -Optional hash of users to create, which are passed to [mysql_user](#mysql_user). +##### `create_root_login_file` -~~~ -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` - -Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). - -~~~ -grants => { - 'someuser@localhost/somedb.*' => { - ensure => 'present', - options => ['GRANT'], - privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'], - table => 'somedb.*', - user => 'someuser@localhost', - }, -} -~~~ +Whether to create `/root/.mylogin.cnf` when using mysql 5.6.6+. -#####`databases` - -Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). - -~~~ -databases => { - 'somedb' => { - ensure => 'present', - charset => 'utf8', - }, -} -~~~ - -####mysql::server::backup - -#####`backupuser` +Valid values are `true`, `false`. -MySQL user to create for backups. - -#####`backuppassword` - -MySQL user password for backups. - -#####`backupdir` - -Directory in which to store backups. - -#####`backupdirmode` - -Permissions applied to the backup directory. This parameter is passed directly -to the `file` resource. - -#####`backupdirowner` - -Owner for the backup directory. This parameter is passed directly to the `file` -resource. +Defaults to `false`. -#####`backupdirgroup` - -Group owner for the backup directory. This parameter is passed directly to the -`file` resource. - -#####`backupcompress` - -Whether backups should be compressed. Valid values are 'true', 'false'. Defaults to 'true'. - -#####`backuprotate` - -How many days to keep backups. Valid value is an integer. Defaults to '30'. - -#####`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. Valid values are 'true', 'false'. Defaults to 'false'. +`create_root_login_file` will put a copy of your existing `.mylogin.cnf` in the `/root/.mylogin.cnf` location. -#####`backupdatabases` - -Specify an array of databases to back up. - -#####`file_per_database` - -Whether a separate file be used per database. Valid values are 'true', 'false'. Defaults to 'false'. - -#####`ensure` - -Allows you to remove the backup scripts. Valid values are 'present', 'absent'. Defaults to 'present'. - -#####`execpath` - -Allows you to set a custom PATH should your MySQL installation be non-standard places. Defaults to `/usr/bin:/usr/sbin:/bin:/sbin`. - -#####`time` +When set to 'true', this option also requires the `login_file` option. -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. - -#####`postscript` - -A script that is executed at when the backup is finished. This could be used to (r)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. - -#####`provider` - -Sets the server backup implementation. Valid values are: - -* `mysqldump`: Implements backups with mysqldump. Backup type: Logical. This is the default value. -* `mysqlbackup`: Implements backups with MySQL Enterprise Backup from Oracle. Backup type: Physical. To use this type of backup, you'll need the `meb` package, which is available in RPM and TAR formats from Oracle. For Ubuntu, you can use [meb-deb](https://github.com/dveeden/meb-deb) to create a package from an official tarball. -* `xtrabackup`: Implements backups with XtraBackup from Percona. Backup type: Physical. - -####mysql::server::monitor - -#####`mysql_monitor_username` +The `login_file` option is required when set to true. -The username to create for MySQL monitoring. - -#####`mysql_monitor_password` - -The password to create for MySQL monitoring. - -#####`mysql_monitor_hostname` - -The hostname from which the monitoring user requests are allowed access. - -####mysql::server::mysqltuner - -**Note**: If you're using this class on a non-network-connected system, you must download the mysqltuner.pl script and have it hosted somewhere accessible via `http(s)://`, `puppet://`, `ftp://`, or a fully qualified file path. - -##### `ensure` - -Ensures that the resource exists. Valid values are `present`, `absent`. Defaults to `present`. - -##### `version` +#### `login_file` -The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'. - -##### `source` - -Parameter to optionally specify the source. If not specified, defaults to `https://github.com/major/MySQLTuner-perl/raw/${version}/mysqltuner.pl` - -####mysql::bindings - -##### `client_dev` - -Specify whether `::mysql::bindings::client_dev` should be included. Valid values are true', 'false'. Defaults to 'false'. - -##### `daemon_dev` - -Specify whether `::mysql::bindings::daemon_dev` should be included. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `java_enable` +Whether to put the `/root/.mylogin.cnf` in place. -Specify whether `::mysql::bindings::java` should be included. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `perl_enable` - -Specify whether `mysql::bindings::perl` should be included. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `php_enable` - -Specify whether `mysql::bindings::php` should be included. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `python_enable` - -Specify whether `mysql::bindings::python` should be included. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `ruby_enable` - -Specify whether `mysql::bindings::ruby` should be included. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `install_options` +You need to create the `.mylogin.cnf` file with `mysql_config_editor`, this tool comes with mysql 5.6.6+. -Pass `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). - -##### `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`. - -##### `client_dev_package_name` - -The name of the client_dev package to install. Only applies if `client_dev => true`. - -##### `client_dev_package_provider` - -The provider to use to install the client_dev package. Only applies if `client_dev => true`. - -##### `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`. +The created .mylogin.cnf needs to be put under files in your module, see example below on how to use this. -##### `daemon_dev_package_name` - -The name of the daemon_dev package to install. Only applies if `daemon_dev => true`. - -##### `daemon_dev_package_provider` - -The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`. - -#####`java_package_ensure` +When the `/root/.mylogin.cnf` exists the environment variable `MYSQL_TEST_LOGIN_FILE` will be set. -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`. - -#####`java_package_name` - -The name of the Java package to install. Only applies if `java_enable => true`. - -#####`java_package_provider` - -The provider to use to install the Java package. Only applies if `java_enable => true`. +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. -#####`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`. - -#####`perl_package_name` - -The name of the Perl package to install. Only applies if `perl_enable => true`. - -#####`perl_package_provider` - -The provider to use to install the Perl package. Only applies if `perl_enable => true`. - -##### `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`. - -##### `php_package_name` - -The name of the PHP package to install. Only applies if `php_enable => true`. - -#####`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`. - -#####`python_package_name` - -The name of the Python package to install. Only applies if `python_enable => true`. - -#####`python_package_provider` - -The provider to use to install the PHP package. Only applies if `python_enable => true`. - -#####`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`. - -#####`ruby_package_name` - -The name of the Ruby package to install. Only applies if `ruby_enable => true`. - -#####`ruby_package_provider` - -What provider should be used to install the package. - -####mysql::client - -#####`bindings_enable` - -Whether to automatically install all bindings. Valid values are 'true', 'false'. Default to 'false'. - -#####`install_options` -Array of install options for managed package resources. You must pass the appropriate options for the package manager. - -#####`package_ensure` - -Whether the MySQL package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. - -#####`package_manage` - -Whether to manage the mysql client package. Defaults to true. - -#####`package_name` - -The name of the MySQL client package to install. - -###Defined Types - -####mysql::db +```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", +} +``` -~~~ -mysql_database { 'information_schema': - ensure => 'present', - charset => 'utf8', - collate => 'utf8_swedish_ci', -} -mysql_database { 'mysql': - ensure => 'present', - charset => 'latin1', - collate => 'latin1_swedish_ci', -} -~~~ - -##### `user` - -The user for the database you're creating. - -##### `password` +##### `override_options` -The password for $user for the database you're creating. - -##### `dbname` - -The name of the database to create. Defaults to $name. - -##### `charset` - -The character set for the database. Defaults to 'utf8'. - -##### `collate` - -The collation for the database. Defaults to 'utf8_general_ci'. - -##### `host` - -The host to use as part of user@host for grants. Defaults to 'localhost'. - -##### `grant` +Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file: -The privileges to be granted for user@host on the database. Defaults to 'ALL'. - -##### `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. Defaults to undef. - -##### `enforce_sql` - -Specify whether executing the sqlfiles should happen on every run. If set to 'false', sqlfiles only run once. Valid values are 'true', 'false'. Defaults to 'false'. - -##### `ensure` - -Specify whether to create the database. Valid values are 'present', 'absent'. Defaults to 'present'. - -##### `import_timeout` - -Timeout, in seconds, for loading the sqlfiles. Defaults to '300'. - - -###Types - -####mysql_database - -`mysql_database` creates and manages databases within MySQL. - -##### `ensure` - -Whether the resource is present. Valid values are 'present', 'absent'. Defaults to 'present'. - -##### `name` - -The name of the MySQL database to manage. - -##### `charset` - -The CHARACTER SET setting for the database. Defaults to ':utf8'. - -##### `collate` +```puppet +class { 'mysql::server': + root_password => 'password' +} -The COLLATE setting for the database. Defaults to ':utf8_general_ci'. - -####mysql_user - -Creates and manages user grants within MySQL. - -~~~ -mysql_user { 'root@127.0.0.1': - ensure => 'present', - max_connections_per_hour => '0', - max_queries_per_hour => '0', - max_updates_per_hour => '0', - max_user_connections => '0', -} -~~~ - -You can also specify an authentication plugin. - -~~~ -mysql_user{ 'myuser'@'localhost': - ensure => 'present', - plugin => 'unix_socket', -} -~~~ - -##### `name` - -The name of the user, as 'username@hostname' or username@hostname. - -##### `password_hash` - -The user's password hash of the user. Use mysql_password() for creating such a hash. - -##### `max_user_connections` - -Maximum concurrent connections for the user. Must be an integer value. A value of '0' specifies no (or global) limit. - -##### `max_connections_per_hour` - -Maximum connections per hour for the user. Must be an integer value. A value of '0' specifies no (or global) limit. - -##### `max_queries_per_hour` - -Maximum queries per hour for the user. Must be an integer value. A value of '0' specifies no (or global) limit. - -##### `max_updates_per_hour` - -Maximum updates per hour for the user. Must be an integer value. A value of '0' specifies no (or global) limit. - - -####mysql_grant - -`mysql_grant` creates grant permissions to access databases within -MySQL. To use it you must create the title of the resource as shown below, -following the pattern of `username@hostname/database.table`: - -~~~ -mysql_grant { 'root@localhost/*.*': - ensure => 'present', - options => ['GRANT'], - privileges => ['ALL'], - table => '*.*', - user => 'root@localhost', -} -~~~ - -It is possible to specify privileges down to the column level: - -~~~ -mysql_grant { 'root@localhost/mysql.user': - ensure => 'present', - privileges => ['SELECT (Host, User)'], - table => 'mysql.user', - user => 'root@localhost', +mysql_plugin { 'auth_pam': + ensure => present, + soname => 'auth_pam.so', } -~~~ - -##### `ensure` - -Whether the resource is present. Valid values are 'present', 'absent'. Defaults to 'present'. - -##### `name` -Name to describe the grant. Must in a 'user/table' format. - -##### `privileges` +``` -Privileges to grant the user. - -##### `table` - -The table to which privileges are applied. +### Tasks -##### `user` - -User to whom privileges are granted. - -##### `options` - -MySQL options to grant. Optional. +The MySQL module has an example task that allows a user to execute arbitary SQL against a database. Please refer to to the [PE documentation](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html) or [Bolt documentation](https://puppet.com/docs/bolt/latest/bolt.html) on how to execute a task. -####mysql_plugin - -`mysql_plugin` can be used to load plugins into the MySQL Server. +## Limitations -~~~ -mysql_plugin { 'auth_socket': - ensure => 'present', - soname => 'auth_socket.so', -} -~~~ +For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/master/metadata.json) -##### `ensure` - -Whether the resource is present. Valid values are 'present', 'absent'. Defaults to 'present'. - -##### `name` - -The name of the MySQL plugin to manage. +**Note:** The mysqlbackup.sh does not work and is not supported on MySQL 5.7 and greater. -##### `soname` - -The library file name. +## Development -##Limitations - -This module has been tested on: +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 from this point [here](https://github.com/puppetlabs/puppet_litmus/wiki/Tutorial:-use-Litmus-to-execute-acceptance-tests-with-a-sample-module-(MoTD)#install-the-necessary-gems-for-the-module). -* RedHat Enterprise Linux 5, 6, 7 -* Debian 6, 7 -* CentOS 5, 6, 7 -* Ubuntu 10.04, 12.04, 14.04 -* Scientific Linux 5, 6 -* SLES 11 - -Testing on other platforms has been minimal and cannot be guaranteed. - -#Development +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. -Puppet Labs 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. -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 @@ -808,4 +544,5 @@ * Michael Arnold * Chris Weyl * Daniël van Eeden - +* Jan-Otto Kröpke +* Timothy Sven Nelson
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/REFERENCE.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,1394 @@ +# Reference +<!-- DO NOT EDIT: This document was generated by Puppet Strings --> + +## Table of Contents + +**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. + +_Private Classes_ + +* `mysql::backup::mysqlbackup`: Manage the mysqlbackup client. +* `mysql::backup::mysqldump`: "Provider" for mysqldump +* `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. +* `mysql::bindings::perl`: Private class for installing perl language bindings. +* `mysql::bindings::php`: Private class for installing php language bindings +* `mysql::bindings::python`: Private class for installing python language bindings +* `mysql::bindings::ruby`: Private class for installing ruby language bindings +* `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::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** + +* [`mysql::db`](#mysqldb): Create and configure a MySQL database. + +**Resource types** + +_Public Resource types_ + +* [`mysql_grant`](#mysql_grant): @summary Manage a MySQL user's rights. +* [`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_ + +* `mysql_database`: Manage a MySQL database. +* `mysql_datadir`: Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above). + +**Functions** + +* [`mysql::normalise_and_deepmerge`](#mysqlnormalise_and_deepmerge): Recursively merges two or more hashes together, normalises keys with differing use of dashesh and underscores, +then returns the resulting hash. +* [`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 + +**Tasks** + +* [`export`](#export): Allows you to backup your database to local file. +* [`sql`](#sql): Allows you to execute arbitary SQL + +## Classes + +### mysql::bindings + +Parent class for MySQL bindings. + +#### Examples + +##### Install Ruby language bindings + +```puppet +class { 'mysql::bindings': + ruby_enable => true, + ruby_package_ensure => 'present', + ruby_package_name => 'ruby-mysql-2.7.1-1mdv2007.0.sparc.rpm', + ruby_package_provider => 'rpm', +} +``` + +#### Parameters + +The following parameters are available in the `mysql::bindings` class. + +##### `install_options` + +Data type: `Any` + +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` + +Data type: `Any` + +Specifies whether `::mysql::bindings::java` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `perl_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::perl` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `php_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::php` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `python_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::python` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `ruby_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::ruby` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `client_dev` + +Data type: `Any` + +Specifies whether `::mysql::bindings::client_dev` should be included. Valid values are `true`', `false`. + +Default value: `false` + +##### `daemon_dev` + +Data type: `Any` + +Specifies whether `::mysql::bindings::daemon_dev` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `java_package_ensure` + +Data type: `Any` + +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 + +##### `java_package_name` + +Data type: `Any` + +The name of the Java package to install. Only applies if `java_enable => true`. + +Default value: $mysql::params::java_package_name + +##### `java_package_provider` + +Data type: `Any` + +The provider to use to install the Java package. Only applies if `java_enable => true`. + +Default value: $mysql::params::java_package_provider + +##### `perl_package_ensure` + +Data type: `Any` + +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 + +##### `perl_package_name` + +Data type: `Any` + +The name of the Perl package to install. Only applies if `perl_enable => true`. + +Default value: $mysql::params::perl_package_name + +##### `perl_package_provider` + +Data type: `Any` + +The provider to use to install the Perl package. Only applies if `perl_enable => true`. + +Default value: $mysql::params::perl_package_provider + +##### `php_package_ensure` + +Data type: `Any` + +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 + +##### `php_package_name` + +Data type: `Any` + +The name of the PHP package to install. Only applies if `php_enable => true`. + +Default value: $mysql::params::php_package_name + +##### `php_package_provider` + +Data type: `Any` + +The provider to use to install the PHP package. Only applies if `php_enable => true`. + +Default value: $mysql::params::php_package_provider + +##### `python_package_ensure` + +Data type: `Any` + +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 + +##### `python_package_name` + +Data type: `Any` + +The name of the Python package to install. Only applies if `python_enable => true`. + +Default value: $mysql::params::python_package_name + +##### `python_package_provider` + +Data type: `Any` + +The provider to use to install the Python package. Only applies if `python_enable => true`. + +Default value: $mysql::params::python_package_provider + +##### `ruby_package_ensure` + +Data type: `Any` + +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 + +##### `ruby_package_name` + +Data type: `Any` + +The name of the Ruby package to install. Only applies if `ruby_enable => true`. + +Default value: $mysql::params::ruby_package_name + +##### `ruby_package_provider` + +Data type: `Any` + +What provider should be used to install the package. + +Default value: $mysql::params::ruby_package_provider + +##### `client_dev_package_ensure` + +Data type: `Any` + +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 + +##### `client_dev_package_name` + +Data type: `Any` + +The name of the client_dev package to install. Only applies if `client_dev => true`. + +Default value: $mysql::params::client_dev_package_name + +##### `client_dev_package_provider` + +Data type: `Any` + +The provider to use to install the client_dev package. Only applies if `client_dev => true`. + +Default value: $mysql::params::client_dev_package_provider + +##### `daemon_dev_package_ensure` + +Data type: `Any` + +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 + +##### `daemon_dev_package_name` + +Data type: `Any` + +The name of the daemon_dev package to install. Only applies if `daemon_dev => true`. + +Default value: $mysql::params::daemon_dev_package_name + +##### `daemon_dev_package_provider` + +Data type: `Any` + +The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`. + +Default value: $mysql::params::daemon_dev_package_provider + +### mysql::client + +Installs and configures the MySQL client. + +#### Examples + +##### Install the MySQL client + +```puppet +class {'::mysql::client': + package_name => 'mysql-client', + package_ensure => 'present', + bindings_enable => true, +} +``` + +#### Parameters + +The following parameters are available in the `mysql::client` class. + +##### `bindings_enable` + +Data type: `Any` + +Whether to automatically install all bindings. Valid values are `true`, `false`. Default to `false`. + +Default value: $mysql::params::bindings_enable + +##### `install_options` + +Data type: `Any` + +Array of install options for managed package resources. You must pass the appropriate options for the package manager. + +Default value: `undef` + +##### `package_ensure` + +Data type: `Any` + +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 + +##### `package_manage` + +Data type: `Any` + +Whether to manage the MySQL client package. Defaults to `true`. + +Default value: $mysql::params::client_package_manage + +##### `package_name` + +Data type: `Any` + +The name of the MySQL client package to install. + +Default value: $mysql::params::client_package_name + +### mysql::server + +Installs and configures the MySQL server. + +#### Examples + +##### Install MySQL Server + +```puppet +class { '::mysql::server': + package_name => 'mysql-server', + package_ensure => '5.7.1+mysql~trusty', + root_password => 'strongpassword', + remove_default_accounts => true, +} +``` + +#### Parameters + +The following parameters are available in the `mysql::server` class. + +##### `config_file` + +Data type: `Any` + +The location, as a path, of the MySQL configuration file. + +Default value: $mysql::params::config_file + +##### `includedir` + +Data type: `Any` + +The location, as a path, of !includedir for custom configuration overrides. + +Default value: $mysql::params::includedir + +##### `install_options` + +Data type: `Any` + +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` + +Data type: `Any` + +Path to secret file containing temporary root password. + +Default value: $mysql::params::install_secret_file + +##### `manage_config_file` + +Data type: `Any` + +Whether the MySQL configuration file should be managed. Valid values are `true`, `false`. Defaults to `true`. + +Default value: $mysql::params::manage_config_file + +##### `override_options` + +Data type: `Any` + +Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file: See above for usage details. + +Default value: {} + +##### `package_ensure` + +Data type: `Any` + +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 + +##### `package_manage` + +Data type: `Any` + +Whether to manage the MySQL server package. Defaults to `true`. + +Default value: $mysql::params::server_package_manage + +##### `package_name` + +Data type: `Any` + +The name of the MySQL server package to install. + +Default value: $mysql::params::server_package_name + +##### `purge_conf_dir` + +Data type: `Any` + +Whether the `includedir` directory should be purged. Valid values are `true`, `false`. Defaults to `false`. + +Default value: $mysql::params::purge_conf_dir + +##### `remove_default_accounts` + +Data type: `Any` + +Specifies whether to automatically include `mysql::server::account_security`. Valid values are `true`, `false`. Defaults to `false`. + +Default value: `false` + +##### `restart` + +Data type: `Any` + +Whether the service should be restarted when things change. Valid values are `true`, `false`. Defaults to `false`. + +Default value: $mysql::params::restart + +##### `root_group` + +Data type: `Any` + +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 + +##### `mysql_group` + +Data type: `Any` + +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 + +##### `root_password` + +Data type: `Any` + +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: $mysql::params::root_password + +##### `service_enabled` + +Data type: `Any` + +Specifies whether the service should be enabled. Valid values are `true`, `false`. Defaults to `true`. + +Default value: $mysql::params::server_service_enabled + +##### `service_manage` + +Data type: `Any` + +Specifies whether the service should be managed. Valid values are `true`, `false`. Defaults to `true`. + +Default value: $mysql::params::server_service_manage + +##### `service_name` + +Data type: `Any` + +The name of the MySQL server service. Defaults are OS dependent, defined in 'params.pp'. + +Default value: $mysql::params::server_service_name + +##### `service_provider` + +Data type: `Any` + +The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. + +Default value: $mysql::params::server_service_provider + +##### `create_root_user` + +Data type: `Any` + +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 + +##### `create_root_my_cnf` + +Data type: `Any` + +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 + +##### `users` + +Data type: `Any` + +Optional hash of users to create, which are passed to [mysql_user](#mysql_user). + +Default value: {} + +##### `grants` + +Data type: `Any` + +Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). + +Default value: {} + +##### `databases` + +Data type: `Any` + +Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). + +Default value: {} + +##### `enabled` + +Data type: `Any` + +_Deprecated_ + +Default value: `undef` + +##### `manage_service` + +Data type: `Any` + +_Deprecated_ + +Default value: `undef` + +##### `old_root_password` + +Data type: `Any` + +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: `undef` + +##### `create_root_login_file` + +Data type: `Any` + + + +Default value: $mysql::params::create_root_login_file + +##### `login_file` + +Data type: `Any` + + + +Default value: $mysql::params::login_file + +### mysql::server::backup + +Create and manage a MySQL backup. + +#### Examples + +##### Create a basic MySQL backup: + +```puppet +class { 'mysql::server': + root_password => 'password' +} +class { 'mysql::server::backup': + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', +} +class { 'mysql::server::backup': + backupmethod => 'mariabackup', + provider => 'xtrabackup', + backupdir => '/tmp/backups', +} +``` + +#### Parameters + +The following parameters are available in the `mysql::server::backup` class. + +##### `backupuser` + +Data type: `Any` + +MySQL user with backup administrator privileges. + +Default value: `undef` + +##### `backuppassword` + +Data type: `Any` + +Password for `backupuser`. + +Default value: `undef` + +##### `backupdir` + +Data type: `Any` + +Directory to store backup. + +Default value: `undef` + +##### `backupdirmode` + +Data type: `Any` + +Permissions applied to the backup directory. This parameter is passed directly to the file resource. + +Default value: '0700' + +##### `backupdirowner` + +Data type: `Any` + +Owner for the backup directory. This parameter is passed directly to the file resource. + +Default value: 'root' + +##### `backupdirgroup` + +Data type: `Any` + +Group owner for the backup directory. This parameter is passed directly to the file resource. + +Default value: $mysql::params::root_group + +##### `backupcompress` + +Data type: `Any` + +Whether or not to compress the backup (when using the mysqldump provider) + +Default value: `true` + +##### `backupmethod` + +Data type: `Any` + +The execution binary for backing up. ex. mysqldump, xtrabackup, mariabackup + +Default value: `undef` + +##### `backup_success_file_path` + +Data type: `Any` + +Specify a path where upon successfull backup a file should be created for checking purposes. + +Default value: '/tmp/mysqlbackup_success' + +##### `backuprotate` + +Data type: `Any` + +Backup rotation interval in 24 hour periods. + +Default value: 30 + +##### `ignore_events` + +Data type: `Any` + +Ignore the mysql.event table. + +Default value: `true` + +##### `delete_before_dump` + +Data type: `Any` + +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` + +Data type: `Any` + +Databases to backup (required if using xtrabackup provider). By default `[]` will back up all databases. + +Default value: [] + +##### `file_per_database` + +Data type: `Any` + +Use file per database mode creating one file per database backup. + +Default value: `false` + +##### `include_routines` + +Data type: `Any` + +Dump stored routines (procedures and functions) from dumped databases when doing a `file_per_database` backup. + +Default value: `false` + +##### `include_triggers` + +Data type: `Any` + +Dump triggers for each dumped table when doing a `file_per_database` backup. + +Default value: `false` + +##### `ensure` + +Data type: `Any` + + + +Default value: 'present' + +##### `time` + +Data type: `Any` + +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'] + +##### `prescript` + +Data type: `Any` + +A script that is executed before the backup begins. + +Default value: `false` + +##### `postscript` + +Data type: `Any` + +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` + +Data type: `Any` + +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' + +##### `provider` + +Data type: `Any` + +Sets the server backup implementation. Valid values are: + +Default value: 'mysqldump' + +##### `maxallowedpacket` + +Data type: `Any` + +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' + +##### `optional_args` + +Data type: `Any` + +Specifies an array of optional arguments which should be passed through to the backup tool. (Supported by the xtrabackup and mysqldump providers.) + +Default value: [] + +### mysql::server::monitor + +This is a helper class to add a monitoring user to the database + +#### Parameters + +The following parameters are available in the `mysql::server::monitor` class. + +##### `mysql_monitor_username` + +Data type: `Any` + +The username to create for MySQL monitoring. + +Default value: '' + +##### `mysql_monitor_password` + +Data type: `Any` + +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. + +##### `ensure` + +Data type: `Any` + +Ensures that the resource exists. Valid values are 'present', 'absent'. Defaults to 'present'. + +Default value: 'present' + +##### `version` + +Data type: `Any` + +The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'. + +Default value: 'v1.3.0' + +##### `source` + +Data type: `Any` + +Source path for the mysqltuner package. + +Default value: `undef` + +##### `tuner_location` + +Data type: `Any` + +Destination for the mysqltuner package. + +Default value: '/usr/local/bin/mysqltuner' + +## Defined types + +### mysql::db + +Create and configure a MySQL database. + +#### Examples + +##### Create a database + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => 'mypass', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +#### Parameters + +The following parameters are available in the `mysql::db` defined type. + +##### `user` + +Data type: `Any` + +The user for the database you're creating. + +##### `password` + +Data type: `Any` + +The password for $user for the database you're creating. + +##### `tls_options` + +Data type: `Any` + +The tls_options for $user for the database you're creating. + +Default value: `undef` + +##### `dbname` + +Data type: `Any` + +The name of the database to create. + +Default value: $name + +##### `charset` + +Data type: `Any` + +The character set for the database. + +Default value: 'utf8' + +##### `collate` + +Data type: `Any` + +The collation for the database. + +Default value: 'utf8_general_ci' + +##### `host` + +Data type: `Any` + +The host to use as part of user@host for grants. + +Default value: 'localhost' + +##### `grant` + +Data type: `Any` + +The privileges to be granted for user@host on the database. + +Default value: 'ALL' + +##### `grant_options` + +Data type: `Any` + +The grant_options for the grant for user@host on the database. + +Default value: `undef` + +##### `sql` + +Data type: `Optional[Variant[Array, Hash, String]]` + +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. + +Default value: `undef` + +##### `enforce_sql` + +Data type: `Any` + +Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. + +Default value: `false` + +##### `ensure` + +Data type: `Enum['absent', 'present']` + +Specifies whether to create the database. Valid values are 'present', 'absent'. Defaults to 'present'. + +Default value: 'present' + +##### `import_timeout` + +Data type: `Any` + +Timeout, in seconds, for loading the sqlfiles. Defaults to 300. + +Default value: 300 + +##### `import_cat_cmd` + +Data type: `Any` + +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' + +##### `mysql_exec_path` + +Data type: `Any` + + + +Default value: $mysql::params::exec_path + +## Resource types + +### mysql_grant + +@summary +Manage a MySQL user's rights. + +#### Properties + +The following properties are available in the `mysql_grant` type. + +##### `ensure` + +Valid values: present, absent + +The basic property that the resource should be in. + +Default value: present + +##### `privileges` + +Privileges for user + +##### `table` + +Valid values: %r{.*\..*}, %r{^[0-9a-zA-Z$_]*@[\w%\.:\-/]*$} + +Table to apply privileges to. + +##### `user` + +User to operate on. + +##### `options` + +Options to grant. + +#### Parameters + +The following parameters are available in the `mysql_grant` type. + +##### `name` + +namevar + +Name to describe the grant. + +### mysql_plugin + +Manage MySQL plugins. + +#### Examples + +##### + +```puppet +mysql_plugin { 'some_plugin': + soname => 'some_pluginlib.so', +} +``` + +#### Properties + +The following properties are available in the `mysql_plugin` type. + +##### `ensure` + +Valid values: present, absent + +The basic property that the resource should be in. + +Default value: present + +##### `soname` + +Valid values: %r{^\w+\.\w+$} + +The name of the library + +#### Parameters + +The following parameters are available in the `mysql_plugin` type. + +##### `name` + +namevar + +The name of the MySQL plugin to manage. + +### mysql_user + +@summary +Manage a MySQL user. This includes management of users password as well as privileges. + +#### Properties + +The following properties are available in the `mysql_user` type. + +##### `ensure` + +Valid values: present, absent + +The basic property that the resource should be in. + +Default value: present + +##### `password_hash` + +Valid values: %r{\w*} + +The password hash of the user. Use mysql_password() for creating such a hash. + +##### `plugin` + +Valid values: %r{\w+} + +The authentication plugin of the user. + +##### `max_user_connections` + +Valid values: %r{\d+} + +Max concurrent connections for the user. 0 means no (or global) limit. + +##### `max_connections_per_hour` + +Valid values: %r{\d+} + +Max connections per hour for the user. 0 means no (or global) limit. + +##### `max_queries_per_hour` + +Valid values: %r{\d+} + +Max queries per hour for the user. 0 means no (or global) limit. + +##### `max_updates_per_hour` + +Valid values: %r{\d+} + +Max updates per hour for the user. 0 means no (or global) limit. + +##### `tls_options` + +Options to that set the TLS-related REQUIRE attributes for the user. + +#### Parameters + +The following parameters are available in the `mysql_user` type. + +##### `name` + +namevar + +The name of the user. This uses the 'username@hostname' or username@hostname. + +## Functions + +### 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` + +##### 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` + + + +### mysql::password + +Type: Ruby 4.x API + +Hash a string as mysql's "PASSWORD()" function would do it + +#### `mysql::password(String $password)` + +The mysql::password function. + +Returns: `String` hash +The mysql password hash from the clear text password. + +##### `password` + +Data type: `String` + +Plain text password. + +### mysql::strip_hash + +Type: Ruby 4.x API + +When given a hash this function strips out all blank entries. + +#### `mysql::strip_hash(Hash $hash)` + +The mysql::strip_hash function. + +Returns: `Hash` hash +The given hash with all blank entries removed + +##### `hash` + +Data type: `Hash` + +Hash to be stripped + +### mysql_password + +Type: Ruby 3.x API + +Hash a string as mysql's "PASSWORD()" function would do it + +#### `mysql_password(String $password)` + +The mysql_password function. + +Returns: `String` the mysql password hash from the clear text password. + +##### `password` + +Data type: `String` + +Plain text password. + +## Tasks + +### export + +Allows you to backup your database to local file. + +**Supports noop?** false + +#### Parameters + +##### `database` + +Data type: `Optional[String[1]]` + +Database to connect to + +##### `user` + +Data type: `Optional[String[1]]` + +The user + +##### `password` + +Data type: `Optional[String[1]]` + +The password + +##### `file` + +Data type: `String[1]` + +Path to file you want backup to + +### sql + +Allows you to execute arbitary SQL + +**Supports noop?** false + +#### Parameters + +##### `database` + +Data type: `Optional[String[1]]` + +Database to connect to + +##### `user` + +Data type: `Optional[String[1]]` + +The user + +##### `password` + +Data type: `Optional[String[1]]` + +The password + +##### `sql` + +Data type: `String[1]` + +The SQL you want to execute +
--- a/modules/mysql/Rakefile Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/Rakefile Sun Dec 29 15:31:28 2019 +0000 @@ -1,10 +1,87 @@ +require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any? require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' +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 + returnVal ||= begin + metadata_source = JSON.load(File.read('metadata.json'))['source'] + metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z}) + + metadata_source_match && metadata_source_match[1] + end + + raise "unable to find the changelog_project in .sync.yml or calculate it from the source 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') -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('relative') -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_class_inherits_from_params_class') -PuppetLint.configuration.send('disable_documentation') -PuppetLint.configuration.send('disable_single_quote_string_with_variables') -PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] +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 <<EOM +The changelog tasks depends on unreleased features of the github_changelog_generator gem. +Please manually add it to your .sync.yml for now, and run `pdk update`: +--- +Gemfile: + optional: + ':development': + - gem: 'github_changelog_generator' + git: 'https://github.com/skywinder/github-changelog-generator' + ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' + condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" +EOM + end +end +
--- a/modules/mysql/checksums.json Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/checksums.json Sun Dec 29 15:31:28 2019 +0000 @@ -1,105 +1,128 @@ { - "CHANGELOG.md": "fe4a47d4cfd7674c09acdfca74639f71", - "CONTRIBUTING.md": "e2b8e8e433fc76b3798b7fe435f49375", - "Gemfile": "bbb8d1178f386bc23c151e2779a73314", - "LICENSE": "6089b6bd1f0d807edb8bdfd76da0b038", - "README.md": "ba602f8077366a6c04e11590fd0a5a21", - "Rakefile": "d953eb985f82600dc3b9ac6e1f2cfe64", + "CHANGELOG.md": "51ff4a8d514e13206df28c486983c884", + "CODEOWNERS": "366aefdc1424442b8f864528c2e0db1d", + "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", + "Gemfile": "40f28a9754cf13fd15f4b8e6897c0ded", + "HISTORY.md": "6bc907f23fa327dbe21873029acc6272", + "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", + "NOTICE": "61151e454f47a0df587642c792385533", + "README.md": "10b30ee88a990f896376c3d2862b146f", + "REFERENCE.md": "ccfef8f267a428d5b77c5b76a16b61b7", + "Rakefile": "013397feeb5293cbfc9bdcbd51a02b42", "TODO": "88ca4024a37992b46c34cb46e4ac39e6", + "distelli-manifest.yml": "5ed218d0bcbbd6bb9b8f197f836fc446", "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": "4f86c988a99b131e736501a309604e94", - "examples/mysql_user.pp": "0b76964aebb01714745548e0f2f32fd3", + "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/puppet/parser/functions/mysql_deepmerge.rb": "2b5040ee8cd75a81cf881851e922833a", - "lib/puppet/parser/functions/mysql_dirname.rb": "820ba09a6a0df639da560b41cb31242f", - "lib/puppet/parser/functions/mysql_password.rb": "100a3fa5ccb4f50c96d7f5167d43737f", - "lib/puppet/parser/functions/mysql_strip_hash.rb": "3efe69f1eb189b2913e178b8472aaede", - "lib/puppet/provider/mysql.rb": "881f4f76b084054f7299fe2de596e4c9", - "lib/puppet/provider/mysql_database/mysql.rb": "5cf9b8044df4ec72a726b5f781c84f8f", - "lib/puppet/provider/mysql_grant/mysql.rb": "ab121816dd5a412e832418c8d8cf740c", - "lib/puppet/provider/mysql_plugin/mysql.rb": "49128d2a9a547c4945735bfd75fd6d6c", - "lib/puppet/provider/mysql_user/mysql.rb": "3af9f573524a516e2ecd6d0830a92c62", - "lib/puppet/type/mysql_database.rb": "cf604db80326697fcece33013f116c02", - "lib/puppet/type/mysql_grant.rb": "d84de534270024e090dd536c5947fd25", - "lib/puppet/type/mysql_plugin.rb": "0a52cead6c9283c9aa14ea71bdfa80bd", - "lib/puppet/type/mysql_user.rb": "7955d2cd382446966a6ee83e20806eaf", - "manifests/backup/mysqlbackup.pp": "a10731696220b9fc7686033497f11626", - "manifests/backup/mysqldump.pp": "2715fd6a480cd6aa7c5cbfc17f98f787", - "manifests/backup/xtrabackup.pp": "aabd9c6fb008ca368b6dec2a3f66471f", - "manifests/bindings/client_dev.pp": "80753f1bf48de71d2ca1a6cfda4830be", - "manifests/bindings/daemon_dev.pp": "94d2d74afc2b247593877cebd548ed76", - "manifests/bindings/java.pp": "556b743dc162d2f3264708b0b7ba0328", - "manifests/bindings/perl.pp": "4ecbd448ceac580a07df34b5d3e24837", - "manifests/bindings/php.pp": "641139f1f27085b8e72ac73fb8bc39d8", - "manifests/bindings/python.pp": "ef9e674237eddd7e98ab307131b11069", - "manifests/bindings/ruby.pp": "32b0a32161f7a5b50562cb8e154207d9", - "manifests/bindings.pp": "8becf04105d44910f12986a58cd566f7", - "manifests/client/install.pp": "5f35a8d53e60f2c20c08ccbdd8cd43ba", - "manifests/client.pp": "c350bd6d108acb03a87b860b14d225ef", - "manifests/db.pp": "41859b24225703cda1a7fdc75d710ce9", - "manifests/params.pp": "b0e42fe93fc84483782a9b9a65601e60", - "manifests/server/account_security.pp": "8b9029bfaca6d4d0579f28a7cd05e65d", - "manifests/server/backup.pp": "185e392bb1cbacd0e9852b18913521d0", - "manifests/server/config.pp": "a73a4586bbe67a6942c6f3dd89a40aef", - "manifests/server/install.pp": "acd23b7071feb66969e1b73e15781c25", - "manifests/server/monitor.pp": "a63731018c171de9e441009d453dcac8", - "manifests/server/mysqltuner.pp": "311ce00407959117a81cc22930f18362", - "manifests/server/providers.pp": "87a019dce5bbb6b18c9aa61b5f99134c", - "manifests/server/root_password.pp": "180ca2fc27b03e575bf7dc32df9106c7", - "manifests/server/service.pp": "28810cee7da55a867b47d4e0d82a38f7", - "manifests/server.pp": "e0f27a8c3b0ac37023cda3421fc9fd2f", - "metadata.json": "cbd719454007b254ec727ce8e2eb7773", - "spec/acceptance/mysql_backup_spec.rb": "b31f2a6b400f3575ea1e89255682abe1", - "spec/acceptance/mysql_db_spec.rb": "a7d0d87f1d51d9914b00c849fc694083", - "spec/acceptance/mysql_server_spec.rb": "a09671ae9df1d70ea47762b495150003", - "spec/acceptance/nodesets/centos-510-x64.yml": "5698f7e61292730c603e03f64fe19359", - "spec/acceptance/nodesets/centos-59-x64.yml": "57eb3e471b9042a8ea40978c467f8151", - "spec/acceptance/nodesets/centos-64-x64-pe.yml": "ec075d95760df3d4702abea1ce0a829b", - "spec/acceptance/nodesets/centos-65-x64.yml": "3e5c36e6aa5a690229e720f4048bb8af", - "spec/acceptance/nodesets/default.yml": "76d6d770f3daf53ef1b9a17cd0163290", - "spec/acceptance/nodesets/fedora-18-x64.yml": "80e41b1ee16ea489f53164bfdae58855", - "spec/acceptance/nodesets/sles-11-x64.yml": "44e4c6c15c018333bfa9840a5e702f66", - "spec/acceptance/nodesets/ubuntu-server-10044-x64.yml": "75e86400b7889888dc0781c0ae1a1297", - "spec/acceptance/nodesets/ubuntu-server-12042-x64.yml": "d30d73e34cd50b043c7d14e305955269", - "spec/acceptance/nodesets/ubuntu-server-1404-x64.yml": "5f0aed10098ac5b78e4217bb27c7aaf0", - "spec/acceptance/types/mysql_database_spec.rb": "047db055103fa9782bc6714297eb2a09", - "spec/acceptance/types/mysql_grant_spec.rb": "f9217261e7bae6b63ea46aaa880ebfba", - "spec/acceptance/types/mysql_plugin_spec.rb": "e41e1df4997f57d70db4aaff8b0a1549", - "spec/acceptance/types/mysql_user_spec.rb": "7ae65d682141d2b6005adeafc4ce4698", - "spec/classes/graceful_failures_spec.rb": "47acbf0ef4b19ba26055b927b24d8a95", - "spec/classes/mycnf_template_spec.rb": "ea0fee62bb6f836a95eaa7382c0e6820", - "spec/classes/mysql_bindings_spec.rb": "fd66517c1c61afdf5a4a13c096fb7288", - "spec/classes/mysql_client_spec.rb": "7373be9edd90c54769a66e8af914b852", - "spec/classes/mysql_server_account_security_spec.rb": "22e2b1cb11bd284e02b35e86ff6704cf", - "spec/classes/mysql_server_backup_spec.rb": "82c7de7ad21e315bb2c551274d234371", - "spec/classes/mysql_server_monitor_spec.rb": "99e2b530a11e48b31b35f1a50099b8b5", - "spec/classes/mysql_server_mysqltuner_spec.rb": "4d5f354c4eae5a096166df1099b93f6b", - "spec/classes/mysql_server_spec.rb": "2dc3ee82499e9af45d9b079ceee6f676", - "spec/defines/mysql_db_spec.rb": "09e003a370d51c3bd22408744f3618f8", - "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c", - "spec/spec_helper.rb": "39901d056796699d22dad2d18622ca16", - "spec/spec_helper_acceptance.rb": "37523036b7df6b401e22634e5ba9607b", - "spec/unit/puppet/functions/mysql_deepmerge_spec.rb": "f6102e1f82fb9f4aa38cbf3955ee5973", - "spec/unit/puppet/functions/mysql_password_spec.rb": "388c74f0a3b46ecc008e84ec6eda70f4", - "spec/unit/puppet/provider/mysql_database/mysql_spec.rb": "98a799433ac10b237ac3ad27441610d4", - "spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb": "914bac73bb9841ec7d7041488a55d442", - "spec/unit/puppet/provider/mysql_user/mysql_spec.rb": "da588ef16e32e1944f9f6cc9d6fbc335", - "spec/unit/puppet/type/mysql_database_spec.rb": "9fa0d390c2e15c8a52fc2b981e2a63fc", - "spec/unit/puppet/type/mysql_grant_spec.rb": "1a003358dc88a74ef21fb33fc71debef", - "spec/unit/puppet/type/mysql_plugin_spec.rb": "7ebacf228dfd0c60811bdf8a28a329ff", - "spec/unit/puppet/type/mysql_user_spec.rb": "83839a0347ba282f796432d33e93d90f", + "lib/facter/mysql_server_id.rb": "8074e28063136191d064de5bbd23d823", + "lib/facter/mysql_version.rb": "7f98eab71b47bf3546385d4f944a8d34", + "lib/facter/mysqld_version.rb": "d4db7620b989d251a2c0223b720da1c9", + "lib/puppet/functions/mysql/normalise_and_deepmerge.rb": "4e5b3d3680891be8dd421abc97057562", + "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": "383364bcdbb716bb30e6984e8bb9f1fa", + "lib/puppet/provider/mysql_database/mysql.rb": "12e6bfef70486ed4d8a4e731bfde89fa", + "lib/puppet/provider/mysql_datadir/mysql.rb": "441a199d4239be01eaebcd529d1c3842", + "lib/puppet/provider/mysql_grant/mysql.rb": "e0a96951629bc906d45c8bc73f0d16d5", + "lib/puppet/provider/mysql_plugin/mysql.rb": "d0043d2fec34ab9d9839ecb2f5e6f494", + "lib/puppet/provider/mysql_user/mysql.rb": "4466d0241feb09fc7e60911fa068ba89", + "lib/puppet/type/mysql_database.rb": "a52d622db5cb4e9978c57d445e7d63f7", + "lib/puppet/type/mysql_datadir.rb": "003e20fbccdfabbf46e62dfbfc41781b", + "lib/puppet/type/mysql_grant.rb": "70c9d08f7a1d076d538d93b25ef5a187", + "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": "5862b516f646ac93e4279af9997760db", + "manifests/backup/mysqldump.pp": "6c4173813af1b8416ccbb8b116539779", + "manifests/backup/xtrabackup.pp": "5e139cd43871dc6abbfbf6ef983d4bec", + "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": "04bfb819c6a3094ccbd07f2a990ba945", + "manifests/server/account_security.pp": "e8547d61232dab8399fc1c026678f0e8", + "manifests/server/backup.pp": "53a8ca17a56e8295b80a0d17836139f9", + "manifests/server/binarylog.pp": "26117dc41eb385181e9b997d98ae1758", + "manifests/server/config.pp": "0eeaf180307330258598df1723ed9374", + "manifests/server/install.pp": "e00ad8cd4292540d6556c63a82bcf923", + "manifests/server/installdb.pp": "71b17ea1661be8f30c96ffdeb0ba96e6", + "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": "c464de75bd973f2dbfb7f6d985f749a1", + "metadata.json": "06bc02feef5ad82ab399c2503c3c372d", + "provision.yaml": "a58ed874d86485e24cb4e13c1d37fb96", + "readmes/README_ja_JP.md": "f5adf27788eb36c2c1e19a10440f739a", + "readmes/REFERENCE_ja_JP.md": "e9df3acc508f15970e9231b58be26901", + "spec/acceptance/mysql_backup_spec.rb": "0822a52d47aa57e90faff4d8b29ea9de", + "spec/acceptance/mysql_db_spec.rb": "cedd794091296443c31dc39d1f76b7e4", + "spec/acceptance/mysql_server_spec.rb": "3fd29c2a95ceb9a576357a59ad421d0c", + "spec/acceptance/mysql_task_spec.rb": "b405660ce7cb30fd340aa54e0f4a91d5", + "spec/acceptance/types/mysql_database_spec.rb": "77775ed1c0173189e304a2e52f85977d", + "spec/acceptance/types/mysql_grant_spec.rb": "bccfd6eed611ee5c922baec05a227777", + "spec/acceptance/types/mysql_plugin_spec.rb": "5d68e4f537b1ebf9e5f61ede521e48c7", + "spec/acceptance/types/mysql_user_spec.rb": "fe70d4a4f7628c6a1a57b9a94ad6ea85", + "spec/classes/graceful_failures_spec.rb": "b87bf88de1903d81765ea2823e30b13f", + "spec/classes/mycnf_template_spec.rb": "41a4593b53d5ad9416f96d1c695efa0c", + "spec/classes/mysql_backup_mysqldump_spec.rb": "004f7675aae8a4184a3935a20bcac775", + "spec/classes/mysql_backup_xtrabackup_spec.rb": "2a615dae96572bf96e5c17627a2b4ee2", + "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": "cfc73d17d76a1ef5e27b5faf3e0f5158", + "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": "973bd7e9b429cde3c8d45d57c2fa21ed", + "spec/defines/mysql_db_spec.rb": "fba7016688860d20891fd74f0782c54c", + "spec/functions/mysql_normalise_and_deepmerge_spec.rb": "5b6bd36462373a304e1b1628655df7e4", + "spec/functions/mysql_password_spec.rb": "1a2b0cc8ef0b8e9b71e8c9211e8a2c2f", + "spec/functions/mysql_strip_hash_spec.rb": "40c9eccc3b09ca20ed7ce35930affe21", + "spec/spec_helper.rb": "7e33941d7d52fbd6964dae2a91090c6f", + "spec/spec_helper_acceptance.rb": "7a285d6e707935349a4b37eabdb3ae2a", + "spec/spec_helper_acceptance_local.rb": "2d3ae82096bcda4929d5e8b35f850a3c", + "spec/spec_helper_local.rb": "572d87438363ac1be58a01cbcfab24c5", + "spec/unit/facter/mysql_server_id_spec.rb": "f34e0c0cba144771006cb9fbbada3e70", + "spec/unit/facter/mysql_version_spec.rb": "6733d7021877568c29c7c41bf57850b6", + "spec/unit/facter/mysqld_version_spec.rb": "b1dab6f3dddad03c8eb32478bba715f5", + "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": "71d25d7baf50eec3172ace2372832c5e", + "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": "06686cb9e90ac679d9325c6d3a700010", + "tasks/sql.json": "f57ad96a8079e6729ff7557f9ac6fa62", + "tasks/sql.rb": "0047767443883b5a821cb4b2c5f99843", "templates/meb.cnf.erb": "b6422b19ee97b8a2883bfac44fdc0292", - "templates/my.cnf.erb": "701e3cd51d99fbd3ec60a68aaa1c8417", - "templates/my.cnf.pass.erb": "30b24a3f29fcc644bd3a73929305cda0", - "templates/mysqlbackup.sh.erb": "fde3c2604729b60a1364ea337bdbc963" + "templates/my.cnf.erb": "535d2ff37fea6b11ad928224965143d3", + "templates/my.cnf.pass.erb": "11f80afb0993a436f074a43f70733999", + "templates/mysqlbackup.sh.erb": "e08606c65a2c6e9c4f07d074e44d68fa", + "templates/xtrabackup.sh.erb": "28a85fc52f69f117177c162acb317fa6" } \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/distelli-manifest.yml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,25 @@ +team-modules/puppetlabs-mysql: + PreBuild: + - source /opt/rh/rh-ruby25/enable + - echo "--- LETS update BUNDLER ---" + - bundle install --path vendor/bundle --jobs 3 + Build: + - echo "--- PROVISIONING ---" + - source /opt/rh/rh-ruby25/enable + - bundle exec rake litmus:provision_list[release_checks] + - cat inventory.yaml + - echo "--- AGENT INSTALLATION ---" + - bundle exec rake litmus:install_agent + - echo "--- MODULE INSTALLATION ---" + - bundle exec rake litmus:install_module + - echo "--- TESTS RUNNING ---" + - bundle exec rake litmus:acceptance:parallel + AfterBuildSuccess: + - source /opt/rh/rh-ruby25/enable + - bundle exec rake litmus:tear_down + AfterBuildFailure: + - source /opt/rh/rh-ruby25/enable + - bundle exec rake litmus:tear_down + CommitData: + - RepoType: Git + - RepoPath: .
--- a/modules/mysql/examples/mysql_plugin.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/examples/mysql_plugin.pp Sun Dec 29 15:31:28 2019 +0000 @@ -7,7 +7,7 @@ default => 'validate_password.so' } -mysql::plugin { 'validate_password': +mysql_plugin { 'validate_password': ensure => present, soname => $validate_password_soname, } @@ -17,7 +17,7 @@ default => 'auth_socket.so' } -mysql::plugin { 'auth_socket': +mysql_plugin { 'auth_socket': ensure => present, soname => $auth_socket_soname, }
--- a/modules/mysql/examples/mysql_user.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/examples/mysql_user.pp Sun Dec 29 15:31:28 2019 +0000 @@ -6,18 +6,18 @@ mysql_user{ 'redmine@localhost': ensure => present, - password_hash => mysql_password('redmine'), + password_hash => mysql::password('redmine'), require => Class['mysql::server'], } mysql_user{ 'dan@localhost': ensure => present, - password_hash => mysql_password('blah') + password_hash => mysql::password('blah') } mysql_user{ 'dan@%': ensure => present, - password_hash => mysql_password('blah'), + password_hash => mysql::password('blah'), } mysql_user{ 'socketplugin@%': @@ -27,6 +27,6 @@ mysql_user{ 'socketplugin@%': ensure => present, - password_hash => mysql_password('blah'), + password_hash => mysql::password('blah'), plugin => 'mysql_native_password', }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/facter/mysql_server_id.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,13 @@ +def mysql_id_get + Facter.value(:macaddress).split(':')[2..-1].reduce(0) { |total, value| (total << 6) + value.hex } +end + +Facter.add('mysql_server_id') do + setcode do + begin + mysql_id_get + rescue + nil + end + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/facter/mysql_version.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,7 @@ +Facter.add('mysql_version') do + confine { Facter::Core::Execution.which('mysql') } + setcode do + mysql_ver = Facter::Util::Resolution.exec('mysql --version') + mysql_ver.match(%r{\d+\.\d+\.\d+})[0] if mysql_ver + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/facter/mysqld_version.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,6 @@ +Facter.add('mysqld_version') do + confine { Facter::Core::Execution.which('mysqld') } + setcode do + Facter::Util::Resolution.exec('mysqld --no-defaults -V 2>/dev/null') + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/puppet/functions/mysql/normalise_and_deepmerge.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,67 @@ +# @summary Recursively merges two or more hashes together, normalises keys with differing use of dashesh and underscores, +# then returns the resulting hash. +# +# @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 + def normalise_and_deepmerge(*args) + if args.length < 2 + raise Puppet::ParseError, _('mysql::normalise_and_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length } + end + + 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. + unless arg.is_a?(Hash) + raise Puppet::ParseError, _('mysql::normalise_and_deepmerge: unexpected argument type %{arg_class}, only expects hash arguments.') % { args_class: args.class } + end + + # 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 key =~ %r{-|_} + 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/puppet/functions/mysql/password.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,22 @@ +require 'digest/sha1' +# @summary +# Hash a string as mysql's "PASSWORD()" function would do it +# +Puppet::Functions.create_function(:'mysql::password') do + # @param password + # Plain text password. + # + # @return hash + # The mysql password hash from the clear text password. + # + dispatch :password do + required_param 'String', :password + return_type '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 + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/puppet/functions/mysql/strip_hash.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,22 @@ +# @summary +# When given a hash this function strips out all blank entries. +# +Puppet::Functions.create_function(:'mysql::strip_hash') do + # @param hash + # Hash to be stripped + # + # @return hash + # The given hash with all blank entries removed + # + dispatch :strip_hash do + required_param 'Hash', :hash + return_type 'Hash' + end + + def strip_hash(hash) + # Filter out all the top level blanks. + hash.reject { |_k, v| v == '' }.each do |_k, v| + v.reject! { |_ki, vi| vi == '' } if v.is_a?(Hash) + end + end +end
--- a/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:mysql_deepmerge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args| - Recursively merges two or more hashes together and returns the resulting hash. - - For example: - - $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } } - $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } } - $merged_hash = mysql_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. - - ENDHEREDOC - - if args.length < 2 - raise Puppet::ParseError, ("mysql_deepmerge(): wrong number of arguments (#{args.length}; must be at least 2)") - end - - result = Hash.new - args.each do |arg| - next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef - # If the argument was not a hash, skip it. - unless arg.is_a?(Hash) - raise Puppet::ParseError, "mysql_deepmerge: unexpected argument type #{arg.class}, only expects hash arguments" - end - - # 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, arg ) - end - return( result ) - end -end - -def has_normalized!(hash, key) - return true if hash.has_key?( key ) - return false unless key.match(/-|_/) - other_key = key.include?('-') ? key.gsub( '-', '_' ) : key.gsub( '_', '-' ) - return false unless hash.has_key?( other_key ) - hash[key] = hash.delete( other_key ) - return true; -end - -def overlay( hash1, hash2 ) - hash2.each do |key, value| - if(has_normalized!( hash1, key ) and value.is_a?(Hash) and hash1[key].is_a?(Hash)) - overlay( hash1[key], value ) - else - hash1[key] = value - end - end -end
--- a/modules/mysql/lib/puppet/parser/functions/mysql_dirname.rb Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:mysql_dirname, :type => :rvalue, :doc => <<-EOS - Returns the dirname of a path. - EOS - ) do |arguments| - - raise(Puppet::ParseError, "mysql_dirname(): Wrong number of arguments " + - "given (#{arguments.size} for 1)") if arguments.size < 1 - - path = arguments[0] - return File.dirname(path) - end -end - -# vim: set ts=2 sw=2 et :
--- a/modules/mysql/lib/puppet/parser/functions/mysql_password.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/parser/functions/mysql_password.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,16 +1,21 @@ -# hash a string as mysql's "PASSWORD()" function would do it require 'digest/sha1' - module Puppet::Parser::Functions - newfunction(:mysql_password, :type => :rvalue, :doc => <<-EOS - Returns the mysql password hash from the clear text password. + 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| + ) do |args| - raise(Puppet::ParseError, 'mysql_password(): Wrong number of arguments ' + - "given (#{args.size} for 1)") if args.size != 1 + 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
--- a/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:mysql_strip_hash, :type => :rvalue, :arity => 1, :doc => <<-EOS -TEMPORARY FUNCTION: EXPIRES 2014-03-10 -When given a hash this function strips out all blank entries. -EOS - ) do |args| - - hash = args[0] - unless hash.is_a?(Hash) - raise(Puppet::ParseError, 'mysql_strip_hash(): Requires hash to work with') - end - - # Filter out all the top level blanks. - hash.reject{|k,v| v == ''}.each do |k,v| - if v.is_a?(Hash) - v.reject!{|ki,vi| vi == '' } - end - end - - end -end
--- a/modules/mysql/lib/puppet/provider/mysql.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/provider/mysql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,30 +1,139 @@ +# Puppet provider for mysql class Puppet::Provider::Mysql < Puppet::Provider - # Without initvars commands won't work. initvars - commands :mysql => 'mysql' + + # Make sure we find mysql commands on CentOS and FreeBSD + ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/local/libexec:/usr/local/bin' + ENV['LD_LIBRARY_PATH'] = [ + ENV['LD_LIBRARY_PATH'], + '/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-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', + '/opt/rh/mariadb55/root/usr/lib64', + '/usr/mysql/5.5/lib', + '/usr/mysql/5.5/lib64', + '/usr/mysql/5.6/lib', + '/usr/mysql/5.6/lib64', + '/usr/mysql/5.7/lib', + '/usr/mysql/5.7/lib64', + ].join(':') + + # rubocop:disable Style/HashSyntax + commands :mysql_raw => 'mysql' + commands :mysqld => 'mysqld' commands :mysqladmin => 'mysqladmin' + # rubocop:enable Style/HashSyntax # Optional defaults file def self.defaults_file - if File.file?("#{Facter.value(:root_home)}/.my.cnf") - "--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf" - else - nil - end + "--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf" if File.file?("#{Facter.value(:root_home)}/.my.cnf") + end + + def self.mysqld_type + # find the mysql "dialect" like mariadb / mysql etc. + mysqld_version_string.scan(%r{mariadb}i) { return 'mariadb' } + mysqld_version_string.scan(%r{\s\(percona}i) { return 'percona' } + 'mysql' + end + + def mysqld_type + self.class.mysqld_type + end + + def self.mysqld_version_string + # As the possibility of the mysqld being remote we need to allow the version string to be overridden, + # this can be done by facter.value as seen below. In the case that it has not been set and the facter + # value is nil we use the mysql -v command to ensure we report the correct version of mysql for later use cases. + @mysqld_version_string ||= Facter.value(:mysqld_version) || mysqld('-V') + end + + def mysqld_version_string + self.class.mysqld_version_string end - + + def self.mysqld_version + # 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? + end + + def mysqld_version + self.class.mysqld_version + end + + def self.newer_than(forks_versions) + forks_versions.keys.include?(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.keys.include?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) < 0 + end + + def older_than(forks_versions) + self.class.older_than(forks_versions) + end + def defaults_file self.class.defaults_file end + def self.mysql_caller(text_of_sql, type) + 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) + else + mysql_raw([defaults_file, system_database, '-e', text_of_sql].flatten.compact) + 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) + else + mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact) + end + else + raise Puppet::Error, _("#mysql_caller: Unrecognised type '%{type}'" % { type: type }) + end + end + def self.users - mysql([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"].compact).split("\n") + mysql_caller("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').split("\n") + end + + # Optional parameter to run a statement on the MySQL system database. + def self.system_database + '--database=mysql' + end + + def system_database + self.class.system_database end # Take root@localhost and munge it to 'root'@'localhost' + # Take root@id123@localhost and munge it to 'root@id123'@'localhost' def self.cmd_user(user) - "'#{user.sub('@', "'@'")}'" + "'#{user.reverse.sub('@', "'@'").reverse}'" end # Take root.* and return ON `root`.* @@ -32,39 +141,33 @@ table_string = '' # We can't escape *.* so special case this. - if table == '*.*' - table_string << '*.*' - # Special case also for PROCEDURES - elsif table.start_with?('PROCEDURE ') - table_string << table.sub(/^PROCEDURE (.*)(\..*)/, 'PROCEDURE `\1`\2') - else - table_string << table.sub(/^(.*)(\..*)/, '`\1`\2') - end + table_string << if table == '*.*' + '*.*' + # Special case also for FUNCTIONs and PROCEDUREs + elsif table.start_with?('FUNCTION ', 'PROCEDURE ') + table.sub(%r{^(FUNCTION|PROCEDURE) (.*)(\..*)}, '\1 `\2`\3') + else + table.sub(%r{^(.*)(\..*)}, '`\1`\2') + end table_string end def self.cmd_privs(privileges) - if privileges.include?('ALL') - return 'ALL PRIVILEGES' - else - priv_string = '' - privileges.each do |priv| - priv_string << "#{priv}, " - end + return 'ALL PRIVILEGES' if privileges.include?('ALL') + priv_string = '' + privileges.each do |priv| + priv_string << "#{priv}, " end # Remove trailing , from the last element. - priv_string.sub(/, $/, '') + priv_string.sub(%r{, $}, '') end # Take in potential options and build up a query string with them. def self.cmd_options(options) option_string = '' options.each do |opt| - if opt == 'GRANT' - option_string << ' WITH GRANT OPTION' - end + option_string << ' WITH GRANT OPTION' if opt == 'GRANT' end option_string end - end
--- a/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,21 +1,20 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) -Puppet::Type.type(:mysql_database).provide(:mysql, :parent => Puppet::Provider::Mysql) do +Puppet::Type.type(:mysql_database).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'Manages MySQL databases.' - commands :mysql => 'mysql' + commands mysql_raw: 'mysql' def self.instances - mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name| + mysql_caller('show databases', 'regular').split("\n").map do |name| attributes = {} - mysql([defaults_file, '-NBe', "show variables like '%_database'", name].compact).split("\n").each do |line| - k,v = line.split(/\s/) + mysql_caller(["show variables like '%_database'", name], 'regular').split("\n").each do |line| + k, v = line.split(%r{\s}) attributes[k] = v end - new(:name => name, - :ensure => :present, - :charset => attributes['character_set_database'], - :collate => attributes['collation_database'] - ) + new(name: name, + ensure: :present, + charset: attributes['character_set_database'], + collate: attributes['collation_database']) end end @@ -24,14 +23,13 @@ def self.prefetch(resources) databases = instances resources.keys.each do |database| - if provider = databases.find { |db| db.name == database } - resources[database].provider = provider - end + provider = databases.find { |db| db.name == database } + resources[database].provider = provider if provider end end def create - mysql([defaults_file, '-NBe', "create database if not exists `#{@resource[:name]}` character set `#{@resource[:charset]}` collate `#{@resource[:collate]}`"].compact) + self.class.mysql_caller("create database if not exists `#{@resource[:name]}` character set `#{@resource[:charset]}` collate `#{@resource[:collate]}`", 'regular') @property_hash[:ensure] = :present @property_hash[:charset] = @resource[:charset] @@ -41,7 +39,7 @@ end def destroy - mysql([defaults_file, '-NBe', "drop database if exists `#{@resource[:name]}`"].compact) + self.class.mysql_caller("drop database if exists `#{@resource[:name]}`", 'regular') @property_hash.clear exists? ? (return false) : (return true) @@ -54,15 +52,14 @@ mk_resource_methods def charset=(value) - mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"].compact) + self.class.mysql_caller("alter database `#{resource[:name]}` CHARACTER SET #{value}", 'regular') @property_hash[:charset] = value - charset == value ? (return true) : (return false) + (charset == value) ? (return true) : (return false) end def collate=(value) - mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` COLLATE #{value}"].compact) + self.class.mysql_caller("alter database `#{resource[:name]}` COLLATE #{value}", 'regular') @property_hash[:collate] = value - collate == value ? (return true) : (return false) + (collate == value) ? (return true) : (return false) end - end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/puppet/provider/mysql_datadir/mysql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,96 @@ +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' + + initvars + + # Make sure we find mysqld on CentOS and mysql_install_db on Gentoo and Solaris 11 + ENV['PATH'] = [ + ENV['PATH'], + '/usr/libexec', + '/usr/share/mysql/scripts', + '/opt/rh/rh-mysql57/root/usr/bin', + '/opt/rh/rh-mysql57/root/usr/libexec', + '/opt/rh/rh-mysql56/root/usr/bin', + '/opt/rh/rh-mysql56/root/usr/libexec', + '/opt/rh/rh-mariadb101/root/usr/bin', + '/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', + '/opt/rh/mariadb55/root/usr/libexec', + '/usr/mysql/5.5/bin', + '/usr/mysql/5.6/bin', + '/usr/mysql/5.7/bin', + ].join(':') + + commands mysqld: 'mysqld' + optional_commands mysql_install_db: 'mysql_install_db' + # rubocop:disable Lint/UselessAssignment + def create + name = @resource[:name] + insecure = @resource.value(:insecure) || true + defaults_extra_file = @resource.value(:defaults_extra_file) + user = @resource.value(:user) || 'mysql' + basedir = @resource.value(:basedir) + datadir = @resource.value(:datadir) || @resource[:name] + 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 + defaults_extra_file = "--defaults-extra-file=#{defaults_extra_file}" + end + + initialize = if insecure == true + '--initialize-insecure' + else + '--initialize' + end + + opts = [defaults_extra_file] + ['basedir', 'datadir', 'user'].each do |opt| + val = eval(opt) # rubocop:disable Security/Eval + 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') + opts << "--log-error=#{log_error}" + opts << initialize.to_s + debug("Initializing MySQL data directory >= 5.7.6 with mysqld: #{opts.compact.join(' ')}") + mysqld(opts.compact) + else + debug("Installing MySQL data directory with mysql_install_db #{opts.compact.join(' ')}") + mysql_install_db(opts.compact) + end + + exists? + end + + def destroy + name = @resource[:name] # rubocop:disable Lint/UselessAssignment + raise ArgumentError, _('ERROR: `Resource` can not be removed.') + end + + def exists? + datadir = @resource[:datadir] + File.directory?("#{datadir}/mysql") && (Dir.entries("#{datadir}/mysql") - ['.', '..']).any? + end + + ## + ## MySQL datadir properties + ## + + # Generates method for all properties of the property_hash + mk_resource_methods +end
--- a/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,73 +1,74 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) -Puppet::Type.type(:mysql_grant).provide(:mysql, :parent => Puppet::Provider::Mysql) do +Puppet::Type.type(:mysql_grant).provide(:mysql, parent: Puppet::Provider::Mysql) do + desc 'Set grants for users in MySQL.' - desc 'Set grants for users in MySQL.' + commands mysql_raw: 'mysql' def self.instances instances = [] - users.select{ |user| user =~ /.+@/ }.collect do |user| - user_string = self.cmd_user(user) + users.map do |user| + user_string = cmd_user(user) query = "SHOW GRANTS FOR #{user_string};" begin - grants = mysql([defaults_file, "-NBe", query].compact) + grants = mysql_caller(query, 'regular') rescue Puppet::ExecutionFailure => e # Silently ignore users with no grants. Can happen e.g. if user is # defined with fqdn and server is run with skip-name-resolve. Example: # 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. - if e.inspect =~ /There is no such grant defined for user/ - next - else - raise Puppet::Error, "#mysql had an error -> #{e.inspect}" - end + next if e.inspect =~ %r{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. grants.each_line do |grant| # Match the munges we do in the type. - munged_grant = grant.delete("'").delete("`") + munged_grant = grant.delete("'").delete('`').delete('"') # Matching: GRANT (SELECT, UPDATE) PRIVILEGES ON (*.*) TO ('root')@('127.0.0.1') (WITH GRANT OPTION) - if match = munged_grant.match(/^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)?$/) - privileges, table, user, host, rest = match.captures - table.gsub!('\\\\', '\\') + 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!('\\\\', '\\') - # split on ',' if it is not a non-'('-containing string followed by a - # closing parenthesis ')'-char - e.g. only split comma separated elements not in - # parentheses - stripped_privileges = privileges.strip.split(/\s*,\s*(?![^(]*\))/).map do |priv| - # split and sort the column_privileges in the parentheses and rejoin - if priv.include?('(') - type, col=priv.strip.split(/\s+|\b/,2) - type.upcase + " (" + col.slice(1...-1).strip.split(/\s*,\s*/).sort.join(', ') + ")" - else - # Once we split privileges up on the , we need to make sure we - # shortern ALL PRIVILEGES to just all. - priv == 'ALL PRIVILEGES' ? 'ALL' : priv.strip - end + # split on ',' if it is not a non-'('-containing string followed by a + # closing parenthesis ')'-char - e.g. only split comma separated elements not in + # parentheses + stripped_privileges = privileges.strip.split(%r{\s*,\s*(?![^(]*\))}).map do |priv| + # 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(', ') + ')' + else + # Once we split privileges up on the , we need to make sure we + # shortern ALL PRIVILEGES to just all. + (priv == 'ALL PRIVILEGES') ? 'ALL' : priv.strip end - # Same here, but to remove OPTION leaving just GRANT. - options = ['GRANT'] if rest.match(/WITH\sGRANT\sOPTION/) - # 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, - :table => table, - :user => "#{user}@#{host}", - :options => options - ) end + # Same here, but to remove OPTION leaving just GRANT. + options = if rest =~ %r{WITH\sGRANT\sOPTION} + ['GRANT'] + else + ['NONE'] + end + # 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, + table: table, + user: "#{user}@#{host}", + options: options, + ) end end - return instances + instances end def self.prefetch(resources) users = instances resources.keys.each do |name| - if provider = users.find { |user| user.name == name } + if provider = users.find { |user| user.name == name } # rubocop:disable Lint/AssignmentInCondition resources[name].provider = provider end end @@ -76,12 +77,12 @@ def grant(user, table, privileges, options) user_string = self.class.cmd_user(user) priv_string = self.class.cmd_privs(privileges) - table_string = self.class.cmd_table(table) + 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? - mysql([defaults_file, '-e', query].compact) + self.class.mysql_caller(query, 'system') end def create @@ -96,23 +97,33 @@ exists? ? (return true) : (return false) end - def revoke(user, table) + def revoke(user, table, revoke_privileges = ['ALL']) user_string = self.class.cmd_user(user) - table_string = self.class.cmd_table(table) - + table_string = revoke_privileges.include?('PROXY') ? self.class.cmd_user(table) : self.class.cmd_table(table) + priv_string = self.class.cmd_privs(revoke_privileges) # revoke grant option needs to be a extra query, because # "REVOKE ALL PRIVILEGES, GRANT OPTION [..]" is only valid mysql syntax # if no ON clause is used. # It hast to be executed before "REVOKE ALL [..]" since a GRANT has to # exist to be executed successfully - query = "REVOKE GRANT OPTION ON #{table_string} FROM #{user_string}" - mysql([defaults_file, '-e', query].compact) - query = "REVOKE ALL ON #{table_string} FROM #{user_string}" - mysql([defaults_file, '-e', query].compact) + if revoke_privileges.include?('ALL') && !revoke_privileges.include?('PROXY') + query = "REVOKE GRANT OPTION ON #{table_string} FROM #{user_string}" + self.class.mysql_caller(query, 'system') + end + query = "REVOKE #{priv_string} ON #{table_string} FROM #{user_string}" + self.class.mysql_caller(query, 'system') end def destroy - revoke(@property_hash[:user], @property_hash[:table]) + # if the user was dropped, it'll have been removed from the user hash + # as the grants are already removed by the DROP statement + if self.class.users.include? @property_hash[:user] + if @property_hash[:privileges].include?('PROXY') + revoke(@property_hash[:user], @property_hash[:table], @property_hash[:privileges]) + else + revoke(@property_hash[:user], @property_hash[:table]) + end + end @property_hash.clear exists? ? (return false) : (return true) @@ -124,16 +135,34 @@ def flush @property_hash.clear - mysql([defaults_file, '-NBe', 'FLUSH PRIVILEGES'].compact) + self.class.mysql_caller('FLUSH PRIVILEGES', 'regular') end mk_resource_methods + def diff_privileges(privileges_old, privileges_new) + diff = { revoke: [], grant: [] } + if privileges_old.include? 'ALL' + diff[:revoke] = privileges_old + diff[:grant] = privileges_new + elsif privileges_new.include? 'ALL' + diff[:grant] = privileges_new + else + diff[:revoke] = privileges_old - privileges_new + diff[:grant] = privileges_new - privileges_old + end + diff + end + def privileges=(privileges) - revoke(@property_hash[:user], @property_hash[:table]) - grant(@property_hash[:user], @property_hash[:table], privileges, @property_hash[:options]) + 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 @property_hash[:privileges] = privileges - self.privileges end @@ -144,5 +173,4 @@ self.options end - end
--- a/modules/mysql/lib/puppet/provider/mysql_plugin/mysql.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/provider/mysql_plugin/mysql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,16 +1,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) -Puppet::Type.type(:mysql_plugin).provide(:mysql, :parent => Puppet::Provider::Mysql) do +Puppet::Type.type(:mysql_plugin).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'Manages MySQL plugins.' - commands :mysql => 'mysql' + commands mysql_raw: 'mysql' def self.instances - mysql([defaults_file, '-NBe', 'show plugins'].compact).split("\n").collect do |line| - name, status, type, library, license = line.split(/\t/) - new(:name => name, - :ensure => :present, - :soname => library - ) + mysql_caller('show plugins', 'regular').split("\n").map do |line| + name, _status, _type, library, _license = line.split(%r{\t}) + new(name: name, + ensure: :present, + soname: library) end end @@ -19,7 +18,7 @@ def self.prefetch(resources) plugins = instances resources.keys.each do |plugin| - if provider = plugins.find { |pl| pl.name == plugin } + if provider = plugins.find { |pl| pl.name == plugin } # rubocop:disable Lint/AssignmentInCondition resources[plugin].provider = provider end end @@ -28,17 +27,17 @@ 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]) - mysql([defaults_file, '-NBe', "install plugin #{@resource[:name]} soname '#{soname}'"].compact) + @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 + @property_hash[:ensure] = :present @property_hash[:soname] = @resource[:soname] exists? ? (return true) : (return false) end def destroy - mysql([defaults_file, '-NBe', "uninstall plugin #{@resource[:name]}"].compact) + self.class.mysql_caller("uninstall plugin #{@resource[:name]}", 'regular') @property_hash.clear exists? ? (return false) : (return true) @@ -49,5 +48,4 @@ end mk_resource_methods - end
--- a/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,30 +1,41 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql')) -Puppet::Type.type(:mysql_user).provide(:mysql, :parent => Puppet::Provider::Mysql) do - +Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) do desc 'manage users for a mysql database.' - commands :mysql => 'mysql' + commands mysql_raw: 'mysql' # Build a property_hash containing all the discovered information about MySQL # users. def self.instances - users = mysql([defaults_file, '-NBe', - "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"].compact).split("\n") + users = mysql_caller("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').split("\n") # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. - users.collect do |name| - query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" + 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') || + # https://jira.mariadb.org/browse/MDEV-16238 https://jira.mariadb.org/browse/MDEV-16774 + (newer_than('mariadb' => '10.2.16') && older_than('mariadb' => '10.2.19')) || + (newer_than('mariadb' => '10.3.8') && older_than('mariadb' => '10.3.11')) + 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}'" + 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, @password, @plugin = mysql([defaults_file, "-NBe", query].compact).split(/\s/) - - new(:name => name, - :ensure => :present, - :password_hash => @password, - :plugin => @plugin, - :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 - ) + @max_updates_per_hour, ssl_type, ssl_cipher, x509_issuer, x509_subject, + @password, @plugin = mysql_caller(query, 'regular').split(%r{\s}) + @tls_options = parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject) + # rubocop:enable Metrics/LineLength + new(name: name, + ensure: :present, + password_hash: @password, + plugin: @plugin, + 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, + tls_options: @tls_options) end end @@ -32,45 +43,78 @@ # the contents of the property_hash generated by self.instances def self.prefetch(resources) users = instances + # rubocop:disable Lint/AssignmentInCondition resources.keys.each do |name| if provider = users.find { |user| user.name == name } resources[name].provider = provider end end + # rubocop:enable Lint/AssignmentInCondition end def create - merged_name = @resource[:name].sub('@', "'@'") + # (MODULES-3539) Allow @ in username + merged_name = @resource[:name].reverse.sub('@', "'@'").reverse password_hash = @resource.value(:password_hash) plugin = @resource.value(:plugin) max_user_connections = @resource.value(:max_user_connections) || 0 max_connections_per_hour = @resource.value(:max_connections_per_hour) || 0 max_queries_per_hour = @resource.value(:max_queries_per_hour) || 0 max_updates_per_hour = @resource.value(:max_updates_per_hour) || 0 + tls_options = @resource.value(:tls_options) || ['NONE'] # 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? - mysql([defaults_file, '-e', "CREATE USER '#{merged_name}' IDENTIFIED WITH '#{plugin}'"].compact) + if !password_hash.nil? + self.class.mysql_caller("CREATE USER '#{merged_name}' IDENTIFIED WITH '#{plugin}' AS '#{password_hash}'", 'system') + else + self.class.mysql_caller("CREATE USER '#{merged_name}' IDENTIFIED WITH '#{plugin}'", 'system') + end @property_hash[:ensure] = :present @property_hash[:plugin] = plugin + elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.1.3') + self.class.mysql_caller("CREATE USER IF NOT EXISTS '#{merged_name}' IDENTIFIED WITH 'mysql_native_password' AS '#{password_hash}'", 'system') + @property_hash[:ensure] = :present + @property_hash[:password_hash] = password_hash else - mysql([defaults_file, '-e', "CREATE USER '#{merged_name}' IDENTIFIED BY PASSWORD '#{password_hash}'"].compact) + self.class.mysql_caller("CREATE USER '#{merged_name}' IDENTIFIED BY PASSWORD '#{password_hash}'", 'system') @property_hash[:ensure] = :present @property_hash[:password_hash] = password_hash end - mysql([defaults_file, '-e', "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}"].compact) + # rubocop:disable Metrics/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 @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 @property_hash[:max_updates_per_hour] = max_updates_per_hour + merged_tls_options = tls_options.join(' AND ') + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + self.class.mysql_caller("ALTER USER '#{merged_name}' REQUIRE #{merged_tls_options}", 'system') + else + self.class.mysql_caller("GRANT USAGE ON *.* TO '#{merged_name}' REQUIRE #{merged_tls_options}", 'system') + end + @property_hash[:tls_options] = tls_options + exists? ? (return true) : (return false) end def destroy - merged_name = @resource[:name].sub('@', "'@'") - mysql([defaults_file, '-e', "DROP USER '#{merged_name}'"].compact) + # (MODULES-3539) Allow @ in username + merged_name = @resource[:name].reverse.sub('@', "'@'").reverse + if_exists = if newer_than('mysql' => '5.7', 'percona' => '5.7', 'mariadb' => '10.1.3') + 'IF EXISTS ' + else + '' + end + + self.class.mysql_caller("DROP USER #{if_exists}'#{merged_name}'", 'system') @property_hash.clear exists? ? (return false) : (return true) @@ -89,37 +133,91 @@ def password_hash=(string) merged_name = self.class.cmd_user(@resource[:name]) - mysql([defaults_file, '-e', "SET PASSWORD FOR #{merged_name} = '#{string}'"].compact) - password_hash == string ? (return true) : (return false) + # 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{^\*|^$} + self.class.mysql_caller("ALTER USER #{merged_name} IDENTIFIED WITH mysql_native_password AS '#{string}'", 'system') + else + self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system') + end + + (password_hash == string) ? (return true) : (return false) end def max_user_connections=(int) merged_name = self.class.cmd_user(@resource[:name]) - mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_USER_CONNECTIONS #{int}"].compact).chomp + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_USER_CONNECTIONS #{int}", 'system').chomp - max_user_connections == int ? (return true) : (return false) + (max_user_connections == int) ? (return true) : (return false) end def max_connections_per_hour=(int) merged_name = self.class.cmd_user(@resource[:name]) - mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}"].compact).chomp + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}", 'system').chomp - max_connections_per_hour == int ? (return true) : (return false) + (max_connections_per_hour == int) ? (return true) : (return false) end def max_queries_per_hour=(int) merged_name = self.class.cmd_user(@resource[:name]) - mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}"].compact).chomp + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}", 'system').chomp - max_queries_per_hour == int ? (return true) : (return false) + (max_queries_per_hour == int) ? (return true) : (return false) end def max_updates_per_hour=(int) merged_name = self.class.cmd_user(@resource[:name]) - mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}"].compact).chomp + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}", 'system').chomp + + (max_updates_per_hour == int) ? (return true) : (return false) + end + + def plugin=(string) + merged_name = self.class.cmd_user(@resource[:name]) - max_updates_per_hour == int ? (return true) : (return false) + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') + sql = "ALTER USER #{merged_name} IDENTIFIED WITH '#{string}'" + 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]}'" + end + + self.class.mysql_caller(sql, 'system') + (plugin == string) ? (return true) : (return false) end + def tls_options=(array) + merged_name = self.class.cmd_user(@resource[:name]) + merged_tls_options = array.join(' AND ') + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') + self.class.mysql_caller("ALTER USER #{merged_name} REQUIRE #{merged_tls_options}", 'system') + else + self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} REQUIRE #{merged_tls_options}", 'system') + end + + (tls_options == array) ? (return true) : (return false) + end + + def self.parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject) + if ssl_type == 'ANY' + ['SSL'] + elsif ssl_type == 'X509' + ['X509'] + elsif ssl_type == '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 + else + ['NONE'] + end + end end
--- a/modules/mysql/lib/puppet/type/mysql_database.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/type/mysql_database.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,24 +1,29 @@ Puppet::Type.newtype(:mysql_database) do - @doc = 'Manage MySQL databases.' + @doc = <<-PUPPET + @summary + Manage a MySQL database. + + @api private + PUPPET ensurable autorequire(:file) { '/root/.my.cnf' } + autorequire(:class) { 'mysql::server' } - newparam(:name, :namevar => true) do + newparam(:name, namevar: true) do desc 'The name of the MySQL database to manage.' end newproperty(:charset) do desc 'The CHARACTER SET setting for the database' defaultto :utf8 - newvalue(/^\S+$/) + newvalue(%r{^\S+$}) end newproperty(:collate) do desc 'The COLLATE setting for the database' defaultto :utf8_general_ci - newvalue(/^\S+$/) + newvalue(%r{^\S+$}) end - end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/lib/puppet/type/mysql_datadir.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,39 @@ +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 + + ensurable + + autorequire(:package) { 'mysql-server' } + + newparam(:datadir, namevar: true) do + desc 'The datadir name' + end + + newparam(:basedir) do + desc 'The basedir name, default /usr.' + newvalues(%r{^/}) + end + + newparam(:user) do + desc 'The user for the directory default mysql (name, not uid).' + end + + newparam(:defaults_extra_file) do + desc 'MySQL defaults-extra-file with absolute path (*.cnf).' + newvalues(%r{^/.*\.cnf$}) + end + + newparam(:insecure, boolean: true) do + desc 'Insecure initialization (needed for 5.7.6++).' + end + + newparam(:log_error) do + desc 'The path to the mysqld error log file (used with the --log-error option)' + newvalues(%r{^/}) + end +end
--- a/modules/mysql/lib/puppet/type/mysql_grant.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/type/mysql_grant.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,6 +1,8 @@ -# This has to be a separate type to enable collecting Puppet::Type.newtype(:mysql_grant) do - @doc = "Manage a MySQL user's rights." + @doc = <<-PUPPET + @summary + Manage a MySQL user's rights. + PUPPET ensurable autorequire(:file) { '/root/.my.cnf' } @@ -12,31 +14,35 @@ # '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 and Array(self[:privileges]).count > 1 and self[:privileges].to_s.include?('ALL') + if self[:ensure] == :present && Array(self[:privileges]).count > 1 && self[:privileges].to_s.include?('ALL') self[:privileges] = 'ALL' end # 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. - self[:privileges] = Array(self[:privileges]).map{ |priv| - # split and sort the column_privileges in the parentheses and rejoin - if priv.include?('(') - type, col=priv.strip.split(/\s+|\b/,2) - type.upcase + " (" + col.slice(1...-1).strip.split(/\s*,\s*/).sort.join(', ') + ")" - else - priv.strip.upcase - end - }.uniq.reject{|k| k == 'GRANT' or k == 'GRANT OPTION'}.sort! + # rubocop:disable Style/MultilineBlockChain + self[:privileges] = Array(self[:privileges]).map { |priv| + # 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(', ') + ')' + else + priv.strip.upcase + end + }.uniq.reject { |k| k == 'GRANT' || k == 'GRANT OPTION' }.sort! + end + # rubocop:enable Style/MultilineBlockChain + validate do + 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]).count > 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? + if self[:user] && self[:table] + raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}" + end end - validate do - fail('privileges parameter is required.') if self[:ensure] == :present and self[:privileges].nil? - fail('table parameter is required.') if self[:ensure] == :present and self[:table].nil? - fail('user parameter is required.') if self[:ensure] == :present and self[:user].nil? - fail('name must match user and table parameters') if self[:name] != "#{self[:user]}/#{self[:table]}" - end - - newparam(:name, :namevar => true) do + newparam(:name, namevar: true) do desc 'Name to describe the grant.' munge do |value| @@ -44,18 +50,31 @@ end end - newproperty(:privileges, :array_matching => :all) do + newproperty(:privileges, array_matching: :all) do desc 'Privileges for user' + + 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, _('mysql_grant: PROXY user not supported on mysql versions < 5.5.0. Current version %{version}.') % { version: mysql_version }) + end + end end newproperty(:table) do desc 'Table to apply privileges to.' - munge do |value| - value.delete("`") + validate do |value| + 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 - newvalues(/.*\..*/,/@/) + munge do |value| + value.delete('`') + end + + newvalues(%r{.*\..*}, %r{^[0-9a-zA-Z$_]*@[\w%\.:\-/]*$}) end newproperty(:user) do @@ -63,27 +82,38 @@ validate do |value| # http://dev.mysql.com/doc/refman/5.5/en/identifiers.html # If at least one special char is used, string must be quoted - # http://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions/8057827#8057827 - if matches = /^(['`"])((?!\1).)*\1@([\w%\.:\-]+)/.match(value) + # rubocop:disable Lint/AssignmentInCondition + # rubocop:disable Lint/UselessAssignment + if matches = %r{^(['`"])((?!\1).)*\1@([\w%\.:\-/]+)$}.match(value) user_part = matches[2] host_part = matches[3] - elsif matches = /^([0-9a-zA-Z$_]*)@([\w%\.:\-]+)/.match(value) + elsif matches = %r{^([0-9a-zA-Z$_]*)@([\w%\.:\-/]+)$}.match(value) user_part = matches[1] host_part = matches[2] - elsif matches = /^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$/.match(value) + elsif matches = %r{^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$}.match(value) user_part = matches[1] host_part = matches[2] else - raise(ArgumentError, "Invalid database 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_grant: 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_grant: 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_grant: 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 + end + end - raise(ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters') unless user_part.size <= 16 + munge do |value| + matches = %r{^((['`"]?).*\2)@(.+)$}.match(value) + "#{matches[1]}@#{matches[3].downcase}" end end - newproperty(:options, :array_matching => :all) do + newproperty(:options, array_matching: :all) do desc 'Options to grant.' end - end
--- a/modules/mysql/lib/puppet/type/mysql_plugin.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/type/mysql_plugin.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,17 +1,25 @@ Puppet::Type.newtype(:mysql_plugin) do - @doc = 'Manage MySQL plugins.' + @doc = <<-PUPPET + @summary + Manage MySQL plugins. + + @example + mysql_plugin { 'some_plugin': + soname => 'some_pluginlib.so', + } + + PUPPET ensurable autorequire(:file) { '/root/.my.cnf' } - newparam(:name, :namevar => true) do + newparam(:name, namevar: true) do desc 'The name of the MySQL plugin to manage.' end newproperty(:soname) do desc 'The name of the library' - newvalue(/^\w+\.\w+$/) + newvalue(%r{^\w+\.\w+$}) end - end
--- a/modules/mysql/lib/puppet/type/mysql_user.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/lib/puppet/type/mysql_user.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,68 +1,118 @@ # This has to be a separate type to enable collecting Puppet::Type.newtype(:mysql_user) do - @doc = 'Manage a MySQL user. This includes management of users password as well as privileges.' + @doc = <<-PUPPET + @summary + Manage a MySQL user. This includes management of users password as well as privileges. + PUPPET ensurable autorequire(:file) { '/root/.my.cnf' } + autorequire(:class) { 'mysql::server' } - newparam(:name, :namevar => true) do + newparam(:name, namevar: true) do desc "The name of the user. This uses the 'username@hostname' or username@hostname." validate do |value| # http://dev.mysql.com/doc/refman/5.5/en/identifiers.html # If at least one special char is used, string must be quoted - # http://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions/8057827#8057827 - if matches = /^(['`"])((?:(?!\1).)*)\1@([\w%\.:\-]+)/.match(value) + mysql_version = Facter.value(:mysql_version) + # rubocop:disable Lint/AssignmentInCondition + # rubocop:disable Lint/UselessAssignment + if matches = %r{^(['`"])((?:(?!\1).)*)\1@([\w%\.:\-/]+)$}.match(value) user_part = matches[2] host_part = matches[3] - elsif matches = /^([0-9a-zA-Z$_]*)@([\w%\.:\-]+)/.match(value) + elsif matches = %r{^([0-9a-zA-Z$_]*)@([\w%\.:\-/]+)$}.match(value) user_part = matches[1] host_part = matches[2] - elsif matches = /^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$/.match(value) + elsif matches = %r{^((?!['`"]).*[^0-9a-zA-Z$_].*)@(.+)$}.match(value) user_part = matches[1] host_part = matches[2] else - raise(ArgumentError, "Invalid database user #{value}") + raise ArgumentError, _('Invalid database user %{user}.') % { user: value } end - - raise(ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters') if user_part.size > 16 + # 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 + end end munge do |value| - matches = /^((['`"]?).*\2)@([\w%\.:\-]+)/.match(value) + matches = %r{^((['`"]?).*\2)@(.+)$}.match(value) "#{matches[1]}@#{matches[3].downcase}" end end newproperty(:password_hash) do desc 'The password hash of the user. Use mysql_password() for creating such a hash.' - newvalue(/\w*/) + newvalue(%r{\w*}) + + def change_to_s(currentvalue, _newvalue) + (currentvalue == :absent) ? 'created password' : 'changed password' + end + + # rubocop:disable Style/PredicateName + def is_to_s(_currentvalue) + '[old password hash redacted]' + end + # rubocop:enable Style/PredicateName + + def should_to_s(_newvalue) + '[new password hash redacted]' + end end newproperty(:plugin) do desc 'The authentication plugin of the user.' - newvalue(/\w+/) + newvalue(%r{\w+}) end newproperty(:max_user_connections) do - desc "Max concurrent connections for the user. 0 means no (or global) limit." - newvalue(/\d+/) + desc 'Max concurrent connections for the user. 0 means no (or global) limit.' + newvalue(%r{\d+}) end newproperty(:max_connections_per_hour) do - desc "Max connections per hour for the user. 0 means no (or global) limit." - newvalue(/\d+/) + desc 'Max connections per hour for the user. 0 means no (or global) limit.' + newvalue(%r{\d+}) end newproperty(:max_queries_per_hour) do - desc "Max queries per hour for the user. 0 means no (or global) limit." - newvalue(/\d+/) + desc 'Max queries per hour for the user. 0 means no (or global) limit.' + newvalue(%r{\d+}) end newproperty(:max_updates_per_hour) do - desc "Max updates per hour for the user. 0 means no (or global) limit." - newvalue(/\d+/) + desc 'Max updates per hour for the user. 0 means no (or global) limit.' + newvalue(%r{\d+}) end + newproperty(:tls_options, array_matching: :all) do + desc 'Options to that set the TLS-related REQUIRE attributes for the user.' + 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 + else + value.each do |opt| + o = opt.match(%r{^(CIPHER|ISSUER|SUBJECT)}i) + raise(ArgumentError, _('Invalid tls option %{option}.') % { option: o }) unless o + end + end + end + def insync?(is) + # 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 + else + is == @should + end + end + end end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/locales/config.yaml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,26 @@ +--- +# 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 <project_name>.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 + # <project_name> + 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' +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/locales/ja/puppetlabs-mysql.po Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,190 @@ +# +#, 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 <ai-kojima@to-in.co.jp>, 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}"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/locales/puppetlabs-mysql.pot Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,176 @@ +"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 <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\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 ""
--- a/modules/mysql/manifests/backup/mysqlbackup.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/backup/mysqlbackup.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,27 +1,37 @@ -# See README.me for usage. +# @summary +# Manage the mysqlbackup client. +# +# @api private +# class mysql::backup::mysqlbackup ( - $backupuser, - $backuppassword, - $backupdir, - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = 'root', - $backupcompress = true, - $backuprotate = 30, - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $ensure = 'present', - $time = ['23', '5'], - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', -) { + $backupuser = '', + $backuppassword = '', + $maxallowedpacket = '1M', + $backupdir = '', + $backupdirmode = '0700', + $backupdirowner = 'root', + $backupdirgroup = $mysql::params::root_group, + $backupcompress = true, + $backuprotate = 30, + $backupmethod = '', + $backup_success_file_path = undef, + $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 = [], +) inherits mysql::params { mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql_password($backuppassword), - provider => 'mysql', + password_hash => mysql::password($backuppassword), require => Class['mysql::server::root_password'], } @@ -54,13 +64,27 @@ require => Mysql_user["${backupuser}@localhost"], } + if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '5' { + package {'crontabs': + ensure => present, + } + } elsif $::osfamily == 'RedHat' { + package {'cronie': + ensure => present, + } + } elsif $::osfamily != 'FreeBSD' { + package {'cron': + ensure => present, + } + } + cron { 'mysqlbackup-weekly': ensure => $ensure, command => 'mysqlbackup backup', user => 'root', hour => $time[0], minute => $time[1], - weekday => 0, + weekday => '0', require => Package['meb'], } @@ -70,7 +94,7 @@ user => 'root', hour => $time[0], minute => $time[1], - weekday => 1-6, + weekday => '1-6', require => Package['meb'], } @@ -84,7 +108,7 @@ 'password' => $backuppassword, } } - $options = mysql_deepmerge($default_options, $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', @@ -92,12 +116,10 @@ mode => '0600', } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, } - }
--- a/modules/mysql/manifests/backup/mysqldump.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/backup/mysqldump.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,45 +1,86 @@ -# See README.me for usage. +# @summary +# "Provider" for mysqldump +# @api private +# class mysql::backup::mysqldump ( - $backupuser, - $backuppassword, - $backupdir, - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = 'root', - $backupcompress = true, - $backuprotate = 30, - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $ensure = 'present', - $time = ['23', '5'], - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', -) { + $backupuser = '', + $backuppassword = '', + $backupdir = '', + $maxallowedpacket = '1M', + $backupdirmode = '0700', + $backupdirowner = 'root', + $backupdirgroup = $mysql::params::root_group, + $backupcompress = true, + $backuprotate = 30, + $backupmethod = 'mysqldump', + $backup_success_file_path = undef, + $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 = [], + $mysqlbackupdir_ensure = 'directory', + $mysqlbackupdir_target = undef, +) inherits mysql::params { + + unless $::osfamily == 'FreeBSD' { + if $backupcompress { + ensure_packages(['bzip2']) + Package['bzip2'] -> File['mysqlbackup.sh'] + } + } mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql_password($backuppassword), - provider => 'mysql', + password_hash => mysql::password($backuppassword), require => Class['mysql::server::root_password'], } + if $include_triggers { + $privs = [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS', 'TRIGGER' ] + } else { + $privs = [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS' ] + } + mysql_grant { "${backupuser}@localhost/*.*": ensure => $ensure, user => "${backupuser}@localhost", table => '*.*', - privileges => [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS' ], + privileges => $privs, require => Mysql_user["${backupuser}@localhost"], } + if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '5' { + package {'crontabs': + ensure => present, + } + } elsif $::osfamily == 'RedHat' { + package {'cronie': + ensure => present, + } + } elsif $::osfamily != 'FreeBSD' { + package {'cron': + ensure => present, + } + } + 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'], } file { 'mysqlbackup.sh': @@ -47,16 +88,25 @@ path => '/usr/local/sbin/mysqlbackup.sh', mode => '0700', owner => 'root', - group => 'root', + group => $mysql::params::root_group, 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, + } } }
--- a/modules/mysql/manifests/backup/xtrabackup.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/backup/xtrabackup.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,59 +1,101 @@ -# See README.me for usage. +# @summary +# "Provider" for Percona XtraBackup/MariaBackup +# @api private +# class mysql::backup::xtrabackup ( - $backupuser, - $backuppassword, - $backupdir, - $backupmethod = 'mysqldump', - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = 'root', - $backupcompress = true, - $backuprotate = 30, - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $ensure = 'present', - $time = ['23', '5'], - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', -) { + $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, + $backupscript_template = 'mysql/xtrabackup.sh.erb', + $backup_success_file_path = undef, + $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', + $incremental_backups = true +) inherits mysql::params { - mysql_user { "${backupuser}@localhost": - ensure => $ensure, - password_hash => mysql_password($backuppassword), - provider => 'mysql', - require => Class['mysql::server::root_password'], + ensure_packages($xtrabackup_package_name) + + if $backupuser and $backuppassword { + mysql_user { "${backupuser}@localhost": + ensure => $ensure, + password_hash => mysql::password($backuppassword), + require => Class['mysql::server::root_password'], + } + + mysql_grant { "${backupuser}@localhost/*.*": + ensure => $ensure, + user => "${backupuser}@localhost", + table => '*.*', + privileges => [ 'RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT' ], + require => Mysql_user["${backupuser}@localhost"], + } } - package{ 'percona-xtrabackup': - ensure => $ensure, + if $incremental_backups { + 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], + } } - cron { 'xtrabackup-weekly': + + $daily_cron_data = ($incremental_backups) ? { + true => { + 'directories' => "--incremental-basedir=${backupdir} --target-dir=${backupdir}/$(date +\\%F_\\%H-\\%M-\\%S)", + 'weekday' => '1-6', + }, + false => { + 'directories' => "--target-dir=${backupdir}", + 'weekday' => '*', + }, + } + + cron { 'xtrabackup-daily': ensure => $ensure, - command => 'innobackupex $backupdir', + command => "/usr/local/sbin/xtrabackup.sh ${daily_cron_data['directories']} ${additional_cron_args}", user => 'root', hour => $time[0], minute => $time[1], - weekday => 0, - require => Package['percona-xtrabackup'], - } - cron { 'xtrabackup-daily': - ensure => $ensure, - command => 'innobackupex --incremental $backupdir', - user => 'root', - hour => $time[0], - minute => $time[1], - weekday => 1-6, - require => Package['percona-xtrabackup'], + weekday => $daily_cron_data['weekday'], + require => Package[$xtrabackup_package_name], } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, } + file { 'xtrabackup.sh': + ensure => $ensure, + path => '/usr/local/sbin/xtrabackup.sh', + mode => '0700', + owner => 'root', + group => $mysql::params::root_group, + content => template($backupscript_template), + } }
--- a/modules/mysql/manifests/bindings.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,72 @@ -# See README.md. +# @summary +# Parent class for MySQL bindings. +# +# @example Install Ruby language bindings +# class { 'mysql::bindings': +# ruby_enable => true, +# ruby_package_ensure => 'present', +# ruby_package_name => 'ruby-mysql-2.7.1-1mdv2007.0.sparc.rpm', +# ruby_package_provider => 'rpm', +# } +# @param install_options +# 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). +# @param java_enable +# Specifies whether `::mysql::bindings::java` should be included. Valid values are `true`, `false`. +# @param perl_enable +# Specifies whether `mysql::bindings::perl` should be included. Valid values are `true`, `false`. +# @param php_enable +# Specifies whether `mysql::bindings::php` should be included. Valid values are `true`, `false`. +# @param python_enable +# Specifies whether `mysql::bindings::python` should be included. Valid values are `true`, `false`. +# @param ruby_enable +# Specifies whether `mysql::bindings::ruby` should be included. Valid values are `true`, `false`. +# @param client_dev +# Specifies whether `::mysql::bindings::client_dev` should be included. Valid values are `true`', `false`. +# @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`. +# @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`. +# @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`. +# @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`. +# @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`. +# @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`. +# @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`. +# @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, # Boolean to determine if we should include the classes. @@ -35,11 +103,17 @@ case $::osfamily { 'Archlinux': { - if $java_enable { fail("::mysql::bindings::java cannot be managed by puppet on ${::osfamily} as it is not in official repositories. Please disable java mysql binding.") } + 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("::mysql::bindings::php does not need to be managed by puppet on ${::osfamily} as it is included in mysql package by default.") } + 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("::mysql::bindings::ruby cannot be managed by puppet on ${::osfamily} as it is not in official repositories. Please disable ruby mysql binding.") } + 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 } )) } } default: {
--- a/modules/mysql/manifests/bindings/client_dev.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/client_dev.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing client development bindings +# +# @api private +# class mysql::bindings::client_dev { if $mysql::bindings::client_dev_package_name { @@ -9,7 +13,7 @@ provider => $mysql::bindings::client_dev_package_provider, } } else { - warning("No MySQL client development package configured for ${::operatingsystem}.") + warning(translate('No MySQL client development package configured for %{os}.', {'os' => $::operatingsystem })) } }
--- a/modules/mysql/manifests/bindings/daemon_dev.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/daemon_dev.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing daemon development bindings +# +# @api private +# class mysql::bindings::daemon_dev { if $mysql::bindings::daemon_dev_package_name { @@ -9,7 +13,7 @@ provider => $mysql::bindings::daemon_dev_package_provider, } } else { - warning("No MySQL daemon development package configured for ${::operatingsystem}.") + warning(translate('No MySQL daemon development package configured for %{os}.', {'os' => $::operatingsystem })) } }
--- a/modules/mysql/manifests/bindings/java.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/java.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing java language bindings. +# +# @api private +# class mysql::bindings::java { package { 'mysql-connector-java':
--- a/modules/mysql/manifests/bindings/perl.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/perl.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing perl language bindings. +# +# @api private +# class mysql::bindings::perl { package{ 'perl_mysql':
--- a/modules/mysql/manifests/bindings/php.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/php.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class: See README.md +# @summary +# Private class for installing php language bindings +# +# @api private +# class mysql::bindings::php { package { 'php-mysql':
--- a/modules/mysql/manifests/bindings/python.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/python.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing python language bindings +# +# @api private +# class mysql::bindings::python { package { 'python-mysqldb':
--- a/modules/mysql/manifests/bindings/ruby.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/bindings/ruby.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing ruby language bindings +# +# @api private +# class mysql::bindings::ruby { package{ 'ruby_mysql':
--- a/modules/mysql/manifests/client.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/client.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,3 +1,23 @@ +# @summary +# Installs and configures the MySQL client. +# +# @example Install the MySQL client +# class {'::mysql::client': +# package_name => 'mysql-client', +# package_ensure => 'present', +# bindings_enable => true, +# } +# +# @param bindings_enable +# Whether to automatically install all bindings. Valid values are `true`, `false`. Default to `false`. +# @param install_options +# Array of install options for managed package resources. You must pass the appropriate options for the package manager. +# @param package_ensure +# Whether the MySQL package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# @param package_manage +# Whether to manage the MySQL client package. Defaults to `true`. +# @param package_name +# The name of the MySQL client package to install. # class mysql::client ( $bindings_enable = $mysql::params::bindings_enable, @@ -19,11 +39,9 @@ } } - # Anchor pattern workaround to avoid resources of mysql::client::install to # "float off" outside mysql::client - anchor { 'mysql::client::start': } -> - Class['mysql::client::install'] -> - anchor { 'mysql::client::end': } - + anchor { 'mysql::client::start': } + -> Class['mysql::client::install'] + -> anchor { 'mysql::client::end': } }
--- a/modules/mysql/manifests/client/install.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/client/install.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,3 +1,8 @@ +# @summary +# Private class for MySQL client install. +# +# @api private +# class mysql::client::install { if $mysql::client::package_manage {
--- a/modules/mysql/manifests/db.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/db.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,48 +1,80 @@ -# See README.md for details. +# @summary +# Create and configure a MySQL database. +# +# @example Create a database +# mysql::db { 'mydb': +# user => 'myuser', +# password => 'mypass', +# host => 'localhost', +# grant => ['SELECT', 'UPDATE'], +# } +# +# @param user +# The user for the database you're creating. +# @param password +# The password for $user for the database you're creating. +# @param tls_options +# The tls_options for $user for the database you're creating. +# @param dbname +# The name of the database to create. +# @param charset +# The character set for the database. +# @param collate +# The collation for the database. +# @param host +# The host to use as part of user@host for grants. +# @param grant +# The privileges to be granted for user@host on the database. +# @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. +# @param enforce_sql +# Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. +# @param ensure +# Specifies whether to create the database. Valid values are 'present', 'absent'. Defaults to 'present'. +# @param import_timeout +# 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. +# define mysql::db ( $user, $password, - $dbname = $name, - $charset = 'utf8', - $collate = 'utf8_general_ci', - $host = 'localhost', - $grant = 'ALL', - $sql = undef, - $enforce_sql = false, - $ensure = 'present', - $import_timeout = 300, + $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, ) { - #input validation - validate_re($ensure, '^(present|absent)$', - "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.") + $table = "${dbname}.*" - if !(is_array($sql) or is_string($sql)) { - fail('$sql must be either a string or an array.') - } - $sql_inputs = join([$sql], ' ') include '::mysql::client' - anchor{"mysql::db_${name}::begin": }-> - Class['::mysql::client']-> - anchor{"mysql::db_${name}::end": } - $db_resource = { ensure => $ensure, charset => $charset, collate => $collate, provider => 'mysql', - require => [ Class['mysql::server'], Class['mysql::client'] ], + require => [ Class['mysql::client'] ], } ensure_resource('mysql_database', $dbname, $db_resource) $user_resource = { ensure => $ensure, - password_hash => mysql_password($password), - provider => 'mysql', - require => Class['mysql::server'], + password_hash => mysql::password($password), + tls_options => $tls_options, } ensure_resource('mysql_user', "${user}@${host}", $user_resource) @@ -52,18 +84,22 @@ provider => 'mysql', user => "${user}@${host}", table => $table, - require => [Mysql_database[$dbname], Mysql_user["${user}@${host}"], Class['mysql::server'] ], + options => $grant_options, + require => [ + Mysql_database[$dbname], + Mysql_user["${user}@${host}"], + ], } $refresh = ! $enforce_sql if $sql { exec{ "${dbname}-import": - command => "cat ${sql_inputs} | mysql ${dbname}", + command => "${import_cat_cmd} ${sql_inputs} | mysql ${dbname}", logoutput => true, environment => "HOME=${::root_home}", refreshonly => $refresh, - path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin', + 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,
--- a/modules/mysql/manifests/params.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/params.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,11 +1,15 @@ -# Private class: See README.md. +# @summary +# Params class. +# +# @api private +# class mysql::params { $manage_config_file = true - $old_root_password = '' $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 @@ -14,6 +18,9 @@ $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 $java_package_ensure = 'present' @@ -30,6 +37,7 @@ $client_dev_package_provider = undef $daemon_dev_package_ensure = 'present' $daemon_dev_package_provider = undef + $xtrabackup_package_name = 'percona-xtrabackup' case $::osfamily { @@ -41,6 +49,7 @@ } else { $provider = 'mysql' } + $python_package_name = 'MySQL-python' } /^(RedHat|CentOS|Scientific|OracleLinux)$/: { if versioncmp($::operatingsystemmajrelease, '7') >= 0 { @@ -48,6 +57,13 @@ } else { $provider = 'mysql' } + if versioncmp($::operatingsystemmajrelease, '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' + } } default: { $provider = 'mysql' @@ -55,48 +71,56 @@ } if $provider == 'mariadb' { - $client_package_name = 'mariadb' - $server_package_name = 'mariadb-server' - $server_service_name = 'mariadb' - $log_error = '/var/log/mariadb/mariadb.log' - $config_file = '/etc/my.cnf.d/server.cnf' + $client_package_name = 'mariadb' + $server_package_name = 'mariadb-server' + $server_service_name = 'mariadb' + $log_error = '/var/log/mariadb/mariadb.log' + $config_file = '/etc/my.cnf.d/server.cnf' # mariadb package by default has !includedir set in my.cnf to /etc/my.cnf.d - $includedir = undef - $pidfile = '/var/run/mariadb/mariadb.pid' + $includedir = undef + $pidfile = '/var/run/mariadb/mariadb.pid' + $daemon_dev_package_name = 'mariadb-devel' } else { - $client_package_name = 'mysql' - $server_package_name = 'mysql-server' - $server_service_name = 'mysqld' - $log_error = '/var/log/mysqld.log' - $config_file = '/etc/my.cnf' - $includedir = '/etc/my.cnf.d' - $pidfile = '/var/run/mysqld/mysqld.pid' + $client_package_name = 'mysql' + $server_package_name = 'mysql-server' + $server_service_name = 'mysqld' + $log_error = '/var/log/mysqld.log' + $config_file = '/etc/my.cnf' + $includedir = '/etc/my.cnf.d' + $pidfile = '/var/run/mysqld/mysqld.pid' + $daemon_dev_package_name = 'mysql-devel' } $basedir = '/usr' $datadir = '/var/lib/mysql' $root_group = 'root' + $mysql_group = 'mysql' $socket = '/var/lib/mysql/mysql.sock' $ssl_ca = '/etc/mysql/cacert.pem' $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' # mysql::bindings - $java_package_name = 'mysql-connector-java' $perl_package_name = 'perl-DBD-MySQL' $php_package_name = 'php-mysql' - $python_package_name = 'MySQL-python' $ruby_package_name = 'ruby-mysql' $client_dev_package_name = undef - $daemon_dev_package_name = 'mysql-devel' } 'Suse': { case $::operatingsystem { 'OpenSuSE': { - $client_package_name = 'mysql-community-server-client' - $server_package_name = 'mysql-community-server' - $basedir = '/usr' + 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' + } } 'SLES','SLED': { if versioncmp($::operatingsystemrelease, '12') >= 0 { @@ -110,7 +134,8 @@ } } default: { - fail("Unsupported platform: puppetlabs-${module_name} currently doesn't support ${::operatingsystem}") + fail(translate('Unsupported platform: puppetlabs-%{module_name} currently doesn\'t support %{os}.', + {'module_name' => $module_name, 'os' => $::operatingsystem })) } } $config_file = '/etc/my.cnf' @@ -125,11 +150,19 @@ /(SLES|SLED)/ => '/var/lib/mysql/mysqld.pid', } $root_group = 'root' + $mysql_group = 'mysql' $server_service_name = 'mysql' - $socket = $::operatingsystem ? { - /OpenSuSE/ => '/var/run/mysql/mysql.sock', - /(SLES|SLED)/ => '/var/lib/mysql/mysql.sock', + + 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' } + $ssl_ca = '/etc/mysql/cacert.pem' $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' @@ -148,8 +181,24 @@ } 'Debian': { - $client_package_name = 'mysql-client' - $server_package_name = 'mysql-server' + if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 { + $provider = 'mariadb' + } else { + $provider = 'mysql' + } + if $provider == 'mariadb' { + $client_package_name = 'mariadb-client' + $server_package_name = 'mariadb-server' + $server_service_name = 'mariadb' + $client_dev_package_name = 'libmariadbclient-dev' + $daemon_dev_package_name = 'libmariadbd-dev' + } else { + $client_package_name = 'mysql-client' + $server_package_name = 'mysql-server' + $server_service_name = 'mysql' + $client_dev_package_name = 'libmysqlclient-dev' + $daemon_dev_package_name = 'libmysqld-dev' + } $basedir = '/usr' $config_file = '/etc/mysql/my.cnf' @@ -158,51 +207,68 @@ $log_error = '/var/log/mysql/error.log' $pidfile = '/var/run/mysqld/mysqld.pid' $root_group = 'root' - $server_service_name = 'mysql' + $mysql_group = 'adm' $socket = '/var/run/mysqld/mysqld.sock' $ssl_ca = '/etc/mysql/cacert.pem' $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' $tmpdir = '/tmp' # mysql::bindings - $java_package_name = 'libmysql-java' + if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '10') >= 0 { + $java_package_name = 'libmariadb-java' + } else { + $java_package_name = 'libmysql-java' + } $perl_package_name = 'libdbd-mysql-perl' - $php_package_name = 'php5-mysql' + if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') >= 0) or + ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) { + $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', + 'buster' => 'ruby-mysql2', 'trusty' => 'ruby-mysql', - 'jessie' => 'ruby-mysql', + 'xenial' => 'ruby-mysql', + 'bionic' => 'ruby-mysql2', default => 'libmysql-ruby', } - $client_dev_package_name = 'libmysqlclient-dev' - $daemon_dev_package_name = 'libmysqld-dev' } 'Archlinux': { - $client_package_name = 'mariadb-clients' - $server_package_name = 'mariadb' - $basedir = '/usr' - $config_file = '/etc/mysql/my.cnf' - $datadir = '/var/lib/mysql' - $log_error = '/var/log/mysqld.log' - $pidfile = '/var/run/mysqld/mysqld.pid' - $root_group = 'root' - $server_service_name = 'mysqld' - $socket = '/var/lib/mysql/mysql.sock' - $ssl_ca = '/etc/mysql/cacert.pem' - $ssl_cert = '/etc/mysql/server-cert.pem' - $ssl_key = '/etc/mysql/server-key.pem' - $tmpdir = '/tmp' + $daemon_dev_package_name = undef + $client_dev_package_name = undef + $includedir = undef + $client_package_name = 'mariadb-clients' + $server_package_name = 'mariadb' + $basedir = '/usr' + $config_file = '/etc/mysql/my.cnf' + $datadir = '/var/lib/mysql' + $log_error = '/var/log/mysqld.log' + $pidfile = '/var/run/mysqld/mysqld.pid' + $root_group = 'root' + $mysql_group = 'mysql' + $server_service_name = 'mysqld' + $socket = '/var/lib/mysql/mysql.sock' + $ssl_ca = '/etc/mysql/cacert.pem' + $ssl_cert = '/etc/mysql/server-cert.pem' + $ssl_key = '/etc/mysql/server-key.pem' + $tmpdir = '/tmp' # mysql::bindings - $java_package_name = 'mysql-connector-java' - $perl_package_name = 'perl-dbd-mysql' - $php_package_name = undef - $python_package_name = 'mysql-python' - $ruby_package_name = 'mysql-ruby' + $java_package_name = 'mysql-connector-java' + $perl_package_name = 'perl-dbd-mysql' + $php_package_name = undef + $python_package_name = 'mysql-python' + $ruby_package_name = 'mysql-ruby' } 'Gentoo': { $client_package_name = 'virtual/mysql' + $includedir = undef $server_package_name = 'virtual/mysql' $basedir = '/usr' $config_file = '/etc/mysql/my.cnf' @@ -210,6 +276,7 @@ $log_error = '/var/log/mysql/mysqld.err' $pidfile = '/run/mysqld/mysqld.pid' $root_group = 'root' + $mysql_group = 'mysql' $server_service_name = 'mysql' $socket = '/run/mysqld/mysqld.sock' $ssl_ca = '/etc/mysql/cacert.pem' @@ -225,17 +292,18 @@ } 'FreeBSD': { - $client_package_name = 'databases/mysql55-client' - $server_package_name = 'databases/mysql55-server' + $client_package_name = 'databases/mysql56-client' + $server_package_name = 'databases/mysql56-server' $basedir = '/usr/local' - $config_file = '/var/db/mysql/my.cnf' - $includedir = '/var/db/mysql/my.cnf.d' + $config_file = '/usr/local/etc/my.cnf' + $includedir = '/usr/local/etc/my.cnf.d' $datadir = '/var/db/mysql' - $log_error = "/var/db/mysql/${::hostname}.err" - $pidfile = '/var/db/mysql/mysql.pid' + $log_error = '/var/log/mysqld.log' + $pidfile = '/var/run/mysql.pid' $root_group = 'wheel' + $mysql_group = 'mysql' $server_service_name = 'mysql-server' - $socket = '/tmp/mysql.sock' + $socket = '/var/db/mysql/mysql.sock' $ssl_ca = undef $ssl_cert = undef $ssl_key = undef @@ -251,8 +319,86 @@ $daemon_dev_package_name = undef } + 'OpenBSD': { + $client_package_name = 'mariadb-client' + $server_package_name = 'mariadb-server' + $basedir = '/usr/local' + $config_file = '/etc/my.cnf' + $includedir = undef + $datadir = '/var/mysql' + $log_error = "/var/mysql/${::hostname}.err" + $pidfile = '/var/mysql/mysql.pid' + $root_group = 'wheel' + $mysql_group = '_mysql' + $server_service_name = 'mysqld' + $socket = '/var/run/mysql/mysql.sock' + $ssl_ca = undef + $ssl_cert = undef + $ssl_key = undef + $tmpdir = '/tmp' + # mysql::bindings + $java_package_name = undef + $perl_package_name = 'p5-DBD-mysql' + $php_package_name = 'php-mysql' + $python_package_name = 'py-mysql' + $ruby_package_name = 'ruby-mysql' + # 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 + } + + '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 { + 'Alpine': { + $client_package_name = 'mariadb-client' + $server_package_name = 'mariadb' + $basedir = '/usr' + $config_file = '/etc/mysql/my.cnf' + $datadir = '/var/lib/mysql' + $log_error = '/var/log/mysqld.log' + $pidfile = '/run/mysqld/mysqld.pid' + $root_group = 'root' + $mysql_group = 'mysql' + $server_service_name = 'mariadb' + $socket = '/run/mysqld/mysqld.sock' + $ssl_ca = '/etc/mysql/cacert.pem' + $ssl_cert = '/etc/mysql/server-cert.pem' + $ssl_key = '/etc/mysql/server-key.pem' + $tmpdir = '/tmp' + $java_package_name = undef + $perl_package_name = 'perl-dbd-mysql' + $php_package_name = 'php7-mysqlnd' + $python_package_name = 'py-mysqldb' + $ruby_package_name = undef + $client_dev_package_name = undef + $daemon_dev_package_name = undef + } 'Amazon': { $client_package_name = 'mysql' $server_package_name = 'mysql-server' @@ -263,6 +409,7 @@ $log_error = '/var/log/mysqld.log' $pidfile = '/var/run/mysqld/mysqld.pid' $root_group = 'root' + $mysql_group = 'mysql' $server_service_name = 'mysqld' $socket = '/var/lib/mysql/mysql.sock' $ssl_ca = '/etc/mysql/cacert.pem' @@ -281,7 +428,8 @@ } default: { - fail("Unsupported platform: puppetlabs-${module_name} currently doesn't support ${::osfamily} or ${::operatingsystem}") + fail(translate('Unsupported platform: puppetlabs-%{module_name} currently doesn\'t support %{osfamily} or %{os}.', + {'module_name' => $module_name, 'os' => $::operatingsystem, 'osfamily' => $::osfamily})) } } } @@ -289,7 +437,16 @@ case $::operatingsystem { 'Ubuntu': { - $server_service_provider = upstart + # lint:ignore:only_variable_string + if versioncmp("${::operatingsystemmajrelease}", '14.10') > 0 { + # lint:endignore + $server_service_provider = 'systemd' + } else { + $server_service_provider = 'upstart' + } + } + 'Alpine': { + $server_service_provider = 'rc-service' } default: { $server_service_provider = undef @@ -306,6 +463,27 @@ 'log-error' => $mysql::params::log_error, 'socket' => $mysql::params::socket, }, + 'mysqld-5.0' => { + 'myisam-recover' => 'BACKUP', + }, + 'mysqld-5.1' => { + 'myisam-recover' => 'BACKUP', + }, + 'mysqld-5.5' => { + 'myisam-recover' => 'BACKUP', + 'query_cache_limit' => '1M', + 'query_cache_size' => '16M', + }, + 'mysqld-5.6' => { + 'myisam-recover-options' => 'BACKUP', + 'query_cache_limit' => '1M', + 'query_cache_size' => '16M', + }, + 'mysqld-5.7' => { + 'myisam-recover-options' => 'BACKUP', + 'query_cache_limit' => '1M', + 'query_cache_size' => '16M', + }, 'mysqld' => { 'basedir' => $mysql::params::basedir, 'bind-address' => '127.0.0.1', @@ -316,11 +494,8 @@ 'max_allowed_packet' => '16M', 'max_binlog_size' => '100M', 'max_connections' => '151', - 'myisam_recover' => 'BACKUP', 'pid-file' => $mysql::params::pidfile, 'port' => '3306', - 'query_cache_limit' => '1M', - 'query_cache_size' => '16M', 'skip-external-locking' => true, 'socket' => $mysql::params::socket, 'ssl' => false, @@ -344,7 +519,7 @@ } ## Additional graceful failures - if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' { - fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 5.0 and beyond") + 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})) } }
--- a/modules/mysql/manifests/server.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,10 +1,75 @@ -# Class: mysql::server: See README.md for documentation. +# @summary +# Installs and configures the MySQL server. +# +# @example Install MySQL Server +# class { '::mysql::server': +# package_name => 'mysql-server', +# package_ensure => '5.7.1+mysql~trusty', +# root_password => 'strongpassword', +# remove_default_accounts => true, +# } +# +# @param config_file +# The location, as a path, of the MySQL configuration file. +# @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 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 +# Whether the package exists or should be a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Defaults to 'present'. +# @param package_manage +# Whether to manage the MySQL server package. Defaults to `true`. +# @param package_name +# The name of the MySQL server package to install. +# @param purge_conf_dir +# Whether the `includedir` directory should be purged. Valid values are `true`, `false`. Defaults to `false`. +# @param remove_default_accounts +# Specifies whether to automatically include `mysql::server::account_security`. Valid values are `true`, `false`. Defaults to `false`. +# @param restart +# 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 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 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. +# @param service_enabled +# Specifies whether the service should be enabled. Valid values are `true`, `false`. Defaults to `true`. +# @param service_manage +# Specifies whether the service should be managed. Valid values are `true`, `false`. Defaults to `true`. +# @param service_name +# The name of the MySQL server service. Defaults are OS dependent, defined in 'params.pp'. +# @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. +# @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. +# @param users +# 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). +# @param databases +# Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). +# @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. +# 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, - $old_root_password = $mysql::params::old_root_password, $override_options = {}, $package_ensure = $mysql::params::server_package_ensure, $package_manage = $mysql::params::server_package_manage, @@ -13,6 +78,7 @@ $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, @@ -20,13 +86,16 @@ $service_provider = $mysql::params::server_service_provider, $create_root_user = $mysql::params::create_root_user, $create_root_my_cnf = $mysql::params::create_root_my_cnf, + $create_root_login_file = $mysql::params::create_root_login_file, + $login_file = $mysql::params::login_file, $users = {}, $grants = {}, $databases = {}, # Deprecated parameters $enabled = undef, - $manage_service = undef + $manage_service = undef, + $old_root_password = undef ) inherits mysql::params { # Deprecated parameters. @@ -42,14 +111,19 @@ } else { $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.')) + } # Create a merged together set of options. Rightmost hashes win over left. - $options = mysql_deepmerge($mysql::params::default_options, $override_options) + $options = mysql::normalise_and_deepmerge($mysql::params::default_options, $override_options) Class['mysql::server::root_password'] -> Mysql::Db <| |> + include '::mysql::server::config' include '::mysql::server::install' - include '::mysql::server::config' + include '::mysql::server::binarylog' + include '::mysql::server::installdb' include '::mysql::server::service' include '::mysql::server::root_password' include '::mysql::server::providers' @@ -64,24 +138,19 @@ anchor { 'mysql::server::end': } if $restart { - Anchor['mysql::server::start'] -> - Class['mysql::server::install'] -> - # Only difference between the blocks is that we use ~> to restart if - # restart is set to true. - Class['mysql::server::config'] ~> - Class['mysql::server::service'] -> - Class['mysql::server::root_password'] -> - Class['mysql::server::providers'] -> - Anchor['mysql::server::end'] - } else { - Anchor['mysql::server::start'] -> - Class['mysql::server::install'] -> - Class['mysql::server::config'] -> - Class['mysql::server::service'] -> - Class['mysql::server::root_password'] -> - Class['mysql::server::providers'] -> - Anchor['mysql::server::end'] + Class['mysql::server::config'] + ~> Class['mysql::server::service'] } + Anchor['mysql::server::start'] + -> Class['mysql::server::config'] + -> Class['mysql::server::install'] + -> Class['mysql::server::binarylog'] + -> Class['mysql::server::installdb'] + -> Class['mysql::server::service'] + -> Class['mysql::server::root_password'] + -> Class['mysql::server::providers'] + -> Anchor['mysql::server::end'] + }
--- a/modules/mysql/manifests/server/account_security.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/account_security.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,3 +1,8 @@ +# @summary +# Private class for ensuring localhost accounts do not exist +# +# @api private +# class mysql::server::account_security { mysql_user { [ 'root@127.0.0.1', @@ -15,7 +20,7 @@ require => Anchor['mysql::server::end'], } } - if ($::fqdn != 'localhost') { + if ($::fqdn and $::fqdn != 'localhost') { mysql_user { [ "root@${::fqdn}", "@${::fqdn}"]:
--- a/modules/mysql/manifests/server/backup.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/backup.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,43 +1,125 @@ -# See README.me for usage. +# @summary +# Create and manage a MySQL backup. +# +# @example Create a basic MySQL backup: +# class { 'mysql::server': +# root_password => 'password' +# } +# class { 'mysql::server::backup': +# backupuser => 'myuser', +# backuppassword => 'mypassword', +# backupdir => '/tmp/backups', +# } +# class { 'mysql::server::backup': +# backupmethod => 'mariabackup', +# provider => 'xtrabackup', +# backupdir => '/tmp/backups', +# } +# +# @param backupuser +# MySQL user with backup administrator privileges. +# @param backuppassword +# Password for `backupuser`. +# @param backupdir +# Directory to store backup. +# @param backupdirmode +# Permissions applied to the backup directory. This parameter is passed directly to the file resource. +# @param backupdirowner +# Owner for the backup directory. This parameter is passed directly to the file resource. +# @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) +# @param backupmethod +# 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. +# @param backupdatabases +# 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 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. +# @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: +# @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.) class mysql::server::backup ( - $backupuser = undef, - $backuppassword = undef, - $backupdir = undef, - $backupdirmode = '0700', - $backupdirowner = 'root', - $backupdirgroup = 'root', - $backupcompress = true, - $backuprotate = 30, - $ignore_events = true, - $delete_before_dump = false, - $backupdatabases = [], - $file_per_database = false, - $ensure = 'present', - $time = ['23', '5'], - $postscript = false, - $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', - $provider = 'mysqldump', -) { + $backupuser = undef, + $backuppassword = undef, + $backupdir = undef, + $backupdirmode = '0700', + $backupdirowner = 'root', + $backupdirgroup = $mysql::params::root_group, + $backupcompress = true, + $backuprotate = 30, + $backupmethod = undef, + $backup_success_file_path = '/tmp/mysqlbackup_success', + $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 = [], +) 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})) + } create_resources('class', { "mysql::backup::${provider}" => { - 'backupuser' => $backupuser, - 'backuppassword' => $backuppassword, - 'backupdir' => $backupdir, - 'backupdirmode' => $backupdirmode, - 'backupdirowner' => $backupdirowner, - 'backupdirgroup' => $backupdirgroup, - 'backupcompress' => $backupcompress, - 'backuprotate' => $backuprotate, - 'ignore_events' => $ignore_events, - 'delete_before_dump' => $delete_before_dump, - 'backupdatabases' => $backupdatabases, - 'file_per_database' => $file_per_database, - 'ensure' => $ensure, - 'time' => $time, - 'postscript' => $postscript, - 'execpath' => $execpath, + '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, } }) - }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/manifests/server/binarylog.pp Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,26 @@ +# @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'], + } + } + } +}
--- a/modules/mysql/manifests/server/config.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/config.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ -# See README.me for options. +# @summary +# Private class for MySQL server configuration. +# +# @api private +# class mysql::server::config { $options = $mysql::server::options @@ -17,35 +21,47 @@ recurse => $mysql::server::purge_conf_dir, purge => $mysql::server::purge_conf_dir, } - } - $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false) - - if $logbin { - $logbindir = mysql_dirname($logbin) - - #Stop puppet from managing directory if just a filename/prefix is specified - if $logbindir != '.' { - file { $logbindir: + # on some systems this is /etc/my.cnf.d, while Debian has /etc/mysql/conf.d and FreeBSD something in /usr/local. For the latter systems, + # managing this basedir is also required, to have it available before the package is installed. + $includeparentdir = dirname($includedir) + if $includeparentdir != '/' and $includeparentdir != '/etc' { + file { $includeparentdir: ensure => directory, mode => '0755', - owner => $options['mysqld']['user'], - group => $options['mysqld']['user'], } } } if $mysql::server::manage_config_file { file { 'mysql-config-file': - path => $mysql::server::config_file, - content => template('mysql/my.cnf.erb'), - mode => '0644', + path => $mysql::server::config_file, + content => template('mysql/my.cnf.erb'), + mode => '0644', + selinux_ignore_defaults => true, + } + + # on mariadb systems, $includedir is not defined, but /etc/my.cnf.d has + # to be managed to place the server.cnf there + $configparentdir = dirname($mysql::server::config_file) + # Before setting $configparentdir we first check to make sure that it's value is valid + if $configparentdir != '/' and $configparentdir != '/etc' { + # 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)) { + file { $configparentdir: + ensure => directory, + mode => '0755', + } + } } } 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' + 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' } } }
--- a/modules/mysql/manifests/server/install.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/install.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,3 +1,7 @@ +# @summary +# Private class for managing MySQL package. +# +# @api private # class mysql::server::install { @@ -8,32 +12,6 @@ install_options => $mysql::server::install_options, name => $mysql::server::package_name, } - - # Build the initial databases. - $mysqluser = $mysql::server::options['mysqld']['user'] - $datadir = $mysql::server::options['mysqld']['datadir'] - $basedir = $mysql::server::options['mysqld']['basedir'] - $config_file = $mysql::server::config_file - - if $mysql::server::manage_config_file { - $install_db_args = "--basedir=${basedir} --defaults-extra-file=${config_file} --datadir=${datadir} --user=${mysqluser}" - } else { - $install_db_args = "--basedir=${basedir} --datadir=${datadir} --user=${mysqluser}" - } - - exec { 'mysql_install_db': - command => "mysql_install_db ${install_db_args}", - creates => "${datadir}/mysql", - logoutput => on_failure, - path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', - require => Package['mysql-server'], - } - - if $mysql::server::restart { - Exec['mysql_install_db'] { - notify => Class['mysql::server::service'], - } - } } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/manifests/server/installdb.pp Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,50 @@ +# @summary +# Builds initial databases on installation. +# +# @api private +# +class mysql::server::installdb { + $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'] + $config_file = $mysql::server::config_file + $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 + } else { + $_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', + before => Mysql_datadir[ $datadir ], + } + } + + mysql_datadir { $datadir: + ensure => 'present', + datadir => $datadir, + basedir => $basedir, + user => $mysqluser, + log_error => $log_error, + defaults_extra_file => $_config_file, + } + + if $mysql::server::restart { + Mysql_datadir[$datadir] { + notify => Class['mysql::server::service'], + } + } + } + +}
--- a/modules/mysql/manifests/server/monitor.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/monitor.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,15 +1,24 @@ -#This is a helper class to add a monitoring user to the database +# @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 + $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), + password_hash => mysql::password($mysql_monitor_password), require => Class['mysql::server::service'], }
--- a/modules/mysql/manifests/server/mysqltuner.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/mysqltuner.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,31 +1,28 @@ +# @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 { - $_version = $source $_source = $source } else { - $_version = $version $_source = "https://github.com/major/MySQLTuner-perl/raw/${version}/mysqltuner.pl" } - - if $ensure == 'present' { - class { 'staging': } - staging::file { "mysqltuner-${_version}": - source => $_source, - } - file { '/usr/local/bin/mysqltuner': - ensure => $ensure, - mode => '0550', - source => "${::staging::path}/mysql/mysqltuner-${_version}", - } - } else { - file { '/usr/local/bin/mysqltuner': - ensure => $ensure, - } + file { $tuner_location: + ensure => $ensure, + mode => '0550', + source => $_source, } }
--- a/modules/mysql/manifests/server/providers.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/providers.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,6 +1,8 @@ -# Convenience class to call each of the three providers with the corresponding -# hashes provided in mysql::server. -# See README.md for details. +# @summary +# Convenience class to call each of the three providers with the corresponding hashes provided in mysql::server. +# +# @api private +# class mysql::server::providers { create_resources('mysql_user', $mysql::server::users) create_resources('mysql_grant', $mysql::server::grants)
--- a/modules/mysql/manifests/server/root_password.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/root_password.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,13 +1,34 @@ +# @summary +# Private class for managing the root password +# +# @api private # class mysql::server::root_password { $options = $mysql::server::options + $secret_file = $mysql::server::install_secret_file + $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' + } # manage root password if it is set if $mysql::server::create_root_user == true and $mysql::server::root_password != 'UNSET' { mysql_user { 'root@localhost': ensure => present, - password_hash => mysql_password($mysql::server::root_password), + password_hash => mysql::password($mysql::server::root_password), + require => Exec['remove install pass'] } } @@ -17,9 +38,21 @@ 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 $mysql::server::create_root_user == true { Mysql_user['root@localhost'] -> File["${::root_home}/.my.cnf"] } } + if $mysql::server::create_root_login_file == true and $mysql::server::root_password != 'UNSET' { + file { "${::root_home}/.mylogin.cnf": + source => $login_file, + owner => 'root', + mode => '0600', + } + } }
--- a/modules/mysql/manifests/server/service.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/manifests/server/service.pp Sun Dec 29 15:31:28 2019 +0000 @@ -1,3 +1,7 @@ +# @summary +# Private class for managing the MySQL service +# +# @api private # class mysql::server::service { $options = $mysql::server::options @@ -8,20 +12,55 @@ } else { $service_ensure = 'stopped' } + } else { + $service_ensure = undef } - file { $options['mysqld']['log-error']: - ensure => present, - owner => 'mysql', - group => 'mysql', + if $mysql::server::override_options and $mysql::server::override_options['mysqld'] + and $mysql::server::override_options['mysqld']['user'] { + $mysqluser = $mysql::server::override_options['mysqld']['user'] + } else { + $mysqluser = $options['mysqld']['user'] } - service { 'mysqld': - ensure => $service_ensure, - name => $mysql::server::service_name, - enable => $mysql::server::real_service_enabled, - provider => $mysql::server::service_provider, - require => [ File['mysql-config-file'], Package['mysql-server'] ] + if $mysql::server::real_service_manage { + service { 'mysqld': + ensure => $service_ensure, + name => $mysql::server::service_name, + enable => $mysql::server::real_service_enabled, + provider => $mysql::server::service_provider, + } + + # only establish ordering between service and package if + # we're managing the package. + if $mysql::server::package_manage { + Service['mysqld'] { + require => Package['mysql-server'], + } + } + + # 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::override_options and $mysql::server::override_options['mysqld'] + and $mysql::server::override_options['mysqld']['socket'] { + $mysqlsocket = $mysql::server::override_options['mysqld']['socket'] + } else { + $mysqlsocket = $options['mysqld']['socket'] + } + + if $service_ensure != 'stopped' { + exec { 'wait_for_mysql_socket_to_open': + command => "test -S ${mysqlsocket}", + unless => "test -S ${mysqlsocket}", + tries => '3', + try_sleep => '10', + require => Service['mysqld'], + path => '/bin:/usr/bin', + } + } } - }
--- a/modules/mysql/metadata.json Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/metadata.json Sun Dec 29 15:31:28 2019 +0000 @@ -1,19 +1,31 @@ { "name": "puppetlabs-mysql", - "version": "3.3.0", - "author": "Puppet Labs", + "version": "10.3.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 < 7.0.0" + }, + { + "name": "puppetlabs/translate", + "version_requirement": ">= 1.0.0 < 3.0.0" + } + ], + "data_provider": null, "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "5", "6", - "7" + "7", + "8" ] }, { @@ -21,7 +33,8 @@ "operatingsystemrelease": [ "5", "6", - "7" + "7", + "8" ] }, { @@ -35,7 +48,6 @@ { "operatingsystem": "Scientific", "operatingsystemrelease": [ - "5", "6", "7" ] @@ -43,40 +55,36 @@ { "operatingsystem": "SLES", "operatingsystemrelease": [ - "10 SP4", - "11 SP1", - "12" + "11", + "12", + "15" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ - "6", - "7" + "8", + "9", + "10" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "10.04", - "12.04", - "14.04" + "14.04", + "16.04", + "18.04" ] } ], "requirements": [ { - "name": "pe", - "version_requirement": "3.x" - }, - { "name": "puppet", - "version_requirement": "3.x" + "version_requirement": ">= 5.5.10 < 7.0.0" } ], - "description": "Mysql module", - "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"}, - {"name":"nanliu/staging","version_requirement":"1.x"} - ] + "description": "MySQL module", + "template-url": "https://github.com/puppetlabs/pdk-templates#master", + "template-ref": "heads/master-0-g643529a", + "pdk-version": "1.14.1" }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/provision.yaml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,22 @@ +--- +default: + provisioner: docker_exp + images: ['waffleimage/centos7'] +travis_deb: + provisioner: docker + images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04'] +travis_el6: + provisioner: docker_exp + images: ['waffleimage/centos6', 'waffleimage/scientificlinux6'] +travis_el7: + provisioner: docker_exp + images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7'] +travis_el8: + provisioner: docker_exp + images: ['litmusimage/centos:8'] +vagrant: + provisioner: vagrant + images: ['centos/7', 'generic/ubuntu1804'] +release_checks: + provisioner: vmpooler + images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-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-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/readmes/README_ja_JP.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,543 @@ +# mysql + +#### 目次 + +1. [説明 - モジュールの機能とその有益性](#module-description) +2. [セットアップ - mysql導入の基本](#setup) + * [mysqlの導入](#beginning-with-mysql) +3. [使用方法 - 設定オプションと追加機能](#usage) + * [サーバオプションのカスタマイズ](#customize-server-options) + * [データベースを作成します](#create-a-database) + * [設定のカスタマイズ](#customize-configuration) + * [既存のサーバに対する操作](#work-with-an-existing-server) + * [パスワードの指定](#specify-passwords) + * [CentOSへのPerconaサーバのインストール](#install-percona-server-on-centos) + * [UbuntuへのMariaDBのインストール](#install-mariadb-on-ubuntu) + * [プラグインのインストール](#install-plugins) +4. [参考 - モジュールの機能と動作について](REFERENCE.md) +5. [制約 - OS互換性など](#limitations) +6. [開発 - モジュール貢献についてのガイド](#development) + +## モジュールの概要 + +mysqlモジュールは、MySQLサービスをインストール、設定、管理します。 + +このモジュールは、MySQLのインストールと設定を管理するとともに、データベース、ユーザ、GRANT権限などのMySQLリソースを管理できるようにPuppetの機能を拡張します。 + +## セットアップ + +### mysqlの導入 + +デフォルトのオプションを使用してサーバをインストールするには、次のコマンドを使用します。 + +`include '::mysql::server'`. + +ルートパスワードや`/etc/my.cnf`の設定値などのオプションをカスタマイズするには、オーバーライドハッシュも渡す必要があります。 + +```puppet +class { '::mysql::server': + root_password => 'strongpassword', + remove_default_accounts => true, + override_options => $override_options +} +``` + +$override_options用のハッシュ構造体の例については、後述の[**サーバオプションのカスタマイズ**](#サーバオプションのカスタマイズ)を参照してください。 + +## 使用 + +サーバに関するすべてのインタラクションは`mysql::server`を使用して行われ、クライアントのインストールには`mysql::client`が、バインディングのインストールには`mysql::bindings`が使用されます。 + +### サーバオプションのカスタマイズ + +サーバオプションを定義するには、`mysql::server`でオーバーライドのハッシュ構造体を作成します。このハッシュは、my.cnfファイルに含まれているハッシュと似ています。 + +```puppet +$override_options = { + 'section' => { + 'item' => 'thing', + } +} +``` + +この形式のオプションを従来の方法で示すと次のようになります。 + +``` +[section] +thing = X +``` + +ハッシュ内では`thing => true`、`thing => value`、または`thing => ""`の形でエントリを作成できます。または、`thing => ['value', 'value2']`の形で配列を渡したり、`thing => value`を独立した行に個別にリストすることもできます。 + +値を設定せずに変数をハッシュに含めて渡すことができます。この場合、変数にはMySQLのデフォルトの設定値が使用されます。オプションを`my.cnf`ファイルから除外するには(たとえば`override_options`を使用してデフォルト値に戻す場合など)、`thing => undef`を渡します。 + +オプションに複数のインスタンスが必要な場合は配列を渡します。たとえば次の例の場合は、 + +```puppet +$override_options = { + 'mysqld' => { + 'replicate-do-db' => ['base1', 'base2'], + } +} +``` + +次のようになります。 + +```puppet +[mysqld] +replicate-do-db = base1 +replicate-do-db = base2 +``` + +バージョンに固有なパラメータを実装するには、[mysqld-5.5]のようにバージョンを指定します。こうすると、1つのconfigで複数の異なるバージョンのMySQLに対応できます。 + +### データベースを作成します + +ユーザおよび割り当てられたいくつかの権限を含むデータベースを作成するには、次のようにします。 + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => 'mypass', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +エクスポートされたリソースを含む別のリソース名を使用するには、次のようにします。 + +```puppet + @@mysql::db { "mydb_${fqdn}": + user => 'myuser', + password => 'mypass', + dbname => 'mydb', + host => ${fqdn}, + grant => ['SELECT', 'UPDATE'], + tag => $domain, +} +``` + +さらに、これをリモートDBサーバに集めることができます。 + +```puppet +Mysql::Db <<| tag == $domain |>> +``` + +データベースの作成時にファイルにsqlパラメータを設定する場合は、新しいデータベースにファイルがインポートされます。 + +サイズの大きいsqlファイルの場合は、`import_timeout`パラメータの値(デフォルト値300秒)を大きくします。 + +MySQLクライアントを標準のbin/sbin以外のパスにインストールしている場合、`mysql_exec_path`にこれを設定します。 + +```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' +} +``` + +### 設定のカスタマイズ + +MySQLカスタム設定を追加するには、`includedir`にファイルを追加します。こうすると設定値をオーバーライドしたり別の設定値を追加したりすることができ、`mysql::server`で`override_options`を使用しない場合に役立ちます。`includedir`の場所は、デフォルトでは`/etc/mysql/conf.d`に設定されます。 + +### 既存のサーバに対する操作 + +既存のMySQLサーバ上にデータベースとユーザのインスタンスを作成するには、`root`のホームディレクトリに`.my.cnf`ファイルが必要です。次の例のように、このファイルでリモートサーバのアドレスと認証情報を指定する必要があります。 + +```puppet +[client] +user=root +host=localhost +password=secret +``` + +このモジュールは、`mysqld_version`ファクトから、使用されているサーバのバージョンを認識します。デフォルトでは、`mysqld_version`は`mysqld -V`の出力に設定されています。リモートMySQLサーバに対する操作を行う場合は、`mysqld_version`に対応するカスタムファクトを設定しないと正常に動作しない可能性があります。 + +リモートサーバに対する操作を行う際には、Puppetマニフェスト内で`mysql::server`クラスを使用*しない*でください。 + +### パスワードの指定 + +パスワードは、プレーンテキストとして渡せるだけでなく、次のようにハッシュとして入力することもできます。 + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +必要に応じて、パスワードも空文字列とし、パスワードなしで接続を許可することができます。 + +### CentOSへのPerconaサーバのインストール + +次の例は、CentOSシステムへのPerconaサーバの最小限のインストール方法を示します。この例では、Perconaサーバ、クライアント、バインディング(PerlとPythonのバインディングを含む)がセットアップされます。この方法をカスタマイズして必要に応じバージョンを更新することができます。 + +この方法は、Puppet 4.4/CentOS 7/Perconaサーバ5.7でテストされています。 + +注意：** yumレポジトリのインストールはこのパッケージには含まれていません。 + +```puppet +yumrepo { 'percona': + descr => 'CentOS $releasever - Percona', + baseurl => 'http://repo.percona.com/centos/$releasever/os/$basearch/', + gpgkey => 'http://www.percona.com/downloads/percona-release/RPM-GPG-KEY-percona', + enabled => 1, + gpgcheck => 1, +} + +class {'mysql::server': + package_name => 'Percona-Server-server-57', + package_ensure => '5.7.11-4.1.el7', + service_name => 'mysql', + config_file => '/etc/my.cnf', + includedir => '/etc/my.cnf.d', + root_password => 'PutYourOwnPwdHere', + override_options => { + mysqld => { + log-error => '/var/log/mysqld.log', + pid-file => '/var/run/mysqld/mysqld.pid', + }, + mysqld_safe => { + log-error => '/var/log/mysqld.log', + }, + } +} + +# 注意：Percona-Server-server-57をインストールするとPercona-Server-client-57もインストールされます。 +# 次の例は、Percona MySQLクライアントを単独でインストールする方法を示します。 +class {'mysql::client': + package_name => 'Percona-Server-client-57', + package_ensure => '5.7.11-4.1.el7', +} + +# 通常、以下のパッケージはPercona-Server-server-57とともにインストールされます。 +# バインディングもインストールする必要がある場合は、このコードでインストールできます。 +class { 'mysql::bindings': + client_dev_package_name => 'Percona-Server-shared-57', + client_dev_package_ensure => '5.7.11-4.1.el7', + client_dev => true, + daemon_dev_package_name => 'Percona-Server-devel-57', + daemon_dev_package_ensure => '5.7.11-4.1.el7', + daemon_dev => true, + perl_enable => true, + perl_package_name => 'perl-DBD-MySQL', + python_enable => true, + python_package_name => 'MySQL-python', +} + +# Dependencies definition +Yumrepo['percona']-> +Class['mysql::server'] + +Yumrepo['percona']-> +Class['mysql::client'] + +Yumrepo['percona']-> +Class['mysql::bindings'] +``` + +### UbuntuへのMariaDBのインストール + +#### オプション：MariaDBの公式のレポジトリのインストール + +次の例では、distroレポジトリでなく公式のMariaDBレポジトリの最新の安定版(現在10.1)を使用しています。代わりに、Ubuntuレポジトリのパッケージを使用することもできます。必要に応じた正しいバージョンのレポジトリを使用してください。 + +**注意：** `sfo1.mirrors.digitalocean.com`は利用可能な多くのミラーの一例であり、公式のミラーであればいずれも使用できます。 + +```puppet +include apt + +apt::source { 'mariadb': + location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu', + release => $::lsbdistcodename, + repos => 'main', + key => { + id => '199369E5404BD5FC7D2FE43BCBCB082A1BB943DB', + server => 'hkp://keyserver.ubuntu.com:80', + }, + include => { + src => false, + deb => true, + }, +} +``` + +#### MariaDBサーバのインストール + +次の例では、Ubuntu TrustyへのMariaDBサーバのインストール方法を示しています。`my.cnf`のバージョンとパラメータは、必要に応じて調整してください。`my.cnf`のパラメータはすべて`override_options`パラメータを使用して定義できます。 + +フォルダ`/var/log/mysql`と`/var/run/mysqld`は自動的に作成されますが、他のカスタムフォルダを使用する場合は、それらがコードの必須要件になります。 + +以下に示す値はすべて、最小限の構成にする場合の例です。 + +必要なパッケージのバージョンを、`package_ensure`パラメータで指定してください。 + +```puppet +class {'::mysql::server': + package_name => 'mariadb-server', + package_ensure => '10.1.14+maria-1~trusty', + service_name => 'mysql', + root_password => 'AVeryStrongPasswordUShouldEncrypt!', + override_options => { + mysqld => { + 'log-error' => '/var/log/mysql/mariadb.log', + 'pid-file' => '/var/run/mysqld/mysqld.pid', + }, + mysqld_safe => { + 'log-error' => '/var/log/mysql/mariadb.log', + }, + } +} + +# 依存関係の管理。レポジトリをインストールする場合はこの例の前のステップで示されている部分だけを使用してください。 +Apt::Source['mariadb'] ~> +Class['apt::update'] -> +Class['::mysql::server'] + +``` + +#### MariaDBクライアントのインストール + +次の例は、MariaDBクライアントとすべてのバインディングを一度にインストールする方法を示します。このインストール操作は、サーバのインストール操作とは別に行うことができます。 + +必要なパッケージのバージョンを、`package_ensure`パラメータで指定してください。 + +```puppet +class {'::mysql::client': + package_name => 'mariadb-client', + package_ensure => '10.1.14+maria-1~trusty', + 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'] +``` + +### CentOSへのMySQL Communityサーバのインストール + +MySQLモジュールおよびHieraを使用して、MySQL CommunityサーバーをCentOSにインストールすることができます。この例は以下のバージョンでテスト済みです。 + +* MySQL Community Server 5.6 +* Centos 7.3 +* Hieraを使用したPuppet 3.8.7 +* puppetlabs-mysqlモジュールv3.9.0 + +Puppetで： + +```puppet +include ::mysql::server + +create_resources(yumrepo, hiera('yumrepo', {})) + +Yumrepo['repo.mysql.com'] -> Anchor['mysql::server::start'] +Yumrepo['repo.mysql.com'] -> Package['mysql_client'] + +create_resources(mysql::db, hiera('mysql::server::db', {})) +``` + +Hieraで： + +```yaml +--- + +# Centos 7.3 +yumrepo: + 'repo.mysql.com': + baseurl: "http://repo.mysql.com/yum/mysql-5.6-community/el/%{::operatingsystemmajrelease}/$basearch/" + descr: 'repo.mysql.com' + enabled: 1 + gpgcheck: true + gpgkey: 'http://repo.mysql.com/RPM-GPG-KEY-mysql' + +mysql::client::package_name: "mysql-community-client" # 適切なMySQL導入のために必要 +mysql::server::package_name: "mysql-community-server" # 適切なMySQL導入のために必要 +mysql::server::package_ensure: 'installed' # ここではバージョンを指定しないでください。残念ながら、パッケージがインストールされているエラーでyumは失敗しました。 +mysql::server::root_password: "change_me_i_am_insecure" +mysql::server::manage_config_file: true +mysql::server::service_name: 'mysqld' # Puppetモジュールに必要 +mysql::server::override_options: + 'mysqld': + 'bind-address': '127.0.0.1' + 'log-error': '/var/log/mysqld.log' # 適切なMySQL導入のために必要 + 'mysqld_safe': + 'log-error': '/var/log/mysqld.log' # 適切なMySQL導入のために必要 + +# データベース+アクセスできるアカウント、暗号化されていないパスワードを作成 +mysql::server::db: + "dev": + user: "dev" + password: "devpass" + host: "127.0.0.1" + grant: + - "ALL" + +``` + +### プラグインのインストール + +プラグインはユーザ定義のタイプ`mysql_plugin` を使用してインストールできます。`examples/mysql_plugin.pp`で、具体的な例を参照してください。 +## リファレンス + +### クラス + +#### パブリッククラス + +* [`mysql::server`](#mysqlserver)：MySQLをインストールして設定します。 +* [`mysql::server::monitor`](#mysqlservermonitor)：モニタするユーザをセットアップします。 +* [`mysql::server::mysqltuner`](#mysqlservermysqltuner)：MySQL tunerスクリプトをインストールします。 +* [`mysql::server::backup`](#mysqlserverbackup)：cronを使用してMySQLバックアップをセットアップします。 +* [`mysql::bindings`](#mysqlbindings)：さまざまなMySQL言語バインディングをインストールします。 +* [`mysql::client`](#mysqlclient)：MySQLクライアントをインストールします(サーバ以外)。 + +#### プライベートクラス + +* `mysql::server::install`：パッケージをインストールします。 +* `mysql::server::installdb`：mysqldデータディレクトリ(/var/lib/mysqlなど)のセットアップを実行します。 +* `mysql::server::config`：MySQLを設定します。 +* `mysql::server::service`：サービスを管理します。 +* `mysql::server::account_security`：デフォルトのMySQLアカウントを削除します。 +* `mysql::server::root_password`：MySQLのルートパスワードを設定します。 +* `mysql::server::providers`：ユーザ、GRANT権限、データベースを作成します。 +* `mysql::bindings::client_dev`：MySQLクライアント開発パッケージをインストールします。 +* `mysql::bindings::daemon_dev`：MySQLデーモン開発パッケージをインストールします。 +* `mysql::bindings::java`：javaバインディングをインストールします。 +* `mysql::bindings::perl`：Perlバインディングをインストールします。 +* `mysql::bindings::php`：PHPバインディングをインストールします。 +* `mysql::bindings::python`：Pythonバインディングをインストールします。 +* `mysql::bindings::ruby`：Rubyバインディングをインストールします。 +* `mysql::client::install`：MySQLクライアントをインストールします。 +* `mysql::backup::mysqldump`：mysqldumpのバックアップを実行します。 +* `mysql::backup::mysqlbackup`：Oracle MySQL Enterprise Backupを使用してバックアップを実行します。 +* `mysql::backup::xtrabackup`：PerconaのXtraBackupを使用してバックアップを実行します。 + +### パラメータ + +#### mysql::server + +##### `create_root_user` + +ルートユーザを作成するかどうかを指定します。 + +有効な値：`true`、`false`。 + +デフォルト値：`true`。 + +このパラメータは、Galeraでクラスタをセットアップする場合に役立ちます。ルートユーザの作成が必要なのは一度だけです。このパラメータを、1つのノードに対しtrueに設定し、他のすべてのノードに対してfalseに設定できます。 + +##### `create_root_my_cnf` + +`/root/.my.cnf`を作成するかどうかを指定します。 + +有効な値：`true`、`false`。 + +デフォルト値：`true`。 + +`create_root_my_cnf`を使用すると`create_root_user`に左右されずに`/root/.my.cnf`を作成できます。すべてのノードに`/root/.my.cnf`が存在するようにしたい場合に、Galeraでこの機能を使用してクラスタをセットアップできます。 + +##### `root_password` + +MySQLのルートパスワード。Puppetは、このパラメータを使用して、ルートパスワードの設定や`/root/.my.cnf`の更新を試みます。 + +`create_root_user`または`create_root_my_cnf`がtrueの場合にこのパラメータが必要です。`root_password`が'UNSET'の場合は`create_root_user`と`create_root_my_cnf`がfalseになります(MySQLルートユーザと`/root/.my.cnf`が作成されません)。 + +パスワード変更はサポートされますが、`/root/.my.cnf`に旧パスワードが設定されている必要があります。実際には、Puppetは`/root/.my.cnf`に設定されている旧パスワードを使用してMySQLで新しいパスワードを設定してから、`/root/.my.cnf`を新しいパスワードで更新します。 + +##### `old_root_password` + +現在、このパラメータでは何も行わず、下位互換性を確保するためだけに存在します。ルートパスワードの変更についての詳細は、上記の`root_password`パラメータの説明を参照してください。 + +##### `create_root_login_file` + +mysql 5.6.6以上を使用するときに、`/root/.mylogin.cnf`を作成するかどうかを指定します。 + +有効な値：`true`、`false`。 + +デフォルト値：`false`。 + +`create_root_login_file`は、既存の`.mylogin.cnf`のコピーを`/root/.mylogin.cnf`に作成します。 + +このオプションを'true'に設定する場合、`login_file`オプションも指定する必要があります。 + +'true'に設定する場合、`login_file`オプションが必要です。 + +#### `login_file` + +`/root/.mylogin.cnf`を規定の位置に配置するかどうかを指定します。 + +`.mylogin.cnf`ファイルの作成には、`mysql_config_editor`を使用する必要があります。このツールは、mysql 5.6.6+に付属しています。 + +作成した.mylogin.cnfファイルは、モジュール内のファイルの下に配置する必要があります。使用法については下記の例を参照してください。 + +`/root/.mylogin.cnf`が存在する場合、環境変数`MYSQL_TEST_LOGIN_FILE`が設定されます。 + +このパラメータは、`create_root_user`と`create_root_login_file`がどちらもtrueである場合に必要です。`root_password`が'UNSET'である場合、`create_root_user`および`create_root_login_file`はfalseであると見なされます。このため、MySQLのrootユーザと`/root/.mylogin.cnf`は作成されません。 + +```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", +} +``` + +##### `override_options` + +MySQLに渡すオーバーライドオプションを指定します。構造はmy.cnfファイルのハッシュと同様です。 + +```puppet +class { 'mysql::server': + root_password => 'password' +} + +mysql_plugin { 'auth_pam': + ensure => present, + soname => 'auth_pam.so', +} + +``` + +### タスク + +MySQLモジュールにはサンプルタスクがあり、ユーザはデータベースに対して任意のSQLを実行できます。[Puppet Enterpriseマニュアル](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html)または[Boltマニュアル](https://puppet.com/docs/bolt/latest/bolt.html)で、タスクを実行する方法に関する情報を参照してください。 + +## 制約事項 + +サポートされているオペレーティングシステムの一覧については、[metadata.json](https://github.com/puppetlabs/puppetlabs-mysql/blob/master/metadata.json)を参照してください。 + +**注意：** mysqlbackup.shは、MySQL 5.7以降では動作せず、サポートされていません。 + +## 開発 + +Puppet Forge上のPuppetモジュールはオープンプロジェクトであり、その価値を維持するにはコミュニティからの貢献が欠かせません。Puppetが提供する膨大な数のプラットフォームや、無数のハードウェア、ソフトウェア、デプロイ設定に弊社がアクセスすることは不可能です。 + +弊社は、できるだけ変更に貢献しやすくして、弊社のモジュールがユーザの環境で機能する状態を維持したいと考えています。弊社では、状況を把握できるよう、貢献者に従っていただくべきいくつかのガイドラインを設けています。 + +弊社の詳細な[モジュール貢献についてのガイドライン](https://docs.puppetlabs.com/forge/contributing.html)をご確認ください。 + +### 作成者 + +このモジュールは、David Schmittが作成したものをベースにして、以下の作成者による貢献内容が加えられています(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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/readmes/REFERENCE_ja_JP.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,1269 @@ +# リファレンス +<!-- DO NOT EDIT: This document was generated by Puppet Strings --> + +## 目次 + +**クラス** + +_パブリッククラス_ + +* [`mysql::bindings`](#mysqlbindings): MySQLバインディングの親クラス。 +* [`mysql::client`](#mysqlclient): MySQLクライアントをインストールして設定します。 +* [`mysql::server`](#mysqlserver): MySQLサーバをインストールして設定します。 +* [`mysql::server::backup`](#mysqlserverbackup): MySQLバックアップを作成して管理します。 +* [`mysql::server::monitor`](#mysqlservermonitor): モニタするユーザをデータベースに追加するヘルパクラスです。 +* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): MySQLTunerパッケージを管理します。 + +_プライベートクラス_ + +* `mysql::backup::mysqlbackup`: mysqlbackupクライアントを管理します。 +* `mysql::backup::mysqldump`: mysqldumpの"プロバイダ" +* `mysql::backup::xtrabackup`: Percona XtraBackupの"プロバイダ" +* `mysql::bindings::client_dev`: クライアント開発バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::daemon_dev`: デーモン開発バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::java`: java言語バインディングのインストールに使用するプライベートクラス。 +* `mysql::bindings::perl`: perl言語バインディングのインストールに使用するプライベートクラス。 +* `mysql::bindings::php`: php言語バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::python`: python言語バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::ruby`: ruby言語バインディングのインストールに使用するプライベートクラス +* `mysql::client::install`: MySQLクライアントのインストールに使用するプライベートクラス。 +* `mysql::params`: Paramsクラス。 +* `mysql::server::account_security`: localhostアカウントが存在しないことを確認するためのプライベートクラス +* `mysql::server::binarylog`: バイナリログの設定では、mysqlユーザが必要です。パッケージのインストール後に行ってください +* `mysql::server::config`: MySQLサーバの設定に使用するプライベートクラス。 +* `mysql::server::install`: MySQLパッケージの管理に使用するプライベートクラス。 +* `mysql::server::installdb`: インストール時に初期データベースを構築します。 +* `mysql::server::providers`: mysel::serverで指定された、対応するハッシュを使って3つのプロバイダを呼び出すためのコンビニエンスクラス。 +* `mysql::server::root_password`: ルートパスワードの管理に使用するプライベートクラス +* `mysql::server::service`: MySQLサービスの管理に使用するプライベートクラス + +**定義された型** + +* [`mysql::db`](#mysqldb): MySQLデータベースを作成して設定します。 + +**リソース型** + +_パブリックリソース型_ + +* [`mysql_plugin`](#mysql_plugin): MySQLプラグインを管理します。 + +_プライベートリソース型_ + +* `mysql_database`: MySQLデータベースを管理します。 +* `mysql_datadir`: mysql_install_dbまたはmysqld (5.7.6以上)を使用してMySQL datadirsを管理します。 +* `mysql_grant`: MySQLのユーザ権限を管理します。 +* `mysql_user`: MySQLユーザを管理します。これには、ユーザパスワードおよび権限の管理が含まれます。 + +**関数** + +* [`mysql::password`](#mysqlpassword): mysqlの"PASSWORD()"関数のように、文字列にハッシュをかけます +* [`mysql::strip_hash`](#mysqlstrip_hash): ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 +* [`mysql_password`](#mysql_password): 4.xの関数'mysql::password'のラッパーとして、 + 3.xの関数'mysql_password'とのギャップを埋めます。 +* [`mysql_password`](#mysql_password): mysqlの"PASSWORD()"関数のように、文字列にハッシュをかけます +* [`mysql_strip_hash`](#mysql_strip_hash): 4.xの関数'mysql::strip_hash'のラッパーとして、 + 3.xの関数'mysql_strip_hash'とのギャップを埋めます。 +* [`mysql_strip_hash`](#mysql_strip_hash): TEMPORARY FUNCTION: EXPIRES 2014-03-10 ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +**タスク** + +* [`export`](#export): ローカルファイルにデータベースのバックアップを作成できます。 +* [`sql`](#sql): 任意のSQLを実行できます + +## クラス + +### mysql::bindings + +MySQLバインディングの親クラス。 + +#### 例 + +##### Ruby言語バインディングをインストールします + +```puppet +class { 'mysql::bindings': + ruby_enable => true, + ruby_package_ensure => 'present', + ruby_package_name => 'ruby-mysql-2.7.1-1mdv2007.0.sparc.rpm', + ruby_package_provider => 'rpm', +} +``` + +#### パラメータ + +`mysql::bindings`クラスでは、以下のパラメータを使用できます。 + +##### `install_options` + +データ型: `Any` + +管理対象のパッケージリソースに`install_options`を渡します。パッケージマネージャに対応する[正しいオプション](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options)を渡す必要があります。 + +デフォルト値: `undef` + +##### `java_enable` + +データ型: `Any` + +`::mysql::bindings::java`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `perl_enable` + +データ型: `Any` + +`mysql::bindings::perl`を含めるかどうかを指定します。有効な値: `true`、false`。 + +デフォルト値: `false` + +##### `php_enable` + +データ型: `Any` + +`mysql::bindings::php`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `python_enable` + +データ型: `Any` + +`mysql::bindings::python`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `ruby_enable` + +データ型: `Any` + +`mysql::bindings::ruby`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `client_dev` + +データ型: `Any` + +`::mysql::bindings::client_dev`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `daemon_dev` + +データ型: `Any` + +`::mysql::bindings::daemon_dev`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `java_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`java_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::java_package_ensure + +##### `java_package_name` + +データ型: `Any` + +インストールするJavaパッケージの名前。適用されるのは`java_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::java_package_name + +##### `java_package_provider` + +データ型: `Any` + +Javaパッケージのインストールに使用するプロバイダ。適用されるのは`java_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::java_package_provider + +##### `perl_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`perl_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::perl_package_ensure + +##### `perl_package_name` + +データ型: `Any` + +インストールするPerlパッケージの名前。適用されるのは`perl_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::perl_package_name + +##### `perl_package_provider` + +データ型: `Any` + +Perlパッケージのインストールに使用するプロバイダ。適用されるのは`perl_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::perl_package_provider + +##### `php_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`php_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::php_package_ensure + +##### `php_package_name` + +データ型: `Any` + +インストールするPHPパッケージの名前。適用されるのは`php_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::php_package_name + +##### `php_package_provider` + +データ型: `Any` + +PHPパッケージのインストールに使用するプロバイダ。適用されるのは`php_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::php_package_provider + +##### `python_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`python_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::python_package_ensure + +##### `python_package_name` + +データ型: `Any` + +インストールするPythonパッケージの名前。適用されるのは`python_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::python_package_name + +##### `python_package_provider` + +データ型: `Any` + +Pythonパッケージのインストールに使用するプロバイダ。適用されるのは`python_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::python_package_provider + +##### `ruby_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`ruby_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::ruby_package_ensure + +##### `ruby_package_name` + +データ型: `Any` + +インストールするRubyパッケージの名前。適用されるのは`ruby_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::ruby_package_name + +##### `ruby_package_provider` + +データ型: `Any` + +Rubyパッケージのインストールに使用するプロバイダ。 + +デフォルト値: $mysql::params::ruby_package_provider + +##### `client_dev_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`client_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::client_dev_package_ensure + +##### `client_dev_package_name` + +データ型: `Any` + +インストールするclient_devパッケージの名前。適用されるのは`client_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::client_dev_package_name + +##### `client_dev_package_provider` + +データ型: `Any` + +client_devパッケージのインストールに使用するプロバイダ。適用されるのは`client_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::client_dev_package_provider + +##### `daemon_dev_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`daemon_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::daemon_dev_package_ensure + +##### `daemon_dev_package_name` + +データ型: `Any` + +インストールするdaemon_devパッケージの名前。適用されるのは`daemon_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::daemon_dev_package_name + +##### `daemon_dev_package_provider` + +データ型: `Any` + +daemon_devパッケージのインストールに使用するプロバイダ。適用されるのは`daemon_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::daemon_dev_package_provider + +### mysql::client + +MySQLクライアントをインストールして設定します。 + +#### 例 + +##### MySQLクライアントをインストールします + +```puppet +class {'::mysql::client': + package_name => 'mysql-client', + package_ensure => 'present', + bindings_enable => true, +} +``` + +#### パラメータ + +`mysql::client`クラスでは、以下のパラメータを使用できます。 + +##### `bindings_enable` + +データ型: `Any` + +すべてのバインディングを自動的にインストールするかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: $mysql::params::bindings_enable + +##### `install_options` + +データ型: `Any` + +管理対象のパッケージリソースに関するインストールオプションの配列。パッケージマネージャに対応する正しいオプションを渡す必要があります。 + +デフォルト値: `undef` + +##### `package_ensure` + +データ型: `Any` + +MySQLパッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。 + +デフォルト値: $mysql::params::client_package_ensure + +##### `package_manage` + +データ型: `Any` + +MySQLクライアントパッケージを管理するかどうかを指定します。デフォルト値: `true`。 + +デフォルト値: $mysql::params::client_package_manage + +##### `package_name` + +データ型: `Any` + +インストールするMySQLクライアントパッケージの名前。 + +デフォルト値: $mysql::params::client_package_name + +### mysql::server + +MySQLサーバーをインストールして設定します。 + +#### 例 + +##### MySQLサーバをインストールします + +```puppet +class { '::mysql::server': + package_name => 'mysql-server', + package_ensure => '5.7.1+mysql~trusty', + root_password => 'strongpassword', + remove_default_accounts => true, +} +``` + +#### パラメータ + +`mysql::server`クラスでは、以下のパラメータを使用できます。 + +##### `config_file` + +データ型: `Any` + +MySQL設定ファイルの場所を示すパス。 + +デフォルト値: $mysql::params::config_file + +##### `includedir` + +データ型: `Any` + +カスタム設定オーバーライド用の!includedirの場所を示すパス。 + +デフォルト値: $mysql::params::includedir + +##### `install_options` + +データ型: `Any` + +管理対象のパッケージリソースに[install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options)配列を渡します。指定されているパッケージマネージャに対応する正しいオプションを渡す必要があります。 + +デフォルト値: `undef` + +##### `install_secret_file` + +データ型: `Any` + +一時的なルートパスワードを含むシークレットファイルへのパス。 + +デフォルト値: $mysql::params::install_secret_file + +##### `manage_config_file` + +データ型: `Any` + +MySQLの設定ファイルを管理するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。 + +デフォルト値: $mysql::params::manage_config_file + +##### `override_options` + +データ型: `Any` + +MySQLに渡すオーバーライドオプションを指定します。構造はmy.cnfファイルのハッシュと同様です。詳しい使用方法については、上記を参照してください。 + +デフォルト値: {} + +##### `package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。デフォルト値: 'present'。 + +デフォルト値: $mysql::params::server_package_ensure + +##### `package_manage` + +データ型: `Any` + +MySQLサーバパッケージを管理するかどうかを指定します。デフォルト値: `true`。 + +デフォルト値: $mysql::params::server_package_manage + +##### `package_name` + +データ型: `Any` + +インストールするMySQLサーバパッケージの名前。 + +デフォルト値: $mysql::params::server_package_name + +##### `purge_conf_dir` + +データ型: `Any` + +`includedir`ディレクトリをパージするかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: $mysql::params::purge_conf_dir + +##### `remove_default_accounts` + +データ型: `Any` + +`mysql::server::account_security`を自動的に含めるかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: `false` + +##### `restart` + +データ型: `Any` + +何らかの変化があった場合にサービスを再起動するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: $mysql::params::restart + +##### `root_group` + +データ型: `Any` + +ルートに使用するグループの名前。グループ名またはグループIDのいずれかです。詳細については[group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group)を参照してください。 + +デフォルト値: $mysql::params::root_group + +##### `mysql_group` + +データ型: `Any` + +MySQLデーモンユーザのグループの名前、グループ名またはグループIDのいずれかです。詳細については[group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group)を参照してください。 + +デフォルト値: $mysql::params::mysql_group + +##### `root_password` + +データ型: `Any` + +MySQLのルートパスワード。Puppetは、このパラメータを使用して、ルートパスワードの設定や`/root/.my.cnf`の更新を試みます。`create_root_user`または`create_root_my_cnf`がtrueの場合にこのパラメータが必要です。`root_password`が'UNSET'の場合は`create_root_user`と`create_root_my_cnf`はfalseになります(MySQLルートユーザと`/root/.my.cnf`は作成されません)。パスワード変更はサポートされますが、`/root/.my.cnf`に旧パスワードが設定されている必要があります。実際には、Puppetは`/root/my.cnf`に設定されている旧パスワードを使用してMySQLで新しいパスワードを設定してから、`/root/.my.cnf`を新しいパスワードで更新します。 + +デフォルト値: $mysql::params::root_password + +##### `service_enabled` + +データ型: `Any` + +サービスを有効化するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。 + +デフォルト値: $mysql::params::server_service_enabled + +##### `service_manage` + +データ型: `Any` + +サービスを管理するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。 + +デフォルト値: $mysql::params::server_service_manage + +##### `service_name` + +データ型: `Any` + +MySQLサーバサービスの名前。デフォルト値はOSにより異なり、'params.pp'に定義されています。 + +デフォルト値: $mysql::params::server_service_name + +##### `service_provider` + +データ型: `Any` + +サービスの管理に使用するプロバイダ。Ubuntuの場合のデフォルト値は'upstart'、Ubuntu以外の場合のデフォルト値は定義されていません。 + +デフォルト値: $mysql::params::server_service_provider + +##### `create_root_user` + +データ型: `Any` + +ルートユーザを作成するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。このパラメータは、Galeraでクラスタをセットアップする場合に役立ちます。ルートユーザの作成が必要なのは一度だけです。このパラメータを、1つのノードに対しtrueに設定し、他のすべてのノードに対してfalseに設定できます。 + +デフォルト値: $mysql::params::create_root_user + +##### `create_root_my_cnf` + +データ型: `Any` + +`/root/.my.cnf`を作成するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。`create_root_my_cnf`を使用すると`create_root_user`に左右されずに`/root/.my.cnf`を作成できます。すべてのノードに`/root/.my.cnf`が存在するようにした場合に、Galeraでこの機能を使用してクラスタをセットアップできます。 + +デフォルト値: $mysql::params::create_root_my_cnf + +##### `users` + +データ型: `Any` + +作成するユーザのハッシュ(オプション)。[mysql_user](#mysql_user)に渡されます。 + +デフォルト値: {} + +##### `grants` + +データ型: `Any` + +[mysql_grant](#mysql_grant)に渡されるGRANT権限のハッシュ(オプション)。 + +デフォルト値: {} + +##### `databases` + +データ型: `Any` + +作成されるデータベースのハッシュ(オプション)。[mysql_database](#mysql_database)に渡されます。 + +デフォルト値: {} + +##### `enabled` + +データ型: `Any` + +_Deprecated_ + +デフォルト値: `undef` + +##### `manage_service` + +データ型: `Any` + +_Deprecated_ + +デフォルト値: `undef` + +##### `old_root_password` + +データ型: `Any` + +現在、このパラメータでは何も行わず、下位互換性を確保するためだけに存在します。ルートパスワードの変更についての詳細は、上記の`root_password`パラメータの説明を参照してください。 + +デフォルト値: `undef` + +##### `create_root_login_file` + +データ型: `Any` + + + +デフォルト値: $mysql::params::create_root_login_file + +##### `login_file` + +データ型: `Any` + + + +デフォルト値: $mysql::params::login_file + +### mysql::server::backup + +MySQLバックアップを作成し、管理します。 + +#### 例 + +##### 基本的なMySQLバックアップを作成します: + +```puppet +class { 'mysql::server': + root_password => 'password' +} +class { 'mysql::server::backup': + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', +} +``` + +#### パラメータ + +`mysql::server::backup`クラスでは、以下のパラメータを使用できます。 + +##### `backupuser` + +データ型: `Any` + +バックアップ管理者権限を持つMySQLユーザ。 + +デフォルト値: `undef` + +##### `backuppassword` + +データ型: `Any` + +`backupuser`のパスワード。 + +デフォルト値: `undef` + +##### `backupdir` + +データ型: `Any` + +バックアップを保存するディレクトリ。 + +デフォルト値: `undef` + +##### `backupdirmode` + +データ型: `Any` + +バックアップディレクトリに適用されるパーミッション。このパラメータはfileリソースに直接渡されます。 + +デフォルト値: '0700' + +##### `backupdirowner` + +データ型: `Any` + +バックアップディレクトリの所有者。このパラメータはfileリソースに直接渡されます。 + +デフォルト値: 'root' + +##### `backupdirgroup` + +データ型: `Any` + +バックアップディレクトリのグループ所有者。このパラメータはfileリソースに直接渡されます。 + +デフォルト値: 'root' + +##### `backupcompress` + +データ型: `Any` + +バックアップを圧縮するかどうかを指定します(mysqldumpプロバイダを使用する場合)。 + +デフォルト値: `true` + +##### `backuprotate` + +データ型: `Any` + +バックアップの回転間隔(24時間形式)。 + +デフォルト値: 30 + +##### `ignore_events` + +データ型: `Any` + +mysql.eventテーブルを無視します。 + +デフォルト値: `true` + +##### `delete_before_dump` + +データ型: `Any` + +バックアップ前に古い.sqlファイルを削除するかどうかを設定します。trueに設定すると古いファイルがバックアップ前に削除され、falseに設定するとバックアップ後に削除されます。 + +デフォルト値: `false` + +##### `backupdatabases` + +データ型: `Any` + +バックアップするデータベース(xtrabackupプロバイダを使用する場合)。 + +デフォルト値: [] + +##### `file_per_database` + +データ型: `Any` + +データベースバックアップごとにファイルを1つ作成する、file per databaseモードを使用します。 + +デフォルト値: `false` + +##### `include_routines` + +データ型: `Any` + +`file_per_database`バックアップを実行する際に、ダンプされたデータベースから保存済みのルーチン(プロシージャと関数)をダンプします。 + +デフォルト値: `false` + +##### `include_triggers` + +データ型: `Any` + +`file_per_database`バックアップを実行する際に、ダンプされた各テーブルのトリガをダンプします。 + +デフォルト値: `false` + +##### `ensure` + +データ型: `Any` + + + +デフォルト値: 'present' + +##### `time` + +データ型: `Any` + +バックアップ時刻を設定する2つの要素の配列。時刻をHH:MM形式で['23', '5'](23:05)または['3', '45'](03:45)に設定できます。 + +デフォルト値: ['23', '5'] + +##### `prescript` + +データ型: `Any` + +バックアップ開始前に実行されるスクリプト。 + +デフォルト値: `false` + +##### `postscript` + +データ型: `Any` + +バックアップ終了時に実行されるスクリプト。この機能を使用すると、バックアップを中央ストアに同期させることができます。このスクリプトは、直接実行される1つの行であっても、配列を形成する複数の行であっても構いません。あるいは、外部で管理される1つ以上の(実行可能な)ファイルにすることもできます。 + +デフォルト値: `false` + +##### `execpath` + +データ型: `Any` + +MySQLを標準的でない場所にインストールする場合にカスタムパスを設定できます。デフォルト値：`/usr/bin:/usr/sbin:/bin:/sbin`。 + +デフォルト値: '/usr/bin:/usr/sbin:/bin:/sbin' + +##### `provider` + +データ型: `Any` + +サーバのバックアップの実行について設定します。有効な値は以下のとおりです。 + +デフォルト値: 'mysqldump' + +##### `maxallowedpacket` + +データ型: `Any` + +バックアップダンプスクリプト用のSQLステートメントの最大サイズを定義ます。デフォルト値は1MBで、MySQL Serverのデフォルト値と同じです。 + +デフォルト値: '1M' + +##### `optional_args` + +データ型: `Any` + +バックアップツールに渡すべきオプションの引数の配列を指定します(xtrabackupプロバイダとmysqldumpプロバイダでのみサポート)。 + +デフォルト値: [] + +### mysql::server::monitor + +モニタするユーザをデータベースに追加するヘルパクラスです + +#### パラメータ + +`mysql::server::monitor`クラスでは、以下のパラメータを使用できます。 + +##### `mysql_monitor_username` + +データ型: `Any` + +MySQLのモニタ用に作成するユーザ名。 + +デフォルト値: '' + +##### `mysql_monitor_password` + +データ型: `Any` + +MySQLのモニタ用に作成するパスワード。 + +デフォルト値: '' + +##### `mysql_monitor_hostname` + +データ型: `Any` + +モニタするユーザリクエストへのアクセスが許可されたホスト名。 + +デフォルト値: '' + +### mysql::server::mysqltuner + +MySQLTunerパッケージを管理します。 + +#### パラメータ + +`mysql::server::mysqltuner`クラスでは、以下のパラメータを使用できます。 + +##### `ensure` + +データ型: `Any` + +リソースが存在することを確認します。有効な値: 'present'、'absent'。デフォルト値: 'present'。 + +デフォルト値: 'present' + +##### `version` + +データ型: `Any` + +major/MySQLTuner-perl githubリポジトリからインストールするバージョン。有効なタグでなければなりません。デフォルト値: 'v1.3.0'。 + +デフォルト値: 'v1.3.0' + +##### `source` + +データ型: `Any` + +mysqltunerパッケージのソースパス。 + +デフォルト値: `undef` + +##### `tuner_location` + +データ型: `Any` + +mysqltunerパッケージの宛先。 + +デフォルト値: '/usr/local/bin/mysqltuner' + +## 定義された型 + +### mysql::db + +MySQLデータベースを作成し、設定します。 + +#### 例 + +##### データベースを作成します + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => 'mypass', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +#### パラメータ + +`mysql::db`ユーザ定義タイプでは、以下のパラメータを使用できます。 + +##### `user` + +データ型: `Any` + +作成するデータベースのユーザ。 + +##### `password` + +データ型: `Any` + +作成するデータベースの$userのパスワード。 + +##### `tls_options` + +データ型: `Any` + +作成するデータベースの$userのtls_options。 + +デフォルト値: `undef` + +##### `dbname` + +データ型: `Any` + +作成するデータベースの名前。 + +デフォルト値: $name + +##### `charset` + +データ型: `Any` + +データベースに使用するキャラクタセット。 + +デフォルト値: 'utf8' + +##### `collate` + +データ型: `Any` + +データベースの照合順序。 + +デフォルト値: 'utf8_general_ci' + +##### `host` + +データ型: `Any` + +GRANT権限を付与するuser@hostの一部として使用するホスト。 + +デフォルト値: 'localhost' + +##### `grant` + +データ型: `Any` + +データベースに対してuser@hostに付与される権限。 + +デフォルト値: 'ALL' + +##### `grant_options` + +データ型: `Any` + +ホストデータベースに対してuser@hostに付与される権限オプション。 + +デフォルト値: `undef` + +##### `sql` + +データタイプ: `Optional[Variant[Array, Hash, String]]` + +実行するsqlfileへのパス。文字列として指定された1つのファイル、または文字列の配列のいずれかです。 + +デフォルト値: `undef` + +##### `enforce_sql` + +データ型: `Any` + +sqlfilesを毎回実行するかどうかを指定します。falseに設定した場合はsqlfilesは1回しか実行されません。 + +デフォルト値: `false` + +##### `ensure` + +データタイプ: `Enum['absent', 'present']` + +データベースを作成するかどうかを指定します。有効な値: 'present'、'absent'。デフォルト値: 'present'。 + +デフォルト値: 'present' + +##### `import_timeout` + +データ型: `Any` + +sqlfilesをロードするときのタイムアウト(秒)。デフォルト値: 300。 + +デフォルト値: 300 + +##### `import_cat_cmd` + +データ型: `Any` + +データベースをインポートするためにsqlfileを読み込むコマンド。sqlfilesが圧縮されている場合に役立ちます。例えば.gzファイルの場合に'zcat'を使用することができます。 + +デフォルト値: 'cat' + +##### `mysql_exec_path` + +データ型: `Any` + + + +デフォルト値: $mysql::params::exec_path + +## リソース型 + +### mysql_plugin + +MySQLプラグインを管理します。 + +#### 例 + +##### + +```puppet +mysql_plugin { 'some_plugin': + soname => 'some_pluginlib.so', +} +``` + +#### プロパティ + +`mysql_plugin`タイプでは、以下のプロパティを使用できます。 + +##### `ensure` + +デフォルト値: present、absent + +リソースの基本的なプロパティ。 + +デフォルト値: present + +##### `soname` + +有効な値: %r{^\w+\.\w+$} + +ライブラリの名前 + +#### パラメータ + +`mysql_plugin`タイプでは、以下のパラメータを使用できます。 + +##### `name` + +namevar + +管理するMySQLプラグインの名前。 + +## 関数 + +### mysql::password + +タイプ: Ruby 4.x API + +mysqlの"PASSWORD()"関数のように、文字列にハッシュをかけます + +#### `mysql::password(String $password)` + +mysql::password関数。 + +結果: `String`ハッシュ。 +平文のパスワードから返されたmysqlパスワードハッシュ。 + +##### `password` + +データタイプ: `String` + +平文のパスワード。 + +### mysql::strip_hash + +タイプ: Ruby 4.x API + +ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +#### `mysql::strip_hash(Hash $hash)` + +mysql::strip_hash関数。 + +結果: `Hash`ハッシュ。 +与えられたハッシュからすべての空白エントリを削除したもの。 + +##### `hash` + +データ型: `Hash` + +空白を取り除くハッシュ + +### mysql_password + +タイプ: Ruby 4.x API + +4.xの関数'mysql::password'のラッパーとして、3.xの関数'mysql_password'とのギャップを埋めます。 + +#### `mysql_password(String $password)` + +mysql_password関数。 + +結果: `String`。4.xの関数mysql::passwordから返されたmysqlパスワードハッシュ。 + +##### `password` + +データタイプ: `String` + +平文のパスワード。 + +### mysql_password + +タイプ: Ruby 3.x API + +mysqlの"PASSWORD()"関数のように、文字列にハッシュをかけます + +#### `mysql_password(String $password)` + +mysql_password関数。 + +結果: `String` 平文のパスワードから返されたmysqlパスワードハッシュ。 + +##### `password` + +データタイプ: `String` + +平文のパスワード。 + +### mysql_strip_hash + +タイプ: Ruby 4.x API + +4.xの関数'mysql::strip_hash'のラッパーとして、3.xの関数'mysql_strip_hash'とのギャップを埋めます。 + +#### `mysql_strip_hash(Hash $hash)` + +mysql_strip_hash関数。 + +結果: `Hash`ハッシュ。 +与えられたハッシュからすべての空白エントリを削除したもの。 + +##### `hash` + +データ型: `Hash` + +空白を取り除くハッシュ。 + +### mysql_strip_hash + +タイプ: Ruby 3.x API + +TEMPORARY FUNCTION: EXPIRES 2014-03-10 +ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +#### `mysql_strip_hash()` + +TEMPORARY FUNCTION: EXPIRES 2014-03-10 +ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +結果: `Any` + +## タスク + +### export + +ローカルファイルにデータベースのバックアップを作成できます。 + +**Supports noop?** false + +#### パラメータ + +##### `database` + +データタイプ: `Optional[String[1]]` + +接続先のデータベース + +##### `user` + +データタイプ: `Optional[String[1]]` + +ユーザ + +##### `password` + +データタイプ: `Optional[String[1]]` + +パスワード + +##### `file` + +データタイプ: `String[1]` + +バックアップ先のファイルのパス + +### sql + +任意のSQLを実行できます + +**Supports noop?** false + +#### パラメータ + +##### `database` + +データタイプ: `Optional[String[1]]` + +接続先のデータベース + +##### `user` + +データタイプ: `Optional[String[1]]` + +ユーザ + +##### `password` + +データタイプ: `Optional[String[1]]` + +パスワード + +##### `sql` + +データタイプ: `String[1]` + +実行するSQL +
--- a/modules/mysql/spec/acceptance/mysql_backup_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/mysql_backup_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -2,8 +2,7 @@ describe 'mysql::server::backup class' do context 'should work with no errors' do - it 'when configuring mysql backups' do - pp = <<-EOS + pp = <<-MANIFEST class { 'mysql::server': root_password => 'password' } mysql::db { [ 'backup1', @@ -26,46 +25,50 @@ ], execpath => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', } - EOS - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'when configuring mysql backups' do + idempotent_apply(pp) end end - describe 'mysqlbackup.sh' do - it 'should run mysqlbackup.sh with no errors' do - shell("/usr/local/sbin/mysqlbackup.sh") do |r| - expect(r.stderr).to eq("") + describe 'mysqlbackup.sh', if: Gem::Version.new(mysql_version) < Gem::Version.new('5.7.0') do + before(:all) do + pre_run + end + + it 'runs mysqlbackup.sh with no errors' do + run_shell('/usr/local/sbin/mysqlbackup.sh') do |r| + expect(r.stderr).to eq('') end end - it 'should dump all databases to single file' do - shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r| - expect(r.stdout).to match(/1/) + it 'dumps all databases to single file' do + run_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 context 'should create one file per database per run' do it 'executes mysqlbackup.sh a second time' do - shell('sleep 1') - shell('/usr/local/sbin/mysqlbackup.sh') + run_shell('sleep 1') + run_shell('/usr/local/sbin/mysqlbackup.sh') end it 'creates at least one backup tarball' do - shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r| - expect(r.stdout).to match(/2/) + run_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 - it 'when configuring mysql backups' do - pp = <<-EOS +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', @@ -89,44 +92,45 @@ ], execpath => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', } - EOS + MANIFEST + it 'when configuring mysql backups' do + idempotent_apply(pp) + end + end - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_failures => true) + describe 'mysqlbackup.sh', if: Gem::Version.new(mysql_version) < Gem::Version.new('5.7.0') do + before(:all) do + pre_run + end + + it 'runs mysqlbackup.sh with no errors without root credentials' do + run_shell('HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh') do |r| + expect(r.stderr).to eq('') end end - describe 'mysqlbackup.sh' do - it 'should run mysqlbackup.sh with no errors without root credentials' do - shell("HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh") do |r| - expect(r.stderr).to eq("") - end - end - - it 'should create one file per database' do - ['backup1', 'backup2'].each do |database| - shell("ls -l /tmp/backups/mysql_backup_#{database}_*-*.sql.bz2 | wc -l") do |r| - expect(r.stdout).to match(/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 - shell('sleep 1') - shell('HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh') - end - - it 'has one file per database per run' do - ['backup1', 'backup2'].each do |database| - shell("ls -l /tmp/backups/mysql_backup_#{database}_*-*.sql.bz2 | wc -l") do |r| - expect(r.stdout).to match(/2/) - expect(r.exit_code).to be_zero - end - end + it 'creates one file per database' do + ['backup1', 'backup2'].each do |database| + run_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 + + it 'executes mysqlbackup.sh a second time' do + run_shell('sleep 1') + run_shell('HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh') + end + + it 'has one file per database per run' do + ['backup1', 'backup2'].each do |database| + run_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 + # rubocop:enable RSpec/MultipleExpectations, RSpec/ExampleLength end end
--- a/modules/mysql/spec/acceptance/mysql_db_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/mysql_db_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -2,28 +2,34 @@ describe 'mysql::db define' do describe 'creating a database' do - # Using puppet_apply as a helper - it 'should work with no errors' do - pp = <<-EOS - class { 'mysql::server': root_password => 'password' } + let(:pp) do + <<-MANIFEST + class { 'mysql::server': + root_password => 'password', + service_enabled => 'true', + service_manage => 'true', + } mysql::db { 'spec1': - user => 'root1', - password => 'password', + user => 'root1', + password => 'password', } - EOS + MANIFEST + end - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) + it 'behaves idempotently' do + idempotent_apply(pp) + end - expect(shell("mysql -e 'show databases;'|grep spec1").exit_code).to be_zero + it 'Checking exit code and stdout' do + result = run_shell("mysql -e 'show databases;'") + expect(result.exit_code).to eq 0 + expect(result.stdout).to match %r{^spec1$} end end describe 'creating a database with post-sql' do - # Using puppet_apply as a helper - it 'should work with no errors' do - pp = <<-EOS + let(:pp) do + <<-MANIFEST class { 'mysql::server': override_options => { 'root_password' => 'password' } } file { '/tmp/spec.sql': ensure => file, @@ -35,37 +41,41 @@ password => 'password', sql => '/tmp/spec.sql', } - EOS - - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) + MANIFEST end - it 'should have the table' do - expect(shell("mysql -e 'show tables;' spec2|grep table1").exit_code).to be_zero + it 'behaves idempotently' do + idempotent_apply(pp) + end + + it 'Checking exit code and stdout' do + result = run_shell("mysql -e 'show tables;' spec2") + expect(result.exit_code).to eq 0 + expect(result.stdout).to match %r{^table1$} end end describe 'creating a database with dbname parameter' do - # Using puppet_apply as a helper - it 'should work with no errors' do - pp = <<-EOS + let(:check_command) { ' | grep realdb' } + let(:pp) do + <<-MANIFEST class { 'mysql::server': override_options => { 'root_password' => 'password' } } mysql::db { 'spec1': user => 'root1', password => 'password', dbname => 'realdb', } - EOS - - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) + MANIFEST end - it 'should have the database named realdb' do - expect(shell("mysql -e 'show databases;'|grep realdb").exit_code).to be_zero + it 'behaves idempotently' do + idempotent_apply(pp) + end + + it 'Checking exit code and stdout' do + result = run_shell("mysql -e 'show databases;'") + expect(result.exit_code).to eq 0 + expect(result.stdout).to match %r{^realdb$} end end end
--- a/modules/mysql/spec/acceptance/mysql_server_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/mysql_server_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,15 +1,10 @@ require 'spec_helper_acceptance' describe 'mysql class' do - - describe 'running puppet code' do - # Using puppet_apply as a helper - it 'should work with no errors' do - tmpdir = default.tmpdir('mysql') - pp = <<-EOS + describe 'advanced config' do + let(:pp) do + <<-MANIFEST class { 'mysql::server': - config_file => '#{tmpdir}/my.cnf', - includedir => '#{tmpdir}/include', manage_config_file => 'true', override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }}, package_ensure => 'present', @@ -45,11 +40,25 @@ }, } } - EOS + MANIFEST + end + + it 'behaves idempotently' do + idempotent_apply(pp) + end + end - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) + 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 idempotently' do + idempotent_apply(pp) end end end -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/acceptance/mysql_task_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,24 @@ +# run a test task +require 'spec_helper_acceptance' + +describe 'mysql tasks', if: 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 + apply_manifest(pp, catch_failures: true) + end + + it 'execute arbitary sql' do + result = run_bolt_task('mysql::sql', 'sql' => 'show databases;', 'password' => 'password') + expect(result.stdout).to contain(%r{information_schema}) + expect(result.stdout).to contain(%r{spec1}) + end + end +end
--- a/modules/mysql/spec/acceptance/nodesets/centos-510-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - centos-510-x64: - roles: - - master - platform: el-5-x86_64 - box : centos-510-x64-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-510-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: git
--- a/modules/mysql/spec/acceptance/nodesets/centos-59-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - centos-59-x64: - roles: - - master - platform: el-5-x86_64 - box : centos-59-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git
--- a/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -HOSTS: - centos-64-x64: - roles: - - master - - database - - dashboard - platform: el-6-x86_64 - box : centos-64-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: pe
--- a/modules/mysql/spec/acceptance/nodesets/centos-65-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - centos-65-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-65-x64-vbox436-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss
--- a/modules/mysql/spec/acceptance/nodesets/default.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -HOSTS: - centos-64-x64: - roles: - - master - - default - platform: el-6-x86_64 - box : centos-64-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss
--- a/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - fedora-18-x64: - roles: - - master - platform: fedora-18-x86_64 - box : fedora-18-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss
--- a/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - sles-11-x64.local: - roles: - - master - platform: sles-11-x64 - box : sles-11sp1-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss
--- a/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-10044-x64: - roles: - - master - platform: ubuntu-10.04-amd64 - box : ubuntu-server-10044-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss
--- a/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-12042-x64: - roles: - - master - platform: ubuntu-12.04-amd64 - box : ubuntu-server-12042-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss
--- a/modules/mysql/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-1404-x64: - roles: - - master - platform: ubuntu-14.04-amd64 - box : puppetlabs/ubuntu-14.04-64-nocm - box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor : vagrant -CONFIG: - log_level : debug - type: git
--- a/modules/mysql/spec/acceptance/types/mysql_database_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/types/mysql_database_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -2,37 +2,34 @@ describe 'mysql_database' do describe 'setup' do - it 'should work with no errors' do - pp = <<-EOS + pp = <<-MANIFEST class { 'mysql::server': } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works with no errors' do + apply_manifest(pp, catch_failures: true) end end describe 'creating database' do - it 'should work without errors' do - pp = <<-EOS + pp = <<-MANIFEST mysql_database { 'spec_db': ensure => present, } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp, catch_failures: true) end - it 'should find the database' do - shell("mysql -NBe \"SHOW DATABASES LIKE 'spec_db'\"") do |r| - expect(r.stdout).to match(/^spec_db$/) + it 'finds the database #stdout' do + run_shell("mysql -NBe \"SHOW DATABASES LIKE 'spec_db'\"") do |r| + expect(r.stdout).to match(%r{^spec_db$}) expect(r.stderr).to be_empty end end end describe 'charset and collate' do - it 'should create two db of different types idempotently' do - pp = <<-EOS + pp = <<-MANIFEST mysql_database { 'spec_latin1': charset => 'latin1', collate => 'latin1_swedish_ci', @@ -41,22 +38,21 @@ charset => 'utf8', collate => 'utf8_general_ci', } - EOS - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) + MANIFEST + it 'creates two db of different types idempotently' do + idempotent_apply(pp) end - it 'should find latin1 db' do - shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_latin1") do |r| - expect(r.stdout).to match(/^character_set_database\tlatin1\ncollation_database\tlatin1_swedish_ci$/) + it 'finds latin1 db #stdout' do + run_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$}) expect(r.stderr).to be_empty end end - it 'should find utf8 db' do - shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_utf8") do |r| - expect(r.stdout).to match(/^character_set_database\tutf8\ncollation_database\tutf8_general_ci$/) + it 'finds utf8 db #stdout' do + run_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$}) expect(r.stderr).to be_empty end end
--- a/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,416 +1,701 @@ require 'spec_helper_acceptance' describe 'mysql_grant' do + before(:all) do + pp = <<-MANIFEST + class { 'mysql::server': + root_password => 'password', + } + MANIFEST - describe 'setup' do - it 'setup mysql::server' do - pp = <<-EOS - class { 'mysql::server': } - EOS - - apply_manifest(pp, :catch_failures => true) - end + apply_manifest(pp, catch_failures: true) end describe 'missing privileges for user' do - it 'should fail' do - pp = <<-EOS + pp = <<-MANIFEST + mysql_user { 'test1@tester': + ensure => present, + } mysql_grant { 'test1@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test1@tester', + ensure => 'present', + table => 'test.*', + user => 'test1@tester', + require => Mysql_user['test1@tester'], } - EOS - - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/privileges parameter is required/) + MANIFEST + it 'fails' do + result = apply_manifest(pp, expect_failures: true) + expect(result.stderr).to contain(%r{`privileges` `parameter` is required}) end - it 'should not find the user' do - expect(shell("mysql -NBe \"SHOW GRANTS FOR test1@tester\"", { :acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'test1' on host 'tester'/) + it 'does not find the user' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test1@tester"', expect_failures: true) + expect(result.stderr).to contain(%r{There is no such grant defined for user 'test1' on host 'tester'}) end end describe 'missing table for user' do - it 'should fail' do - pp = <<-EOS + pp = <<-MANIFEST + mysql_user { 'atest@tester': + ensure => present, + } mysql_grant { 'atest@tester/test.*': - ensure => 'present', - user => 'atest@tester', + ensure => 'present', + user => 'atest@tester', privileges => ['ALL'], + require => Mysql_user['atest@tester'], } - EOS - - apply_manifest(pp, :expect_failures => true) + MANIFEST + it 'fails' do + apply_manifest(pp, expect_failures: true) end - it 'should not find the user' do - expect(shell("mysql -NBe \"SHOW GRANTS FOR atest@tester\"", {:acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'atest' on host 'tester'/) + it 'does not find the user' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR atest@tester"', expect_failures: true) + expect(result.stderr).to contain(%r{There is no such grant defined for user 'atest' on host 'tester'}) end end describe 'adding privileges' do - it 'should work without errors' do - pp = <<-EOS + 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'], } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r| - expect(r.stdout).to match(/GRANT SELECT, UPDATE.*TO 'test2'@'tester'/) - expect(r.stderr).to be_empty - end + it 'finds the user #stdout' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test2@tester"') + expect(result.stdout).to contain(%r{GRANT SELECT, UPDATE.*TO 'test2'@'tester'}) + expect(result.stderr).to be_empty end end describe 'adding privileges with special character in name' do - it 'should work without errors' do - pp = <<-EOS + 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'], } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test-2'@tester\"") do |r| - expect(r.stdout).to match(/GRANT SELECT, UPDATE.*TO 'test-2'@'tester'/) - expect(r.stderr).to be_empty - end - end - end - - describe 'adding privileges with invalid name' do - it 'should fail' do - pp = <<-EOS - mysql_grant { 'test': - ensure => 'present', - table => 'test.*', - user => 'test2@tester', - privileges => ['SELECT', 'UPDATE'], - } - EOS - - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/name must match user and table parameters/) + it 'finds the user #stdout' do + result = run_shell("mysql -NBe \"SHOW GRANTS FOR 'test-2'@tester\"") + expect(result.stdout).to contain(%r{GRANT SELECT, UPDATE.*TO 'test-2'@'tester'}) + expect(result.stderr).to be_empty end end describe 'adding option' do - it 'should work without errors' do - pp = <<-EOS + pp = <<-MANIFEST + mysql_user { 'test3@tester': + ensure => present, + } mysql_grant { 'test3@tester/test.*': - ensure => 'present', - table => 'test.*', - user => 'test3@tester', - options => ['GRANT'], + ensure => 'present', + table => 'test.*', + user => 'test3@tester', + options => ['GRANT'], privileges => ['SELECT', 'UPDATE'], + require => Mysql_user['test3@tester'], } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"SHOW GRANTS FOR test3@tester\"") do |r| - expect(r.stdout).to match(/GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$/) - expect(r.stderr).to be_empty - end + it 'finds the user #stdout' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test3@tester"') + expect(result.stdout).to contain(%r{GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$}) + expect(result.stderr).to be_empty end end describe 'adding all privileges without table' do - it 'should fail' do - pp = <<-EOS + 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'], } - EOS - - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/table parameter is required./) + MANIFEST + it 'fails' do + result = apply_manifest(pp, expect_failures: true) + expect(result.stderr).to contain(%r{`table` `parameter` is required.}) end end describe 'adding all privileges' do - it 'should only try to apply ALL' do - pp = <<-EOS + 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'], } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'onlies try to apply ALL' do + apply_manifest(pp, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"SHOW GRANTS FOR test4@tester\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION/) - expect(r.stderr).to be_empty - end + it 'finds the user #stdout' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test4@tester"') + expect(result.stdout).to contain(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION}) + expect(result.stderr).to be_empty end end # Test combinations of user@host to ensure all cases work. describe 'short hostname' do - it 'should apply' do - pp = <<-EOS + 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'], } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'applies' do + apply_manifest(pp, catch_failures: true) end - it 'finds short hostname' do - shell("mysql -NBe \"SHOW GRANTS FOR test@short\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'/) + it 'finds short hostname #stdout' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test@short"') + expect(result.stdout).to contain(%r{GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'}) + expect(result.stderr).to be_empty + end + + it 'finds long hostname #stdout' do + run_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'}) expect(r.stderr).to be_empty end end - it 'finds long hostname' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'long.hostname.com'/) + + it 'finds ipv4 #stdout' do + run_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'}) expect(r.stderr).to be_empty end end - it 'finds ipv4' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.6'/) + + it 'finds ipv6 #stdout' do + run_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'}) expect(r.stderr).to be_empty end end - it 'finds ipv6' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'/) - expect(r.stderr).to be_empty - end - end - it 'finds short ipv6' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'::1\/128'/) + + it 'finds short ipv6 #stdout' do + run_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'}) expect(r.stderr).to be_empty end end end describe 'complex test' do - it 'setup mysql::server' do - pp = <<-EOS - $dbSubnet = '10.10.10.%' + pp = <<-MANIFEST + $dbSubnet = '10.10.10.%' - mysql_database { 'foo': - ensure => present, - } + 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'], - } + 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 { + Mysql_grant { ensure => present, options => ['GRANT'], privileges => ['ALL'], table => '*.*', require => [ Mysql_database['foo'], Exec['mysql-create-table'] ], - } + } - mysql_grant { "user1@${dbSubnet}/*.*": + mysql_user { "user1@${dbSubnet}": + ensure => present, + } + mysql_grant { "user1@${dbSubnet}/*.*": user => "user1@${dbSubnet}", - } - mysql_grant { "user2@${dbSubnet}/foo.bar": + 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', - } - mysql_grant { "user3@${dbSubnet}/foo.*": + 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.*', - } - mysql_grant { 'web@%/*.*': + require => Mysql_user["user3@${dbSubnet}"], + } + mysql_user { 'web@%': + ensure => present, + } + mysql_grant { 'web@%/*.*': user => 'web@%', - } - mysql_grant { "web@${dbSubnet}/*.*": + require => Mysql_user['web@%'], + } + mysql_user { "web@${dbSubnet}": + ensure => present, + } + mysql_grant { "web@${dbSubnet}/*.*": user => "web@${dbSubnet}", - } - mysql_grant { "web@${fqdn}/*.*": + require => Mysql_user["web@${dbSubnet}"], + } + mysql_user { "web@${fqdn}": + ensure => present, + } + mysql_grant { "web@${fqdn}/*.*": user => "web@${fqdn}", - } - mysql_grant { 'web@localhost/*.*': + require => Mysql_user["web@${fqdn}"], + } + mysql_user { 'web@localhost': + ensure => present, + } + mysql_grant { 'web@localhost/*.*': user => 'web@localhost', - } - EOS - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) + require => Mysql_user['web@localhost'], + } + MANIFEST + it 'setup mysql::server' do + idempotent_apply(pp) end end describe 'lower case privileges' do - it 'create ALL privs' do - pp = <<-EOS - mysql_grant { 'lowercase@localhost/*.*': + pp_one = <<-MANIFEST + mysql_user { 'lowercase@localhost': + ensure => present, + } + mysql_grant { 'lowercase@localhost/*.*': user => 'lowercase@localhost', privileges => 'ALL', table => '*.*', - } - EOS - - apply_manifest(pp, :catch_failures => true) + require => Mysql_user['lowercase@localhost'], + } + MANIFEST + it 'create ALL privs' do + apply_manifest(pp_one, catch_failures: true) end - it 'create lowercase all privs' do - pp = <<-EOS - mysql_grant { 'lowercase@localhost/*.*': + pp_two = <<-MANIFEST + mysql_user { 'lowercase@localhost': + ensure => present, + } + mysql_grant { 'lowercase@localhost/*.*': user => 'lowercase@localhost', privileges => 'all', table => '*.*', - } - EOS - - expect(apply_manifest(pp, :catch_failures => true).exit_code).to eq(0) + require => Mysql_user['lowercase@localhost'], + } + MANIFEST + it 'create lowercase all privs' do + result = apply_manifest(pp_two, catch_failures: true) + expect(result.exit_code).to eq(0) end end describe 'adding procedure privileges' do - it 'should work without errors' do - pp = <<-EOS - mysql_grant { 'test2@tester/PROCEDURE test.simpleproc': - ensure => 'present', - table => 'PROCEDURE test.simpleproc', - user => 'test2@tester', - privileges => ['EXECUTE'], - } - EOS + 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 + apply_manifest(pp, catch_failures: true) + end + + it 'finds the user #stdout' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test2@tester"') + expect(result.stdout).to match(%r{GRANT EXECUTE ON PROCEDURE `mysql`.`simpleproc` TO 'test2'@'tester'}) + expect(result.stderr).to be_empty + 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', + } - apply_manifest(pp, :catch_failures => true) + mysql_grant { 'test3@tester/FUNCTION mysql.simplefunc': + ensure => 'present', + table => 'FUNCTION mysql.simplefunc', + user => 'test3@tester', + privileges => ['EXECUTE'], + require => Mysql_user['test3@tester'], + } + EOS + + apply_manifest(pp, catch_failures: true) + end + # rubocop:enable RSpec/ExampleLength + it 'finds the user' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR test3@tester"') + expect(result.stdout).to match(%r{GRANT EXECUTE ON FUNCTION `mysql`.`simplefunc` TO 'test3'@'tester'}) + expect(result.stderr).to be_empty + end + # rubocop:enable RSpec/MultipleExpectations + end + + describe 'proxy privilieges' do + pre_run + + describe 'adding proxy privileges', if: Gem::Version.new(mysql_version) > Gem::Version.new('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 + apply_manifest(pp, catch_failures: true) + end + + it 'finds the user #stdout' do + run_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'}) + expect(r.stderr).to be_empty + end + end end - it 'should find the user' do - shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r| - expect(r.stdout).to match(/GRANT EXECUTE ON PROCEDURE `test`.`simpleproc` TO 'test2'@'tester'/) - expect(r.stderr).to be_empty + describe 'removing proxy privileges', if: Gem::Version.new(mysql_version) > Gem::Version.new('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 + apply_manifest(pp, catch_failures: true) + end + + it 'finds the user #stdout' do + run_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'}) + expect(r.stderr).to be_empty + end + end + end + + describe 'adding proxy privileges with other privileges', if: Gem::Version.new(mysql_version) > Gem::Version.new('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 + result = apply_manifest(pp, expect_failures: true) + expect(result.stderr).to match(%r{`privileges` `parameter`: PROXY can only be specified by itself}) + end + + it 'does not find the user' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR proxy2@tester"', expect_failures: true) + expect(result.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: Gem::Version.new(mysql_version) > Gem::Version.new('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 + result = apply_manifest(pp, expect_failures: true) + expect(result.stderr).to match(%r{PROXY user not supported on mysql versions < 5\.5\.0}i) + end + + it 'does not find the user' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR proxy2@tester"', expect_failures: true) + expect(result.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: Gem::Version.new(mysql_version) > Gem::Version.new('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 + result = apply_manifest(pp, expect_failures: true) + expect(result.stderr).to match(%r{`table` `property` for PROXY should be specified as proxy_user@proxy_host.}) + end + + it 'does not find the user' do + result = run_shell('mysql -NBe "SHOW GRANTS FOR proxy3@tester"', expect_failures: true) + expect(result.stderr).to contain(%r{There is no such grant defined for user 'proxy3' on host 'tester'}) end end end describe 'grants with skip-name-resolve specified' do - it 'setup mysql::server' do - pp = <<-EOS + pp_one = <<-MANIFEST class { 'mysql::server': override_options => { 'mysqld' => {'skip-name-resolve' => true} }, restart => true, } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'setup mysql::server' do + apply_manifest(pp_one, catch_failures: true) end - it 'should apply' do - pp = <<-EOS + 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'], } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'applies' do + apply_manifest(pp_two, catch_failures: true) end - it 'should fail with fqdn' do - expect(shell("mysql -NBe \"SHOW GRANTS FOR test@fqdn.com\"", { :acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'test' on host 'fqdn.com'/) + it 'fails with fqdn' do + pre_run + unless Gem::Version.new(mysql_version) > Gem::Version.new('5.7.0') + result = run_shell('mysql -NBe "SHOW GRANTS FOR test@fqdn.com"', expect_failures: true) + expect(result.stderr).to contain(%r{There is no such grant defined for user 'test' on host 'fqdn.com'}) + end end - it 'finds ipv4' do - shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.7'\"") do |r| - expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.7'/) + + it 'finds ipv4 #stdout' do + run_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'}) expect(r.stderr).to be_empty end end - it 'should fail to execute while applying' do - pp = <<-EOS + 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'], } - EOS - - mysql_cmd = shell('which mysql').stdout.chomp - shell("mv #{mysql_cmd} #{mysql_cmd}.bak") - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Command mysql is missing/) - shell("mv #{mysql_cmd}.bak #{mysql_cmd}") + MANIFEST + it 'fails to execute while applying' do + mysql_cmd = run_shell('which mysql').stdout.chomp + run_shell("mv #{mysql_cmd} #{mysql_cmd}.bak") + result = apply_manifest(pp_three, expect_failures: true) + expect(result.stderr).to match(%r{Could not find a suitable provider for mysql_grant}) + run_shell("mv #{mysql_cmd}.bak #{mysql_cmd}") end - it 'reset mysql::server config' do - pp = <<-EOS + pp_four = <<-MANIFEST class { 'mysql::server': restart => true, } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'reset mysql::server config' do + apply_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 + apply_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_doesnt_exist': + user => 'test@localhost', + privileges => ['SELECT'], + table => 'grant_spec_db.grant_spec_table_doesnt_exist', + require => Mysql_user['test@localhost'], + } + MANIFEST + it 'creates grant on missing table will fail' do + result = apply_manifest(pp_two, expect_failures: true) + expect(result.stderr).to match(%r{Table 'grant_spec_db\.grant_spec_table_doesnt_exist' 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 + apply_manifest(pp_three, catch_failures: true) + end + + it 'has the table' do + result = run_shell("mysql -e 'show tables;' grant_spec_db|grep grant_spec_table") + expect(result.exit_code).to be_zero + end + end end
--- a/modules/mysql/spec/acceptance/types/mysql_plugin_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/types/mysql_plugin_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -4,69 +4,60 @@ # 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 fact('operatingsystemrelease') =~ /^5\./ +if os[:family] == 'redhat' + if os[:release].to_i == 5 plugin = nil # Plugins not supported on mysql on RHEL 5 - elsif fact('operatingsystemrelease') =~ /^6\./ + elsif os[:release].to_i == 6 plugin = 'example' plugin_lib = 'ha_example.so' - elsif fact('operatingsystemrelease') =~ /^7\./ + elsif os[:release].to_i == 7 plugin = 'pam' plugin_lib = 'auth_pam.so' end -elsif fact('osfamily') =~ /Debian/ - if fact('operatingsystem') =~ /Debian/ - if fact('operatingsystemrelease') =~ /^6\./ - # Only available plugin is innodb which is already loaded and not unload- or reload-able - plugin = nil - elsif fact('operatingsystemrelease') =~ /^7\./ - plugin = 'example' - plugin_lib = 'ha_example.so' - end - elsif fact('operatingsystem') =~ /Ubuntu/ - if fact('operatingsystemrelease') =~ /^10\.04/ - # Only available plugin is innodb which is already loaded and not unload- or reload-able - plugin = nil +elsif os[:family] == '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/ +elsif os[:family] == '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 'should work with no errors' do - pp = <<-EOS + it 'works with no errors' do + pp = <<-MANIFEST class { 'mysql::server': } - EOS + MANIFEST - apply_manifest(pp, :catch_failures => true) + apply_manifest(pp, catch_failures: true) end end describe 'load plugin' do - it 'should work without errors' do - pp = <<-EOS + pp = <<-MANIFEST mysql_plugin { #{plugin}: ensure => present, soname => '#{plugin_lib}', } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp, catch_failures: true) end - it 'should find the plugin' do - shell("mysql -NBe \"select plugin_name from information_schema.plugins where plugin_name='#{plugin}'\"") do |r| - expect(r.stdout).to match(/^#{plugin}$/i) + it 'finds the plugin #stdout' do + run_shell("mysql -NBe \"select plugin_name from information_schema.plugins where plugin_name='#{plugin}'\"") do |r| + expect(r.stdout).to match(%r{^#{plugin}$}i) expect(r.stderr).to be_empty end end end end - end
--- a/modules/mysql/spec/acceptance/types/mysql_user_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/acceptance/types/mysql_user_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -2,51 +2,88 @@ describe 'mysql_user' do describe 'setup' do - it 'should work with no errors' do - pp = <<-EOS + pp_one = <<-MANIFEST class { 'mysql::server': } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works with no errors' do + apply_manifest(pp_one, catch_failures: true) end end context 'using ashp@localhost' do describe 'adding user' do - it 'should work without errors' do - pp = <<-EOS + pp_two = <<-MANIFEST mysql_user { 'ashp@localhost': - password_hash => '6f8c114b58f2ce9e', + password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp_two, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout).to match(/^1$/) + it 'finds the user #stdout' do + run_shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| + expect(r.stdout).to match(%r{^1$}) + expect(r.stderr).to be_empty + end + end + + it 'has no SSL options #stdout' do + run_shell("mysql -NBe \"select SSL_TYPE from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| + expect(r.stdout).to match(%r{^\s*$}) expect(r.stderr).to be_empty end end end + + describe 'changing authentication plugin', if: (Gem::Version.new(mysql_version) > Gem::Version.new('5.5.0') && os[:release] !~ %r{^16\.04}) do + it 'works without errors' do + pp = <<-EOS + mysql_user { 'ashp@localhost': + plugin => 'auth_socket', + } + EOS + + idempotent_apply(pp) + end + + it 'has the correct plugin' do + run_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 Gem::Version.new(mysql_version) > Gem::Version.new('5.7.0') + 'authentication_string' + else + 'password' + end + run_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 - it 'should work without errors' do - pp = <<-EOS + pp_three = <<-MANIFEST mysql_user { 'ashp-dash@localhost': - password_hash => '6f8c114b58f2ce9e', + password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp_three, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp-dash@localhost'\"") do |r| - expect(r.stdout).to match(/^1$/) + it 'finds the user #stdout' do + run_shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp-dash@localhost'\"") do |r| + expect(r.stdout).to match(%r{^1$}) expect(r.stderr).to be_empty end end @@ -55,19 +92,18 @@ context 'using ashp@LocalHost' do describe 'adding user' do - it 'should work without errors' do - pp = <<-EOS + pp_four = <<-MANIFEST mysql_user { 'ashp@LocalHost': - password_hash => '6f8c114b58f2ce9e', + password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5', } - EOS - - apply_manifest(pp, :catch_failures => true) + MANIFEST + it 'works without errors' do + apply_manifest(pp_four, catch_failures: true) end - it 'should find the user' do - shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| - expect(r.stdout).to match(/^1$/) + it 'finds the user #stdout' do + run_shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r| + expect(r.stdout).to match(%r{^1$}) expect(r.stderr).to be_empty end end @@ -75,12 +111,65 @@ end context 'using resource should throw no errors' do describe 'find users' do - it { - on default, puppet('resource mysql_user'), {:catch_failures => true} do |r| - expect(r.stdout).to_not match(/Error:/) - expect(r.stdout).to_not match(/must be properly quoted, invalid character:/) + it do + result = run_shell('puppet resource mysql_user') + expect(result.stdout).not_to match(%r{Error:}) + expect(result.stdout).not_to match(%r{must be properly quoted, invalid character:}) + 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 + apply_manifest(pp_five, catch_failures: true) + end + + it 'finds the user #stdout' do + run_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$}) + expect(r.stderr).to be_empty end - } + end + + it 'shows correct ssl_type #stdout' do + run_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$}) + 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 + apply_manifest(pp_six, catch_failures: true) + end + + it 'finds the user #stdout' do + run_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$}) + expect(r.stderr).to be_empty + end + end + + it 'shows correct ssl_type #stdout' do + run_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$}) + expect(r.stderr).to be_empty + end + end end end end
--- a/modules/mysql/spec/classes/graceful_failures_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/graceful_failures_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,15 +1,16 @@ require 'spec_helper' describe 'mysql::server' do - on_pe_unsupported_platforms.each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + context 'on an unsupported OS' do + let(:facts) do + { + osfamily: 'UNSUPPORTED', + operatingsystem: 'UNSUPPORTED', + } + end - context 'should gracefully fail' do - it { expect { is_expected.to compile}.to raise_error(Puppet::Error, /Unsupported platform:/) } - end - end + it 'gracefully fails' do + is_expected.to compile.and_raise_error(%r{Unsupported platform:}) end end end
--- a/modules/mysql/spec/classes/mycnf_template_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mycnf_template_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,77 +1,84 @@ require 'spec_helper' describe 'mysql::server' do - context 'my.cnf template' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + 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' } } } } - 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', - }).with_content(/socket = \/var\/lib\/mysql\/mysql.sock/) - end - end + 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'] } } } } - 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( - /.*replicate-do-db = base1\nreplicate-do-db = base2.*/ - ) - end - end + 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' => '' } } } } - describe 'ssl set to true' do - let(:params) {{ :override_options => { 'mysqld' => { 'ssl' => true }}}} - it { is_expected.to contain_file('mysql-config-file').with_content(/ssl/) } - it { is_expected.to contain_file('mysql-config-file').without_content(/ssl = true/) } - end + it { is_expected.to contain_file('mysql-config-file').with_content(%r{^skip-name-resolve$}) } + 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(/ssl = false/) } - 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 - # 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(/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 } } } } - 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(/^test$/) } - it { is_expected.to contain_file('mysql-config-file').without_content(/test = true/) } - end + 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 + context 'with includedir' do + let(:params) { { includedir: '/etc/my.cnf.d' } } - it { is_expected.to contain_file('mysql-config-file').with_content(/!includedir/) } - end + it 'makes the directory' do + is_expected.to contain_file('/etc/my.cnf.d').with(ensure: :directory, + mode: '0755') + 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').with_content(%r{!includedir}) } + end + + context 'without includedir' do + let(:params) { { includedir: '' } } - it { is_expected.to contain_file('mysql-config-file').without_content(/!includedir/) } - end + 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/classes/mysql_backup_mysqldump_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,56 @@ +require 'spec_helper' + +describe 'mysql::backup::mysqldump' 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/mysql-backup', + 'backuprotate' => '25', + 'delete_before_dump' => true, + 'execpath' => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', + 'maxallowedpacket' => '1M' } + end + + context 'with time included' do + let(:params) do + { time: [23, 59, 30, 12, 6] }.merge(default_params) + end + + it { + is_expected.to contain_cron('mysql-backup').with( + hour: 23, + minute: 59, + monthday: 30, + month: 12, + weekday: 6, + ) + } + end + + context 'with defaults' do + let(:params) { default_params } + + it { + is_expected.to contain_cron('mysql-backup').with( + command: '/usr/local/sbin/mysqlbackup.sh', + ensure: 'present', + hour: 23, + minute: 5, + ) + } + end + end + end + # rubocop:enable RSpec/NestedGroups +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/classes/mysql_backup_xtrabackup_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,175 @@ +require 'spec_helper' + +describe 'mysql::backup::xtrabackup' 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 + { 'backupdir' => '/tmp' } + end + + context 'with defaults' do + let(:params) do + default_params + end + + it 'contains the wrapper script' do + is_expected.to contain_file('xtrabackup.sh').with_content( + %r{(\n*^xtrabackup\s+.*\$@)}, + ) + end + + it 'contains the weekly cronjob' do + is_expected.to contain_cron('xtrabackup-weekly') + .with( + ensure: 'present', + command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp --backup', + user: 'root', + hour: '23', + minute: '5', + weekday: '0', + ) + .that_requires('Package[percona-xtrabackup]') + end + + it 'contains the daily cronjob for weekdays 1-6' do + is_expected.to contain_cron('xtrabackup-daily') + .with( + ensure: 'present', + command: '/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp --target-dir=/tmp/$(date +\%F_\%H-\%M-\%S) --backup', + user: 'root', + hour: '23', + minute: '5', + weekday: '1-6', + ) + .that_requires('Package[percona-xtrabackup]') + end + end + + context 'with backupuser and backuppassword' do + let(:params) do + { backupuser: 'backupuser', + backuppassword: 'backuppassword' }.merge(default_params) + end + + it 'contains the defined mysql user' do + is_expected.to contain_mysql_user('backupuser@localhost') + .with( + ensure: 'present', + password_hash: '*4110E08DF51E70A4BA1D4E33A84205E38CF3FE58', + ) + .that_requires('Class[mysql::server::root_password]') + + is_expected.to contain_mysql_grant('backupuser@localhost/*.*') + .with( + ensure: 'present', + user: 'backupuser@localhost', + table: '*.*', + privileges: ['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT'], + ) + .that_requires('Mysql_user[backupuser@localhost]') + end + end + + context 'with additional cron args' do + let(:params) do + { additional_cron_args: '--backup --skip-ssl' }.merge(default_params) + end + + it 'contains the weekly cronjob' do + is_expected.to contain_cron('xtrabackup-weekly') + .with( + ensure: 'present', + command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp --backup --skip-ssl', + user: 'root', + hour: '23', + minute: '5', + weekday: '0', + ) + .that_requires('Package[percona-xtrabackup]') + end + + it 'contains the daily cronjob for weekdays 1-6' do + is_expected.to contain_cron('xtrabackup-daily') + .with( + ensure: 'present', + command: '/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp --target-dir=/tmp/$(date +\%F_\%H-\%M-\%S) --backup --skip-ssl', + user: 'root', + hour: '23', + minute: '5', + weekday: '1-6', + ) + .that_requires('Package[percona-xtrabackup]') + end + end + + context 'with deactivated incremental backups' do + let(:params) do + { incremental_backups: false }.merge(default_params) + end + + it 'not contains the weekly cronjob' do + is_expected.not_to contain_cron('xtrabackup-weekly') + end + + it 'contains the daily cronjob with all weekdays' do + is_expected.to contain_cron('xtrabackup-daily').with( + ensure: 'present', + command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp --backup', + user: 'root', + hour: '23', + minute: '5', + weekday: '*', + ) + end + end + + context 'with prescript defined' do + let(:params) do + { prescript: ['rsync -a /tmp backup01.local-lan:', + 'rsync -a /tmp backup02.local-lan:'] }.merge(default_params) + 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 + { postscript: ['rsync -a /tmp backup01.local-lan:', + 'rsync -a /tmp backup02.local-lan:'] }.merge(default_params) + 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 + { backupmethod: 'mariabackup' }.merge(default_params) + end + + it 'contain the mariabackup executor' do + is_expected.to contain_file('xtrabackup.sh').with_content( + %r{(\n*^mariabackup\s+.*\$@)}, + ) + end + end + end + end + # rubocop:enable RSpec/NestedGroups +end
--- a/modules/mysql/spec/classes/mysql_bindings_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_bindings_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,13 +1,16 @@ require 'spec_helper' describe 'mysql::bindings' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + 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) {{ - 'java_enable' => true, + let(:params) do + { + 'java_enable' => true, 'perl_enable' => true, 'php_enable' => true, 'python_enable' => true, @@ -16,15 +19,15 @@ '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 + 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
--- a/modules/mysql/spec/classes/mysql_client_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_client_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,35 +1,34 @@ require 'spec_helper' describe 'mysql::client' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + 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 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 }} + 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 + 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 }} + context 'with package_manage set to true' do + let(:params) { { package_manage: true } } - it { is_expected.to contain_package('mysql_client') } - end + it { is_expected.to contain_package('mysql_client') } + end - context 'with package_manage set to false' do - let(:params) {{ :package_manage => false }} + context 'with package_manage set to false' do + let(:params) { { package_manage: false } } - it { is_expected.not_to contain_package('mysql_client') } - end - + it { is_expected.not_to contain_package('mysql_client') } end end end
--- a/modules/mysql/spec/classes/mysql_server_account_security_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_server_account_security_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,19 +1,28 @@ require 'spec_helper' describe 'mysql::server::account_security' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts.merge({:fqdn => 'myhost.mydomain', :hostname => 'myhost'}) } + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:pre_condition) do + <<-EOF + anchor {'mysql::server::end': } + EOF + end - [ 'root@myhost.mydomain', - 'root@127.0.0.1', - 'root@::1', - '@myhost.mydomain', - '@localhost', - '@%', - ].each do |user| - it "removes Mysql_User[#{user}]" do + 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 @@ -21,44 +30,50 @@ # 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 + ['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 'should remove Mysql_database[test]' do + it 'removes Mysql_database[test]' do is_expected.to contain_mysql_database('test').with_ensure('absent') end end - describe "on #{pe_version} #{pe_platform} with fqdn==localhost" do - let(:facts) { facts.merge({:fqdn => 'localhost', :hostname => 'localhost'}) } + 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}]" do + ['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 - describe "on #{pe_version} #{pe_platform} with fqdn==localhost.localdomain" do - let(:facts) { facts.merge({:fqdn => 'localhost.localdomain', :hostname => 'localhost'}) } + 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}]" do + ['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
--- a/modules/mysql/spec/classes/mysql_server_backup_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_server_backup_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,189 +1,388 @@ require 'spec_helper' describe 'mysql::server::backup' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + 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/mysql-backup', + '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]', + ) + } - let(:default_params) { - { 'backupuser' => 'testuser', - 'backuppassword' => 'testpass', - 'backupdir' => '/tmp', - 'backuprotate' => '25', - 'delete_before_dump' => true, - 'execpath' => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', + 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('/tmp/mysql-backup').with( + ensure: 'directory', + ) } - context 'standard conditions' do - let(:params) { default_params } + 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 - # 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 '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 - 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 delete after dump' do + let(:custom_params) do + { + 'delete_before_dump' => false, + } + end + let(:params) do + default_params.merge!(custom_params) + end + + it { is_expected.to contain_file('mysqlbackup.sh').with_content(%r{touch /tmp/mysqlbackup_success}) } + end - it { is_expected.to contain_cron('mysql-backup').with( - :command => '/usr/local/sbin/mysqlbackup.sh', - :ensure => 'present' - )} + context 'with delete after dump and custom success file path' do + let(:custom_params) do + { + 'delete_before_dump' => false, + 'backup_success_file_path' => '/opt/mysqlbackup_success', + } + end + let(:params) do + default_params.merge!(custom_params) + end + + it { is_expected.to contain_file('mysqlbackup.sh').with_content(%r{touch /opt/mysqlbackup_success}) } + 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('mysqlbackup.sh').with( - :path => '/usr/local/sbin/mysqlbackup.sh', - :ensure => 'present' - ) } + it { + is_expected.to contain_file('/tmp/mysql-backup').with( + 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('mysqlbackupdir').with( - :path => '/tmp', - :ensure => 'directory' - )} + 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 'should have compression by default' do - is_expected.to contain_file('mysqlbackup.sh').with( - :content => /bzcat -zc/ - ) - end - it 'should skip backing up events table by default' do - is_expected.to contain_file('mysqlbackup.sh').with( - :content => /EVENTS="--ignore-table=mysql.event"/ - ) + 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 'should have 25 days of rotation' do - # MySQL counts from 0 - is_expected.to contain_file('mysqlbackup.sh').with_content(/.*ROTATE=24.*/) - end - - it 'should have a standard PATH' do - is_expected.to contain_file('mysqlbackup.sh').with_content(%r{PATH=/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin}) + it 'backups triggers when asked' do + is_expected.to contain_file('mysqlbackup.sh').with_content( + %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --triggers"}, + ) end end - context 'custom ownership and mode for backupdir' do + context 'with include_triggers set to false' do let(:params) do - { :backupdirmode => '0750', - :backupdirowner => 'testuser', - :backupdirgroup => 'testgrp', - }.merge(default_params) + 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 { is_expected.to contain_file('mysqlbackupdir').with( - :path => '/tmp', - :ensure => 'directory', - :mode => '0750', - :owner => 'testuser', - :group => 'testgrp' - ) } + 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 - { :backupcompress => false }.merge(default_params) + default_params.merge(file_per_database: true, backupcompress: false) end - it { is_expected.to contain_file('mysqlbackup.sh').with( - :path => '/usr/local/sbin/mysqlbackup.sh', - :ensure => 'present' - ) } + 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 'should be able to disable compression' do - is_expected.to contain_file('mysqlbackup.sh').without_content( - /.*bzcat -zc.*/ + 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 mysql.events backedup' do + context 'with include_triggers set to false' do let(:params) do - { :ignore_events => false }.merge(default_params) + default_params.merge(file_per_database: true, + include_triggers: false) end - it { is_expected.to contain_file('mysqlbackup.sh').with( - :path => '/usr/local/sbin/mysqlbackup.sh', - :ensure => 'present' - ) } - - it 'should be able to backup events table' do + it 'skips backing up triggers when asked to skip' do is_expected.to contain_file('mysqlbackup.sh').with_content( - /EVENTS="--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 'should have a backup file for each database' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - /mysql | bzcat -zc \${DIR}\\\${PREFIX}mysql_`date'/ + %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --skip-triggers"}, ) end end - context 'with file per database' do + context 'with include_routines set to true' do let(:params) do - default_params.merge({ :file_per_database => true }) - end - - it 'should loop through backup all databases' do - is_expected.to contain_file('mysqlbackup.sh').with_content(/.*SHOW DATABASES.*/) + default_params.merge(file_per_database: true, + include_routines: true) end - context 'with compression disabled' do - let(:params) do - default_params.merge({ :file_per_database => true, :backupcompress => false }) - end - - it 'should loop through backup all databases without compression' do - is_expected.to contain_file('mysqlbackup.sh').with_content( - /.*SHOW DATABASES.*/ - ) - is_expected.to contain_file('mysqlbackup.sh').without_content( - /.*bzcat -zc.*/ - ) - end - end - end - - context 'with postscript' do - let(:params) do - default_params.merge({ :postscript => 'rsync -a /tmp backup01.local-lan:' }) - end - - it 'should be add postscript' do + it 'backups routines when asked' do is_expected.to contain_file('mysqlbackup.sh').with_content( - /rsync -a \/tmp backup01.local-lan:/ + %r{ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --routines"}, ) end end - context 'with postscripts' do + context 'with include_routines set to false' do let(:params) do - default_params.merge({ :postscript => [ - 'rsync -a /tmp backup01.local-lan:', - 'rsync -a /tmp backup02.local-lan:', - ]}) + default_params.merge(file_per_database: true, + include_triggers: true) end - it 'should be add postscript' do + it 'skips backing up routines when asked to skip' do is_expected.to contain_file('mysqlbackup.sh').with_content( - /.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*/ + %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 end end + # rubocop:enable RSpec/NestedGroups end
--- a/modules/mysql/spec/classes/mysql_server_monitor_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_server_monitor_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,35 +1,36 @@ require 'spec_helper' describe 'mysql::server::monitor' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } - let :pre_condition do - "include 'mysql::server'" - end + 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 :default_params do + { + mysql_monitor_username: 'monitoruser', + mysql_monitor_password: 'monitorpass', + mysql_monitor_hostname: 'monitorhost', + } + end - let :params do - default_params - end + let :params do + default_params + end - it { is_expected.to contain_mysql_user('monitoruser@monitorhost')} + 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 + 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
--- a/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,43 +1,35 @@ require 'spec_helper' describe 'mysql::server::mysqltuner' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + context 'ensure => present' do + it { is_expected.to compile } + it { + is_expected.to contain_file('/usr/local/bin/mysqltuner') + } + end - context 'ensure => present' do - it { is_expected.to compile } - it { is_expected.to contain_staging__file('mysqltuner-v1.3.0').with({ - :source => 'https://github.com/major/MySQLTuner-perl/raw/v1.3.0/mysqltuner.pl', - }) - } - end + context 'ensure => absent' do + let(:params) { { ensure: 'absent' } } - 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 + 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_staging__file('mysqltuner-v1.2.0').with({ - :source => 'https://github.com/major/MySQLTuner-perl/raw/v1.2.0/mysqltuner.pl', - }) - } - end + context 'custom version' do + let(:params) { { version: 'v1.2.0' } } - context 'custom source' do - let(:params) {{ :source => '/tmp/foo' }} - it { is_expected.to compile } - it { is_expected.to contain_staging__file('mysqltuner-/tmp/foo').with({ - :source => '/tmp/foo', - }) - } - end - end - end + 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
--- a/modules/mysql/spec/classes/mysql_server_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/classes/mysql_server_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,163 +1,256 @@ require 'spec_helper' describe 'mysql::server' do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } + 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 } } - 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') } + 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 } } - context 'with remove_default_accounts set' do - let(:params) {{ :remove_default_accounts => true }} - it { is_expected.to contain_class('mysql::server::account_security') } + 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::install' do - it 'contains the package by default' do - is_expected.to contain_package('mysql-server').with({ - :ensure => :present, - }) + 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 }} + 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 }} + 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_exec('mysql_install_db') } - end - end - - context 'mysql::server::service' do - context 'with defaults' do - it { is_expected.to contain_service('mysqld') } - end + let(:params) { { override_options: { 'mysqld' => { 'datadir' => '/tmp' } } } } - context 'service_enabled set to false' do - let(:params) {{ :service_enabled => false }} - - it do - is_expected.to contain_service('mysqld').with({ - :ensure => :stopped - }) - 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') } + 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' } } } } - context 'mysql::server::root_password' do - describe 'when defaults' do - 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') } + 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 - 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') } + 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 - 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 + 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' } } - context 'mysql::server::providers' do - describe 'with users' do - let(:params) {{:users => { + 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' + 'password_hash' => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF', }, - 'foo2@localhost' => {} - }}} - 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 => '' - )} + 'foo2@localhost' => {}, + } } end - describe 'with grants' do - let(:params) {{:grants => { + 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"], + 'privileges' => ['SELECT', 'UPDATE'], + 'options' => ['GRANT'], }, 'foo2@localhost/*.*' => { 'user' => 'foo2@localhost', 'table' => '*.*', - 'privileges' => ["SELECT"], + 'privileges' => ['SELECT'], }, - }}} - 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) {{:databases => { + 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' => {} - }}} - it { is_expected.to contain_mysql_database('somedb').with( - :charset => 'latin1', - :collate => 'latin1' - )} - it { is_expected.to contain_mysql_database('somedb2')} + '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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/default_facts.yml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,8 @@ +# 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" +ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" +is_pe: false +macaddress: "AA:AA:AA:AA:AA:AA"
--- a/modules/mysql/spec/defines/mysql_db_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/defines/mysql_db_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,74 +1,81 @@ require 'spec_helper' -describe 'mysql::db', :type => :define do - on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms| - pe_platforms.each do |pe_platform,facts| - describe "on #{pe_version} #{pe_platform}" do - let(:facts) { facts } +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(:title) { 'test_db' } + let(:params) do + { 'user' => 'testuser', + 'password' => 'testpass', + 'mysql_exec_path' => '' } + end - let(:params) { - { 'user' => 'testuser', - 'password' => 'testpass', - } - } + 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 'should report an error when ensure is not present or absent' do - params.merge!({'ensure' => 'invalid_val'}) - expect { subject }.to raise_error(Puppet::Error, - /invalid_val is not supported for ensure\. Allowed values are 'present' and 'absent'\./) - end - - it 'should 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 'should subscribe to database if sql script is given' do - params.merge!({'sql' => 'test_sql'}) - 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 'should only 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 'should import sql script on creation if enforcing' do - params.merge!({'sql' => 'test_sql', 'enforce_sql' => true}) - is_expected.to contain_exec('test_db-import').with_refreshonly(false) - 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 'should import sql scripts when more than one is specified' do - params.merge!({'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 '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 'should report an error if sql isn\'t a string or an array' do - params.merge!({'sql' => {'foo' => 'test_sql', 'bar' => 'test_2_sql'}}) - expect { subject }.to raise_error(Puppet::Error, - /\$sql must be either a string or an array\./) - 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 'should not create database and database user' 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 'should create 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 'should use dbname parameter as database name instead of name' do - params.merge!({'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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/functions/mysql_normalise_and_deepmerge_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,92 @@ +require 'spec_helper' + +describe 'mysql::normalise_and_deepmerge' do + it 'exists' do + is_expected.not_to eq(nil) + end + + it 'throws error with no arguments' do + is_expected.to run.with_params.and_raise_error(Puppet::ParseError) + end + + it 'throws error with only one argument' do + is_expected.to run.with_params('one' => 1).and_raise_error(Puppet::ParseError) + end + + it 'accepts empty strings as puppet undef' do + is_expected.to run.with_params({}, '') + end + + # rubocop:disable RSpec/NamedSubject + index_values = ['one', 'two', 'three'] + expected_values_one = ['1', '2', '2'] + it 'merge two hashes' do + new_hash = subject.execute({ 'one' => '1', 'two' => '1' }, 'two' => '2', 'three' => '2') + index_values.each_with_index do |index, expected| + expect(new_hash[index]).to eq(expected_values_one[expected]) + end + end + + it 'merges multiple hashes' do + hash = subject.execute({ 'one' => 1 }, { 'one' => '2' }, 'one' => '3') + expect(hash['one']).to eq('3') + end + + it 'accepts empty hashes' do + is_expected.to run.with_params({}, {}, {}).and_return({}) + end + + expected_values_two = [1, 2, 'four' => 4] + it 'merges subhashes' do + hash = subject.execute({ 'one' => 1 }, 'two' => 2, 'three' => { 'four' => 4 }) + index_values.each_with_index do |index, expected| + expect(hash[index]).to eq(expected_values_two[expected]) + end + end + + it 'appends to subhashes' do + hash = subject.execute({ 'one' => { 'two' => 2 } }, 'one' => { 'three' => 3 }) + expect(hash['one']).to eq('two' => 2, 'three' => 3) + end + + expected_values_three = [1, 'dos', { 'four' => 4, 'five' => 5 }] + it 'appends to subhashes 2' do + hash = subject.execute({ 'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, 'two' => 'dos', 'three' => { 'five' => 5 }) + index_values.each_with_index do |index, expected| + expect(hash[index]).to eq(expected_values_three[expected]) + end + end + + index_values_two = ['key1', 'key2'] + expected_values_four = [{ 'a' => 1, 'b' => 99 }, 'c' => 3] + it 'appends to subhashes 3' do + hash = subject.execute({ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, 'key1' => { 'b' => 99 }) + index_values_two.each_with_index do |index, expected| + expect(hash[index]).to eq(expected_values_four[expected]) + end + end + + it 'equates keys mod dash and underscore #value' do + hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10) + expect(hash['a_b_c']).to eq(10) + end + it 'equates keys mod dash and underscore #not' do + hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10) + expect(hash).not_to have_key('a-b-c') + end + + index_values_three = ['a_b_c', 'b-c-d'] + expected_values_five = [10, { 'e-f-g' => 3, 'c_d_e' => 12 }] + index_values_error = ['a-b-c', 'b_c_d'] + index_values_three.each_with_index do |index, expected| + it 'keeps style of the last when keys are equal mod dash and underscore #value' do + hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 }) + expect(hash[index]).to eq(expected_values_five[expected]) + end + it 'keeps style of the last when keys are equal mod dash and underscore #not' do + hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 }) + expect(hash).not_to have_key(index_values_error[expected]) + end + end + # rubocop:enable RSpec/NamedSubject +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/functions/mysql_password_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,31 @@ +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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/functions/mysql_strip_hash_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,27 @@ +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
--- a/modules/mysql/spec/spec.opts Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ ---format -s ---colour ---loadby -mtime ---backtrace
--- a/modules/mysql/spec/spec_helper.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/spec_helper.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,10 +1,56 @@ require 'puppetlabs_spec_helper/module_spec_helper' -require 'puppet_facts' -include PuppetFacts -RSpec.configure do |c| - c.formatter = :documentation +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 -# The default set of platforms to test again. -ENV['UNIT_TEST_PLATFORMS'] = 'centos-6-x86_64 ubuntu-1404-x86_64' -PLATFORMS = ENV['UNIT_TEST_PLATFORMS'].split(' ') +# read default_facts and merge them over what is provided by facterdb +default_facts.each do |fact, value| + add_custom_fact fact, value +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 + RSpec::Puppet::Coverage.report!(0) + end +end + +# Ensures that a module is defined +# @param module_name Name of the module +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'
--- a/modules/mysql/spec/spec_helper_acceptance.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/spec_helper_acceptance.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,43 +1,82 @@ -require 'beaker-rspec' +# frozen_string_literal: true + +require 'serverspec' +require 'puppet_litmus' +require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb')) +include PuppetLitmus -UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ] +if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost' + puts 'Running tests against this machine !' + if Gem.win_platform? + set :backend, :cmd + else + set :backend, :exec + end +else + # load inventory + inventory_hash = inventory_hash_from_inventory_file + node_config = config_from_node(inventory_hash, ENV['TARGET_HOST']) -unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' - # This will install the latest available package on el and deb based - # systems fail on windows and osx, and install via gem on other *nixes - foss_opts = { :default_action => 'gem_install' } + if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes') + host = ENV['TARGET_HOST'] + set :backend, :docker + set :docker_container, host + elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes') + set :backend, :ssh + options = Net::SSH::Config.for(host) + options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil? + options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil? + options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil? + options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil? + # Support both net-ssh 4 and 5. + # rubocop:disable Metrics/BlockNesting + options[:verify_host_key] = if node_config.dig('ssh', 'host-key-check').nil? + # Fall back to SSH behavior. This variable will only be set in net-ssh 5.3+. + if @strict_host_key_checking.nil? || @strict_host_key_checking + Net::SSH::Verifiers::Always.new + else + # SSH's behavior with StrictHostKeyChecking=no: adds new keys to known_hosts. + # If known_hosts points to /dev/null, then equivalent to :never where it + # accepts any key beacuse they're all new. + Net::SSH::Verifiers::AcceptNewOrLocalTunnel.new + end + elsif node_config.dig('ssh', 'host-key-check') + if defined?(Net::SSH::Verifiers::Always) + Net::SSH::Verifiers::Always.new + else + Net::SSH::Verifiers::Secure.new + end + elsif defined?(Net::SSH::Verifiers::Never) + Net::SSH::Verifiers::Never.new + else + Net::SSH::Verifiers::Null.new + end + # rubocop:enable Metrics/BlockNesting + host = if ENV['TARGET_HOST'].include?(':') + ENV['TARGET_HOST'].split(':').first + else + ENV['TARGET_HOST'] + end + set :host, options[:host_name] || host + set :ssh_options, options + set :request_pty, true + elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes') + require 'winrm' - if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end + set :backend, :winrm + set :os, family: 'windows' + user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil? + pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil? + endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman" - hosts.each do |host| - on hosts, "mkdir -p #{host['distmoduledir']}" + opts = { + user: user, + password: pass, + endpoint: endpoint, + operation_timeout: 300, + } + + winrm = WinRM::Connection.new opts + Specinfra.configuration.winrm = winrm end end - -RSpec.configure do |c| - # Project root - proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) - - # Readable test descriptions - c.formatter = :documentation - - # Configure all nodes in nodeset - c.before :suite do - # Install module and dependencies - puppet_module_install(:source => proj_root, :module_name => 'mysql') - hosts.each do |host| - # Required for binding tests. - if fact('osfamily') == 'RedHat' - version = fact("operatingsystemmajrelease") - shell("yum localinstall -y http://yum.puppetlabs.com/puppetlabs-release-el-#{version}.noarch.rpm") - if fact('operatingsystemmajrelease') =~ /7/ || fact('operatingsystem') =~ /Fedora/ - shell("yum install -y bzip2") - end - end - - shell("/bin/touch #{default['puppetpath']}/hiera.yaml") - on host, puppet('module install puppetlabs-stdlib --version 3.2.0'), { :acceptable_exit_codes => [0,1] } - on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] } - end - end -end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/spec_helper_acceptance_local.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +def pre_run + apply_manifest("class { 'mysql::server': root_password => 'password' }", catch_failures: true) +end + +def mysql_version + shell_output = run_shell('mysql --version', expect_failures: true) + if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil? + pre_run + shell_output = run_shell('mysql --version') + raise _('unable to get mysql version') if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil? + end + mysql_version = shell_output.stdout.match(%r{\d+\.\d+\.\d+})[0] + mysql_version +end + +RSpec.configure do |c| + c.before :suite do + if os[:family] == 'debian' || os[:family] == 'ubuntu' + # needed for the puppet fact + apply_manifest("package { 'lsb-release': ensure => installed, }", expect_failures: false) + end + # needed for the grant tests, not installed on el7 docker images + apply_manifest("package { 'which': ensure => installed, }", expect_failures: false) + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/spec_helper_local.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,31 @@ +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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/unit/facter/mysql_server_id_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,36 @@ +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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/unit/facter/mysql_version_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,19 @@ +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::Core::Execution.stubs(:which).returns('fake_mysql_path') + 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/spec/unit/facter/mysqld_version_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,19 @@ +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::Core::Execution.stubs(:which).with('mysqld').returns('/usr/sbin/mysqld') + 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
--- a/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -#! /usr/bin/env ruby -S rspec - -require 'spec_helper' - -describe Puppet::Parser::Functions.function(:mysql_deepmerge) do - let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - - describe 'when calling mysql_deepmerge from puppet' do - it "should not compile when no arguments are passed" do - skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ - Puppet[:code] = '$x = mysql_deepmerge()' - expect { - scope.compiler.compile - }.to raise_error(Puppet::ParseError, /wrong number of arguments/) - end - - it "should not compile when 1 argument is passed" do - skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ - Puppet[:code] = "$my_hash={'one' => 1}\n$x = mysql_deepmerge($my_hash)" - expect { - scope.compiler.compile - }.to raise_error(Puppet::ParseError, /wrong number of arguments/) - end - end - - describe 'when calling mysql_deepmerge on the scope instance' do - it 'should require all parameters are hashes' do - expect { new_hash = scope.function_mysql_deepmerge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/) - expect { new_hash = scope.function_mysql_deepmerge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/) - end - - it 'should accept empty strings as puppet undef' do - expect { new_hash = scope.function_mysql_deepmerge([{}, ''])}.not_to raise_error - end - - it 'should be able to mysql_deepmerge two hashes' do - new_hash = scope.function_mysql_deepmerge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}]) - expect(new_hash['one']).to eq('1') - expect(new_hash['two']).to eq('2') - expect(new_hash['three']).to eq('2') - end - - it 'should mysql_deepmerge multiple hashes' do - hash = scope.function_mysql_deepmerge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}]) - expect(hash['one']).to eq('3') - end - - it 'should accept empty hashes' do - expect(scope.function_mysql_deepmerge([{},{},{}])).to eq({}) - end - - it 'should mysql_deepmerge subhashes' do - hash = scope.function_mysql_deepmerge([{'one' => 1}, {'two' => 2, 'three' => { 'four' => 4 } }]) - expect(hash['one']).to eq(1) - expect(hash['two']).to eq(2) - expect(hash['three']).to eq({ 'four' => 4 }) - end - - it 'should append to subhashes' do - hash = scope.function_mysql_deepmerge([{'one' => { 'two' => 2 } }, { 'one' => { 'three' => 3 } }]) - expect(hash['one']).to eq({ 'two' => 2, 'three' => 3 }) - end - - it 'should append to subhashes 2' do - hash = scope.function_mysql_deepmerge([{'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, {'two' => 'dos', 'three' => { 'five' => 5 } }]) - expect(hash['one']).to eq(1) - expect(hash['two']).to eq('dos') - expect(hash['three']).to eq({ 'four' => 4, 'five' => 5 }) - end - - it 'should append to subhashes 3' do - hash = scope.function_mysql_deepmerge([{ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } }]) - expect(hash['key1']).to eq({ 'a' => 1, 'b' => 99 }) - expect(hash['key2']).to eq({ 'c' => 3 }) - end - - it 'should equate keys mod dash and underscore' do - hash = scope.function_mysql_deepmerge([{ 'a-b-c' => 1 } , { 'a_b_c' => 10 }]) - expect(hash['a_b_c']).to eq(10) - expect(hash).not_to have_key('a-b-c') - end - - it 'should keep style of the last when keys are euqal mod dash and underscore' do - hash = scope.function_mysql_deepmerge([{ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 }} , { 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 } }]) - expect(hash['a_b_c']).to eq(10) - expect(hash).not_to have_key('a-b-c') - expect(hash['b-c-d']).to eq({ 'e-f-g' => 3, 'c_d_e' => 12 }) - expect(hash).not_to have_key('b_c_d') - end - end -end
--- a/modules/mysql/spec/unit/puppet/functions/mysql_password_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/functions/mysql_password_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,32 +1,36 @@ require 'spec_helper' describe 'the mysql_password function' do - before :all do + before :all do # rubocop:disable RSpec/BeforeAfterAll Puppet::Parser::Functions.autoloader.loadall end let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - it 'should exist' do + it 'exists' do expect(Puppet::Parser::Functions.function('mysql_password')).to eq('function_mysql_password') end - it 'should raise a ParseError if there is less than 1 arguments' do - expect { scope.function_mysql_password([]) }.to( raise_error(Puppet::ParseError)) + it 'raises a ParseError if there is less than 1 arguments' do + expect { scope.function_mysql_password([]) }.to(raise_error(Puppet::ParseError)) end - it 'should raise a ParseError if there is more than 1 arguments' do - expect { scope.function_mysql_password(%w(foo bar)) }.to( raise_error(Puppet::ParseError)) + 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 'should convert password into a hash' do - result = scope.function_mysql_password(%w(password)) + it 'converts password into a hash' do + result = scope.function_mysql_password(['password']) expect(result).to(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19')) end - - it 'should convert an empty password into a empty string' do - result = scope.function_mysql_password([""]) + + 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
--- a/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,9 +1,17 @@ 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 @@ -12,37 +20,24 @@ performance_schema test SQL_OUTPUT + # rubocop:enable Layout/IndentHeredoc end - let(:parsed_databases) { %w(information_schema mydb mysql performance_schema test) } - - let(:resource) { Puppet::Type.type(:mysql_database).new( - { :ensure => :present, - :charset => 'latin1', - :collate => 'latin1_swedish_ci', - :name => 'new_database', - :provider => described_class.name - } - )} - let(:provider) { resource.provider } - 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).with([defaults_file, '-NBe', 'show databases']).returns('new_database') - provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'", 'new_database']).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") + 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 - let(:instance) { provider.class.instances.first } - describe 'self.instances' do it 'returns an array of databases' do - provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns(raw_databases) + provider.class.stubs(:mysql_caller).with('show databases', 'regular').returns(raw_databases) raw_databases.each_line do |db| - provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'", db.chomp]).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") + 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.collect {|x| x.name } + databases = provider.class.instances.map { |x| x.name } expect(parsed_databases).to match_array(databases) end end @@ -56,7 +51,7 @@ describe 'create' do it 'makes a database' do - provider.expects(:mysql).with([defaults_file, '-NBe', "create database if not exists `#{resource[:name]}` character set `#{resource[:charset]}` collate `#{resource[:collate]}`"]) + 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 @@ -64,7 +59,7 @@ describe 'destroy' do it 'removes a database if present' do - provider.expects(:mysql).with([defaults_file, '-NBe', "drop database if exists `#{resource[:name]}`"]) + 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 @@ -72,7 +67,7 @@ describe 'exists?' do it 'checks if database exists' do - expect(instance.exists?).to be_truthy + expect(instance).to be_exists end end @@ -95,9 +90,9 @@ describe 'charset=' do it 'changes the charset' do - provider.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET blah"]).returns('0') + provider.class.expects(:mysql_caller).with("alter database `#{resource[:name]}` CHARACTER SET blah", 'regular').returns('0') - provider.charset=('blah') + provider.charset = 'blah' end end @@ -109,10 +104,9 @@ describe 'collate=' do it 'changes the collate' do - provider.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{resource[:name]}` COLLATE blah"]).returns('0') + provider.class.expects(:mysql_caller).with("alter database `#{resource[:name]}` COLLATE blah", 'regular').returns('0') - provider.collate=('blah') + provider.collate = 'blah' end end - end
--- a/modules/mysql/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,27 +1,25 @@ require 'spec_helper' describe Puppet::Type.type(:mysql_plugin).provider(:mysql) do - let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' } - - let(:resource) { Puppet::Type.type(:mysql_plugin).new( - { :ensure => :present, - :soname => 'auth_socket.so', - :name => 'auth_socket', - :provider => described_class.name - } - )} 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).with([defaults_file, '-NBe', 'show plugins']).returns('auth_socket ACTIVE AUTHENTICATION auth_socket.so GPL') + provider.class.stubs(:mysql_caller).with('show plugins', 'regular').returns('auth_socket ACTIVE AUTHENTICATION auth_socket.so GPL') end - let(:instance) { provider.class.instances.first } - describe 'self.prefetch' do it 'exists' do provider.class.instances @@ -31,7 +29,7 @@ describe 'create' do it 'loads a plugin' do - provider.expects(:mysql).with([defaults_file, '-NBe', "install plugin #{resource[:name]} soname '#{resource[:soname]}'"]) + 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 @@ -39,7 +37,7 @@ describe 'destroy' do it 'unloads a plugin if present' do - provider.expects(:mysql).with([defaults_file, '-NBe', "uninstall plugin #{resource[:name]}"]) + provider.class.expects(:mysql_caller).with("uninstall plugin #{resource[:name]}", 'regular') provider.expects(:exists?).returns(false) expect(provider.destroy).to be_truthy end @@ -47,7 +45,7 @@ describe 'exists?' do it 'checks if plugin exists' do - expect(instance.exists?).to be_truthy + expect(instance).to be_exists end end @@ -67,5 +65,4 @@ expect(instance.soname).to eq('auth_socket.so') end end - end
--- a/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,7 +1,54 @@ 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 @@ -14,43 +61,101 @@ usvn_user@localhost @vagrant-ubuntu-raring-64 SQL_OUTPUT + # rubocop:enable Layout/IndentHeredoc end - let(:parsed_users) { %w(root@127.0.0.1 root@::1 @localhost debian-sys-maint@localhost root@localhost usvn_user@localhost @vagrant-ubuntu-raring-64) } - - let(:resource) { 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 - } - )} + 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).with([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"]).returns('joe@localhost') - provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = 'joe@localhost'"]).returns('10 10 10 10 *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4') + 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 - let(:instance) { provider.class.instances.first } - describe 'self.instances' do - it 'returns an array of users' do - provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"]).returns(raw_users) - parsed_users.each do |user| - provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'"]).returns('10 10 10 10 ') + 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 - - usernames = provider.class.instances.collect {|x| x.name } - expect(parsed_users).to match_array(usernames) + 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 @@ -63,8 +168,18 @@ describe 'create' do it 'makes a user' do - provider.expects(:mysql).with([defaults_file, '-e', "CREATE USER 'joe'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'"]) - provider.expects(:mysql).with([defaults_file, '-e', "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"]) + 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 @@ -72,15 +187,45 @@ describe 'destroy' do it 'removes a user if present' do - provider.expects(:mysql).with([defaults_file, '-e', "DROP USER 'joe'@'localhost'"]) + 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.exists?).to be_truthy + 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 @@ -102,30 +247,148 @@ end describe 'password_hash=' do - it 'changes the hash' do - provider.expects(:mysql).with([defaults_file, '-e', "SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'"]).returns('0') + 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') + 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 - ['max_user_connections', 'max_connections_per_hour', 'max_queries_per_hour', - 'max_updates_per_hour'].each do |property| + 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_sym)).to eq('10') + expect(instance.send(property.to_s.to_sym)).to eq('10') end end describe "#{property}=" do it "changes #{property}" do - provider.expects(:mysql).with([defaults_file, '-e', "GRANT USAGE ON *.* TO 'joe'@'localhost' WITH #{property.upcase} 42"]).returns('0') + 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
--- a/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,29 +1,25 @@ 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') } - before :each do - @user = Puppet::Type.type(:mysql_database).new(:name => 'test', :charset => 'utf8', :collate => 'utf8_blah_ci') - end - - it 'should accept a database name' do - expect(@user[:name]).to eq('test') + it 'accepts a database name' do + expect(user[:name]).to eq('test') end - it 'should accept a charset' do - @user[:charset] = 'latin1' - expect(@user[:charset]).to eq('latin1') + it 'accepts a charset' do + user[:charset] = 'latin1' + expect(user[:charset]).to eq('latin1') end - it 'should accept a collate' do - @user[:collate] = 'latin1_swedish_ci' - expect(@user[:collate]).to eq('latin1_swedish_ci') + it 'accepts a collate' do + user[:collate] = 'latin1_swedish_ci' + expect(user[:collate]).to eq('latin1_swedish_ci') end - it 'should require a name' do + 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
--- a/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,74 +1,102 @@ 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') } - before :each do - @user = Puppet::Type.type(:mysql_grant).new(:name => 'foo@localhost/*.*', :privileges => ['ALL', 'PROXY'], :table => ['*.*','@'], :user => 'foo@localhost') + it 'accepts a grant name' do + expect(user[:name]).to eq('foo@localhost/*.*') end - it 'should accept a grant name' do - expect(@user[:name]).to eq('foo@localhost/*.*') + it 'accepts ALL privileges' do + user[:privileges] = 'ALL' + expect(user[:privileges]).to eq(['ALL']) end - - it 'should accept ALL privileges' do - @user[:privileges] = 'ALL' - expect(@user[:privileges]).to eq(['ALL']) + + 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 - it 'should accept PROXY privilege' do - @user[:privileges] = 'PROXY' - expect(@user[:privileges]).to eq(['PROXY']) + 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 'should accept a table' do - @user[:table] = '*.*' - expect(@user[:table]).to eq('*.*') + + it 'accepts a table' do + user[:table] = '*.*' + expect(user[:table]).to eq('*.*') end - - it 'should accept @ for table' do - @user[:table] = '@' - expect(@user[:table]).to eq('@') + + it 'accepts @ for table' do + user[:table] = '@' + expect(user[:table]).to eq('@') end - - it 'should accept a user' do - @user[:user] = 'foo@localhost' - expect(@user[:user]).to eq('foo@localhost') + + it 'accepts proxy user for table' do + user[:table] = 'proxy_user@proxy_host' + expect(user[:table]).to eq('proxy_user@proxy_host') end - - it 'should require a name' do + + 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 'should require the name to match the user and table' do + it 'requires the name to match the user and table #general' do expect { - Puppet::Type.type(:mysql_grant).new(:name => 'foo', :privileges => ['ALL', 'PROXY'], :table => ['*.*','@'], :user => 'foo@localhost') - }.to raise_error /name must match user and table parameters/ + 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{mysql_grant: `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', 'PROXY'] ) - expect(@user[:privileges]).to eq(['ALL']) + 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']) + 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)']) + 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
--- a/modules/mysql/spec/unit/puppet/type/mysql_plugin_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/type/mysql_plugin_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,24 +1,20 @@ 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') } - before :each do - @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 'should accept a plugin name' do - expect(@plugin[:name]).to eq('test') + it 'accepts a library name' do + plugin[:soname] = 'test.so' + expect(plugin[:soname]).to eq('test.so') end - it 'should accept a library name' do - @plugin[:soname] = 'test.so' - expect(@plugin[:soname]).to eq('test.so') - end - - it 'should require a name' do + 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
--- a/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -1,107 +1,136 @@ 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 'should fail with a long user name' do - expect { - Puppet::Type.type(:mysql_user).new({:name => '12345678901234567@localhost', :password_hash => 'pass'}) - }.to raise_error /MySQL usernames are limited to a maximum of 16 characters/ + 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 - it 'should require a name' do + 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 - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => 'foo@localhost', :password_hash => 'pass') + 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 'should accept a user name' do - expect(@user[:name]).to eq('foo@localhost') + it 'accepts a password' do + user[:password_hash] = 'foo' + expect(user[:password_hash]).to eq('foo') end - it 'should accept a password' do - @user[:password_hash] = 'foo' - expect(@user[:password_hash]).to eq('foo') + it 'accepts an empty password' do + user[:password_hash] = '' + expect(user[:password_hash]).to eq('') end end context 'using foo@LocalHost' do - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => 'foo@LocalHost', :password_hash => 'pass') + 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 - it 'should lowercase the user name' do - expect(@user[:name]).to eq('foo@localhost') + 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 - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => 'allo_wed$char@localhost', :password_hash => 'pass') - end + let(:user) { Puppet::Type.type(:mysql_user).new(name: 'allo_wed$char@localhost', password_hash: 'pass') } - it 'should accept a user name' do - expect(@user[:name]).to eq('allo_wed$char@localhost') + 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 - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => '\'debian-sys-maint\'@localhost', :password_hash => 'pass') - end + let(:user) { Puppet::Type.type(:mysql_user).new(name: '\'debian-sys-maint\'@localhost', password_hash: 'pass') } - it 'should accept a user name' do - expect(@user[:name]).to eq('\'debian-sys-maint\'@localhost') + 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 - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => '"debian-sys-maint"@localhost', :password_hash => 'pass') - end + let(:user) { Puppet::Type.type(:mysql_user).new(name: '"debian-sys-maint"@localhost', password_hash: 'pass') } - it 'should accept a user name' do - expect(@user[:name]).to eq('"debian-sys-maint"@localhost') + 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 - it 'should fail with a size error' 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 /MySQL usernames are limited to a maximum of 16 characters/ + 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 - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => '`speci!al#`@localhost', :password_hash => 'pass') - end + let(:user) { Puppet::Type.type(:mysql_user).new(name: '`speci!al#`@localhost', password_hash: 'pass') } - it 'should accept a quoted user name with special chatracters' do - expect(@user[:name]).to eq('`speci!al#`@localhost') + 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 - before :each do - @user = Puppet::Type.type(:mysql_user).new(:name => 'in-valid@localhost', :password_hash => 'pass') - end + let(:user) { Puppet::Type.type(:mysql_user).new(name: 'in-valid@localhost', password_hash: 'pass') } - it 'should accept a user name with special chatracters' do - expect(@user[:name]).to eq('in-valid@localhost') + 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 'should fail with a misquoted username is used' 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 /Invalid database user "misquoted@localhost/ + 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/tasks/export.json Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,22 @@ +{ + "description": "Allows you to backup your database to local file.", + "input_method": "stdin", + "parameters": { + "database": { + "description": "Database to connect to", + "type": "Optional[String[1]]" + }, + "user": { + "description": "The user", + "type": "Optional[String[1]]" + }, + "password": { + "description": "The password", + "type": "Optional[String[1]]" + }, + "file": { + "description": "Path to file you want backup to", + "type": "String[1]" + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/tasks/export.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,30 @@ +#!/opt/puppetlabs/puppet/bin/ruby +require 'json' +require 'open3' +require 'puppet' + +def get(file, database, user, password) + cmd_string = 'mysqldump' + cmd_string << " --databases #{database}" unless database.nil? + 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 + { status: stdout.strip } +end + +params = JSON.parse(STDIN.read) +database = params['database'] +user = params['user'] +password = params['password'] +file = params['file'] + +begin + result = get(file, database, user, password) + puts result.to_json + exit 0 +rescue Puppet::Error => e + puts({ status: 'failure', error: e.message }.to_json) + exit 1 +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/tasks/sql.json Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,22 @@ +{ + "description": "Allows you to execute arbitary SQL", + "input_method": "stdin", + "parameters": { + "database": { + "description": "Database to connect to", + "type": "Optional[String[1]]" + }, + "user": { + "description": "The user", + "type": "Optional[String[1]]" + }, + "password": { + "description": "The password", + "type": "Optional[String[1]]" + }, + "sql": { + "description": "The SQL you want to execute", + "type": "String[1]" + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/tasks/sql.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,29 @@ +#!/opt/puppetlabs/puppet/bin/ruby +require 'json' +require 'open3' +require 'puppet' + +def get(sql, database, user, password) + cmd = ['mysql', '-e', "#{sql} "] + cmd << "--database=#{database}" unless database.nil? + cmd << "--user=#{user}" unless user.nil? + cmd << "--password=#{password}" unless password.nil? + 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) +database = params['database'] +user = params['user'] +password = params['password'] +sql = params['sql'] + +begin + result = get(sql, database, user, password) + puts result.to_json + exit 0 +rescue Puppet::Error => e + puts({ status: 'failure', error: e.message }.to_json) + exit 1 +end
--- a/modules/mysql/templates/my.cnf.erb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/templates/my.cnf.erb Sun Dec 29 15:31:28 2019 +0000 @@ -6,7 +6,7 @@ <% v.sort.map do |ki, vi| -%> <% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) -%> <% next %> -<% elsif vi == true or v == '' -%> +<% elsif vi == true or vi == '' -%> <%= ki %> <% elsif vi.is_a?(Array) -%> <% vi.each do |vii| -%>
--- a/modules/mysql/templates/my.cnf.pass.erb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/templates/my.cnf.pass.erb Sun Dec 29 15:31:28 2019 +0000 @@ -1,7 +1,11 @@ -[client] +### MANAGED BY PUPPET ### + +<% %w(mysql client mysqldump mysqladmin mysqlcheck).each do |section| %> +[<%= section -%>] user=root host=localhost <% unless scope.lookupvar('mysql::server::root_password') == 'UNSET' -%> password='<%= scope.lookupvar('mysql::server::root_password') %>' <% end -%> -socket=<%= @options['client']['socket'] -%> +socket=<%= @options['client']['socket'] %> +<% end %>
--- a/modules/mysql/templates/mysqlbackup.sh.erb Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/mysql/templates/mysqlbackup.sh.erb Sun Dec 29 15:31:28 2019 +0000 @@ -1,4 +1,8 @@ +<%- if @kernel == 'Linux' -%> #!/bin/bash +<%- else -%> +#!/bin/sh +<%- end -%> # # MySQL Backup Script # Dumps mysql databases to a file for another backup tool to pick up. @@ -12,26 +16,71 @@ USER=<%= @backupuser %> PASS='<%= @backuppassword %>' +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|%> +<%= script %> +<%- end -%> +<% end -%> + +# Ensure backup directory exist. +mkdir -p $DIR + PREFIX=mysql_backup_ <% if @ignore_events %> -EVENTS="--ignore-table=mysql.event" +ADDITIONAL_OPTIONS="--ignore-table=mysql.event" <% else %> -EVENTS="--events" +ADDITIONAL_OPTIONS="--events" <% end %> +<%# Only include routines or triggers if we're doing a file per database -%> +<%# backup. This happens if we named databases, or if we explicitly set -%> +<%# file per database mode -%> +<% if !@backupdatabases.empty? || @file_per_database -%> +<% if @include_triggers -%> +ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS --triggers" +<% else -%> +ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS --skip-triggers" +<% end -%> +<% if @include_routines -%> +ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS --routines" +<% else -%> +ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS --skip-routines" +<% end -%> +<% end -%> + +<%- if @optional_args and @optional_args.is_a?(Array) -%> +<%- @optional_args.each do |arg| -%> +ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS <%= arg %>" +<%- end -%> +<%- end -%> ##### STOP CONFIG #################################################### PATH=<%= @execpath %> +<%- if @kernel == 'Linux' -%> set -o pipefail +<%- end -%> cleanup() { - find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f +<%- 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 -%> @@ -40,21 +89,21 @@ <% end -%> <% if @backupdatabases.empty? -%> <% if @file_per_database -%> -mysql -u${USER} -p${PASS} -s -r -N -e 'SHOW DATABASES' | while read dbname +mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | while read dbname do - mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \ - ${EVENTS} \ + <%= @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 %> done <% else -%> -mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \ - ${EVENTS} \ +<%= @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 %> <% end -%> <% else -%> <% @backupdatabases.each do |db| -%> -mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \ - ${EVENTS} \ +<%= @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 %> <% end -%> <% end -%> @@ -62,6 +111,7 @@ <% unless @delete_before_dump -%> if [ $? -eq 0 ] ; then cleanup + touch <%= @backup_success_file_path %> fi <% end -%> @@ -70,3 +120,6 @@ <%= script %> <%- end -%> <% end -%> + +# Remove temporary file +rm -f $TMPFILE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/mysql/templates/xtrabackup.sh.erb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,71 @@ +<%- if @kernel == 'Linux' -%> +#!/bin/bash +<%- else -%> +#!/bin/sh +<%- end -%> +# +# A wrapper for Xtrabackup + +ROTATE=<%= [ Integer(@backuprotate) - 1, 0 ].max %> +DIR=<%= @backupdir %> + +# Ensure backup directory exist. +mkdir -p $DIR + +<%- if @kernel == 'Linux' -%> +set -o pipefail +<%- end -%> + +<% if @prescript -%> + <%- [@prescript].flatten.compact.each do |script| %> +<%= script %> + <%- end -%> +<% end -%> + + +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 -%> +cleanup +<% end -%> + + +<%- _innobackupex_args = '' -%> + +<%- if @backupuser and @backuppassword -%> + <%- _innobackupex_args = '--user="' + @backupuser + '" --password="' + @backuppassword + '"' -%> +<%- end -%> + +<%- if @backupdatabases and @backupdatabases.is_a?(Array) and !@backupdatabases.empty? -%> + <%- _innobackupex_args = _innobackupex_args + ' --databases="' + @backupdatabases.join(' ') + '"' -%> +<%- end -%> + +<%- if @optional_args and @optional_args.is_a?(Array) -%> + <%- @optional_args.each do |arg| -%> + <%- _innobackupex_args = _innobackupex_args + ' ' + arg -%> + <%- end -%> +<%- end -%> + +<%= @backupmethod -%> <%= _innobackupex_args %> $@ + + +<% unless @delete_before_dump -%> +if [ $? -eq 0 ] ; then + cleanup + touch <%= @backup_success_file_path %> +fi +<% end -%> + + +<% if @postscript -%> + <%- [@postscript].flatten.compact.each do |script| %> +<%= script %> + <%- end -%> +<% end -%>
--- a/modules/postfix/manifests/init.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/postfix/manifests/init.pp Sun Dec 29 15:31:28 2019 +0000 @@ -93,13 +93,13 @@ ensure => present, source => "puppet:///private/pki/custom/$mailserver.crt", owner => 'postfix', - mode => 600, + mode => '0600', } file { "/etc/pki/custom/$mailserver.key": ensure => present, source => "puppet:///private/pki/custom/$mailserver.key", owner => 'postfix', - mode => 600, + mode => '0600', } # Mail base dir @@ -107,7 +107,7 @@ ensure => directory, owner => 505, group => 505, - mode => 700, + mode => '0700', } #SPF checking
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/privat/manifests Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,1 @@ +../../private/manifests/ \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/privat/templates/apache Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,1 @@ +../../../private/apache/templates \ No newline at end of file
--- a/modules/private/manifests Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../../private/manifests/ \ No newline at end of file
--- a/modules/private/templates/apache Sun Dec 29 14:54:45 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../../../private/apache/templates \ No newline at end of file
--- a/modules/python/manifests/gunicorn/instance.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/python/manifests/gunicorn/instance.pp Sun Dec 29 15:31:28 2019 +0000 @@ -74,7 +74,7 @@ file { $initscript: ensure => $ensure, content => template($init_template), - mode => 744, + mode => '0744', require => File["/etc/logrotate.d/gunicorn-${name}"], }
--- a/modules/ssh/manifests/init.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/ssh/manifests/init.pp Sun Dec 29 15:31:28 2019 +0000 @@ -40,7 +40,7 @@ @file { "/etc/ssh/ssh_config": owner => "root", - mode => 644, + mode => '0644', require => Package["openssh-clients"], source => [ # @@ -68,7 +68,7 @@ @file { "/etc/ssh/sshd_config": owner => "root", - mode => 644, + mode => '0644', notify => Service["openssh-server"], require => Package["openssh-server"], source => [ @@ -108,7 +108,7 @@ # Include operatingsystem specific subclass case $::osfamily { - Redhat: { + 'Redhat': { include ssh::centos } default:{fail("Invalid OS type for SSH - $osfamily")}
--- a/modules/sudo/manifests/init.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/sudo/manifests/init.pp Sun Dec 29 15:31:28 2019 +0000 @@ -4,21 +4,21 @@ file { "/etc/sudoers.d/enable-wheel": owner => root, group => root, - mode => 440, + mode => '0440', source => "puppet:///modules/sudo/enable-wheel", require => Package["sudo"], } file { "/etc/sudoers.d/use-root-pwd": owner => root, group => root, - mode => 440, + mode => '0440', source => "puppet:///modules/sudo/use-root-pwd", require => Package["sudo"], } file { "/etc/sudoers.d/keep-editor": owner => root, group => root, - mode => 440, + mode => '0440', source => "puppet:///modules/sudo/keep-editor", require => Package["sudo"], }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/CHANGELOG.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,75 @@ +# Change log + +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). + +## [v2.1.0](https://github.com/puppetlabs/puppetlabs-translate/tree/v2.1.0) (2019-11-29) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-translate/compare/v2.0.0...v2.1.0) + +### Added + +- \(FM-8682\) - Addition of Support for CentOS 8 [\#59](https://github.com/puppetlabs/puppetlabs-translate/pull/59) ([david22swan](https://github.com/david22swan)) +- FM-8414 - Add support on Debian 10 [\#52](https://github.com/puppetlabs/puppetlabs-translate/pull/52) ([lionce](https://github.com/lionce)) + +## [v2.0.0](https://github.com/puppetlabs/puppetlabs-translate/tree/v2.0.0) (2019-06-13) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-translate/compare/1.2.0...v2.0.0) + +### Changed + +- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#39](https://github.com/puppetlabs/puppetlabs-translate/pull/39) ([david22swan](https://github.com/david22swan)) +- \(FM-7711\) - Remove Debian 7 testing/support for Translate module [\#31](https://github.com/puppetlabs/puppetlabs-translate/pull/31) ([david22swan](https://github.com/david22swan)) + +### Added + +- \(FM-8034\) Add RedHat 8 support [\#42](https://github.com/puppetlabs/puppetlabs-translate/pull/42) ([eimlav](https://github.com/eimlav)) +- \[FM-7939\] Puppet Strings [\#41](https://github.com/puppetlabs/puppetlabs-translate/pull/41) ([carabasdaniel](https://github.com/carabasdaniel)) +- \(FM-7720/FM-7722/FM-7723\) - Update to windows support [\#33](https://github.com/puppetlabs/puppetlabs-translate/pull/33) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#28](https://github.com/puppetlabs/puppetlabs-translate/pull/28) ([tphoney](https://github.com/tphoney)) + +## [1.2.0](https://github.com/puppetlabs/puppetlabs-translate/tree/1.2.0) (2018-09-27) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-translate/compare/1.1.0...1.2.0) + +### Added + +- Update metadata.json for Puppet 6 support [\#23](https://github.com/puppetlabs/puppetlabs-translate/pull/23) ([eimlav](https://github.com/eimlav)) +- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#22](https://github.com/puppetlabs/puppetlabs-translate/pull/22) ([pmcmaw](https://github.com/pmcmaw)) + +### Fixed + +- \(MODULES-7728\) - Reading beaker-hostgenerator and nokogiri gem [\#20](https://github.com/puppetlabs/puppetlabs-translate/pull/20) ([pmcmaw](https://github.com/pmcmaw)) + +## 1.1.0 +### Summary +A small addition release including a bump to the Puppet version requirements. + +#### Changed +- Updated the Puppet version to correctly reflect which version of Puppet includes the translation updates. + +#### Added +- Adding acceptance test directory along with several nodesets for testing. +- Addition of several files including maintainers, contributing and an update to existing Rakefiles and .travis files. + +## Supported Release [1.0.0] +### Summary +This is a feature release that includes support for interpolated strings. + +#### Added +- support for passing strings that use interpolation to the `translate` function + +#### Removed +- Debian 6 support + +## Supported Release [0.1.0] +### Summary +This is the initial release. + +[1.0.0]:https://github.com/puppetlabs/puppetlabs-translate/compare/0.1.0...1.0.0 +[0.1.0]:https://github.com/puppetlabs/puppetlabs-translate/commits/0.1.0 + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/CONTRIBUTING.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,271 @@ +# 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/Gemfile Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,73 @@ +source ENV['GEM_SOURCE'] || 'https://rubygems.org' + +def location_for(place_or_version, fake_version = nil) + git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?} + file_url_regex = %r{\Afile:\/\/(?<path>.*)} + + 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 "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] + gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] + gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "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 + +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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/HISTORY.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,27 @@ +## 1.1.0 +### Summary +A small addition release including a bump to the Puppet version requirements. + +#### Changed +- Updated the Puppet version to correctly reflect which version of Puppet includes the translation updates. + +#### Added +- Adding acceptance test directory along with several nodesets for testing. +- Addition of several files including maintainers, contributing and an update to existing Rakefiles and .travis files. + +## Supported Release [1.0.0] +### Summary +This is a feature release that includes support for interpolated strings. + +#### Added +- support for passing strings that use interpolation to the `translate` function + +#### Removed +- Debian 6 support + +## Supported Release [0.1.0] +### Summary +This is the initial release. + +[1.0.0]:https://github.com/puppetlabs/puppetlabs-translate/compare/0.1.0...1.0.0 +[0.1.0]:https://github.com/puppetlabs/puppetlabs-translate/commits/0.1.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/LICENSE Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/MAINTAINERS.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,6 @@ +## 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 `translate`.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/NOTICE Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,15 @@ +Puppet Module - puppetlabs-translate + +Copyright 2017 Puppet, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/README.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,38 @@ +# translate + +#### Table of Contents + +1. [Module Description - What the module does and why it is useful](#module-description) +2. [Setup - The basics of getting started with translate](#setup) +3. [Usage - Configuration options and additional functionality](#usage) +4. [Reference - An under-the-hood peek at what the module is doing and how](#reference) +5. [Limitations - OS compatibility, etc.](#limitations) +6. [Development - Guide for contributing to the module](#development) +7. [Contributors](#contributors) + +## Module description + +This module provides the `translate` function for Puppet. Wrapping a string in this function will mark it to be picked up by gettext and put into the .pot file for translation purposes. Currently, we are **only marking failures, errors, and warnings** in Puppet Supported modules. Feel free to do what you like with your own. + +## Setup + +Install this module with the Puppet Module Tool: +```shell +puppet module install puppetlabs-translate +``` + +## Reference + +For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-translate/blob/master/REFERENCE.md) + +## Limitations + +We do not yet support pluralization. + +## Development + +Puppet Labs 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 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. For more information, see our [module contribution guide.](https://puppet.com/docs/puppet/latest/contributing.html) + +## Contributors + +The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-translate/graphs/contributors](https://github.com/puppetlabs/puppetlabs-translate/graphs/contributors).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/REFERENCE.md Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,70 @@ +# Reference +<!-- DO NOT EDIT: This document was generated by Puppet Strings --> + +## Table of Contents + +**Functions** + +* [`translate`](#translate): A function that calls the _() function in gettext. This is because _ is protected in the puppet language + +## Functions + +### translate + +Type: Ruby 4.x API + +A function that calls the _() function in gettext. This is because _ is protected in the puppet language + +* **Note** Translate with simple strings: + - Takes in a string and passes it to fast_gettext's _() function. Primarily used for 'marking' a string to be added to a .pot file. +Translate with interpolation: + - Takes in a string and a hash. Please note that variables in the message are wrapped with %{VAR} not ${VAR}. + - The hash contains key value pairs with marker and the variable it will be assigned to. + - The translate module passes it to fast_gettext's _() function. Primarily used for 'marking' a string to be added to a .pot file. + +#### Examples + +##### + +```puppet +fail(translate("Failure message")) +``` + +##### + +```puppet +fail(translate('message is %{color}'), {'color' => 'green'}) +``` + +#### `translate(String $message, Optional[Hash] $interpolation_values)` + +The translate function. + +Returns: `String` translated message. + +##### Examples + +###### + +```puppet +fail(translate("Failure message")) +``` + +###### + +```puppet +fail(translate('message is %{color}'), {'color' => 'green'}) +``` + +##### `message` + +Data type: `String` + +Message to translate + +##### `interpolation_values` + +Data type: `Optional[Hash]` + +Optional. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/Rakefile Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,86 @@ +require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any? +require 'puppetlabs_spec_helper/rake_tasks' +require 'puppet-syntax/tasks/puppet-syntax' +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? + +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 + returnVal ||= begin + metadata_source = JSON.load(File.read('metadata.json'))['source'] + metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z}) + + metadata_source_match && metadata_source_match[1] + end + + raise "unable to find the changelog_project in .sync.yml or calculate it from the source 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 <<EOM +The changelog tasks depends on unreleased features of the github_changelog_generator gem. +Please manually add it to your .sync.yml for now, and run `pdk update`: +--- +Gemfile: + optional: + ':development': + - gem: 'github_changelog_generator' + git: 'https://github.com/skywinder/github-changelog-generator' + ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' + condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" +EOM + end +end +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/checksums.json Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,23 @@ +{ + "CHANGELOG.md": "f6d40db0689a9cfd01db12fc8ae8935c", + "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", + "Gemfile": "1a5466fcfc1a2f40765b4abc5ea9ad06", + "HISTORY.md": "bc835a1a781369ba8c24681bdeab99f1", + "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", + "MAINTAINERS.md": "86bc26eb48e3994809990c1b49907550", + "NOTICE": "002a2b26ef50234b43afb62fa62a7b97", + "README.md": "09280f1b45c4250155d52a18aed02f37", + "REFERENCE.md": "57ac27e3762372254a0096f6fbf896e4", + "Rakefile": "35791ec85225c70e7b5a891f1bbd1b87", + "distelli-manifest.yml": "802c79b810412726002fee5029900c5f", + "lib/puppet/functions/translate.rb": "6b42a479316b1565dfe94760160e92b6", + "locales/config.yaml": "b291ec1700c36f3b902b5b135b841260", + "metadata.json": "7582e96d48c554e05bc604685f11d332", + "provision.yaml": "a2b212e922a952511bec76365230ee65", + "spec/acceptance/spec_helper_acceptance.rb": "9681de54bf44c9c507adc13d12bada2a", + "spec/acceptance/translate_spec.rb": "55bdb32fe0a766b66c27d4fcc6551897", + "spec/default_facts.yml": "973bd7e9b429cde3c8d45d57c2fa21ed", + "spec/functions/translate_spec.rb": "8f12d2a05773d09fea17a064f16b4cf9", + "spec/spec_helper.rb": "ec40d36ed109d8dba0df527c34c2c6db", + "spec/spec_helper_local.rb": "be320849409fd3a6ae2a21c04701d88a" +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/distelli-manifest.yml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,25 @@ +team-modules/puppetlabs-translate: + PreBuild: + - source /opt/rh/rh-ruby25/enable + - echo "--- LETS update BUNDLER ---" + - bundle install --path vendor/bundle --jobs 3 + Build: + - echo "--- PROVISIONING ---" + - source /opt/rh/rh-ruby25/enable + - bundle exec rake litmus:provision_list[release_checks] + - cat inventory.yaml + - echo "--- AGENT INSTALLATION ---" + - bundle exec rake litmus:install_agent + - echo "--- MODULE INSTALLATION ---" + - bundle exec rake litmus:install_module + - echo "--- TESTS RUNNING ---" + - bundle exec rake litmus:acceptance:parallel + AfterBuildSuccess: + - source /opt/rh/rh-ruby25/enable + - bundle exec rake litmus:tear_down + AfterBuildFailure: + - source /opt/rh/rh-ruby25/enable + - bundle exec rake litmus:tear_down + CommitData: + - RepoType: Git + - RepoPath: .
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/lib/puppet/functions/translate.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,34 @@ +# @summary A function that calls the _() function in gettext. This is because _ is protected in the puppet language +# +# @note +# Translate with simple strings: +# - Takes in a string and passes it to fast_gettext's _() function. Primarily used for 'marking' a string to be added to a .pot file. +# Translate with interpolation: +# - Takes in a string and a hash. Please note that variables in the message are wrapped with %{VAR} not ${VAR}. +# - The hash contains key value pairs with marker and the variable it will be assigned to. +# - The translate module passes it to fast_gettext's _() function. Primarily used for 'marking' a string to be added to a .pot file. +# +# @example +# fail(translate("Failure message")) +# @example +# fail(translate('message is %{color}'), {'color' => 'green'}) +# +Puppet::Functions.create_function(:translate) do + # @param message Message to translate + # @param interpolation_values Optional. + # @return [String] translated message. + dispatch :translate do + param 'String', :message + optional_param 'Hash', :interpolation_values + end + + def translate(message, interpolation_values = nil) + if interpolation_values.nil? + _(message) + else + # convert keys to symbols + interpolation_values = Hash[interpolation_values.map { |k, v| [k.to_sym, v] }] + _(message) % interpolation_values + end + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/locales/config.yaml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,26 @@ +--- +# 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 <project_name>.pot? + project_name: puppetlabs-translate + # 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 + # <project_name> + package_name: puppetlabs-translate + # 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' +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/metadata.json Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,64 @@ +{ + "name": "puppetlabs-translate", + "version": "2.1.0", + "author": "puppetlabs", + "summary": "Puppet module that provides the translate() function for internationalization.", + "license": "Apache-2.0", + "source": "https://github.com/puppetlabs/puppetlabs-translate", + "project_page": "https://github.com/puppetlabs/puppetlabs-translate", + "issues_url": "https://github.com/puppetlabs/puppetlabs-translate/issues", + "dependencies": [ + + ], + "data_provider": null, + "operatingsystem_support": [ + { + "operatingsystem": "Debian", + "operatingsystemrelease": [ + "8", + "9", + "10" + ] + }, + { + "operatingsystem": "RedHat", + "operatingsystemrelease": [ + "5", + "6", + "7", + "8" + ] + }, + { + "operatingsystem": "CentOS", + "operatingsystemrelease": [ + "8" + ] + }, + { + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ + "14.04", + "16.04" + ] + }, + { + "operatingsystem": "Windows", + "operatingsystemrelease": [ + "2012", + "2016", + "2018", + "10" + ] + } + ], + "requirements": [ + { + "name": "puppet", + "version_requirement": ">= 5.5.10 < 7.0.0" + } + ], + "pdk-version": "1.14.1", + "template-url": "https://github.com/puppetlabs/pdk-templates#master", + "template-ref": "tags/1.14.1-0-g0b5b39b" +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/provision.yaml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,15 @@ +default: + provisioner: vmpooler + images: ['redhat-8-x86_64'] +travis_deb: + provisioner: docker + images: ['debian:8', 'debian:9', 'ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04'] +travis_el: + provisioner: docker + images: ['centos:6', 'centos:7', 'oraclelinux:6', 'oraclelinux:7', 'scientificlinux/sl:6', 'scientificlinux/sl:7'] +vagrant: + provisioner: vagrant + images: ['centos/7', 'generic/ubuntu1804', 'gusztavvargadr/windows-server'] +release_checks: + provisioner: vmpooler + images: ['debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1604-x86_64', 'redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-8-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'win-2008r2-x86_64', 'win-2016-core-x86_64', 'win-2012r2-core-x86_64', 'win-10-ent-x86_64']
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/spec/acceptance/spec_helper_acceptance.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,59 @@ +# frozen_string_literal: true + +require 'serverspec' +require 'puppet_litmus' +require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb')) +include PuppetLitmus + +if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost' + puts 'Running tests against this machine !' + if Gem.win_platform? + set :backend, :cmd + else + set :backend, :exec + end +else + # load inventory + inventory_hash = inventory_hash_from_inventory_file + node_config = config_from_node(inventory_hash, ENV['TARGET_HOST']) + + if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes') + host = ENV['TARGET_HOST'] + set :backend, :docker + set :docker_container, host + elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes') + set :backend, :ssh + options = Net::SSH::Config.for(host) + options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil? + options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil? + options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil? + options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil? + options[:verify_host_key] = Net::SSH::Verifiers::Null.new unless node_config.dig('ssh', 'host-key-check').nil? + host = if ENV['TARGET_HOST'].include?(':') + ENV['TARGET_HOST'].split(':').first + else + ENV['TARGET_HOST'] + end + set :host, options[:host_name] || host + set :ssh_options, options + set :request_pty, true + elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes') + require 'winrm' + + set :backend, :winrm + set :os, family: 'windows' + user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil? + pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil? + endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman" + + opts = { + user: user, + password: pass, + endpoint: endpoint, + operation_timeout: 300, + } + + winrm = WinRM::Connection.new opts + Specinfra.configuration.winrm = winrm + end +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/spec/acceptance/translate_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,3 @@ +describe 'an example' do + it 'is a pending example' +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/spec/default_facts.yml Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,8 @@ +# 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" +ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" +is_pe: false +macaddress: "AA:AA:AA:AA:AA:AA"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/spec/functions/translate_spec.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,10 @@ +require 'spec_helper' + +describe 'translate' do + it { is_expected.not_to eq nil } + it { is_expected.to run.with_params('test string') } + it { is_expected.to run.with_params(123).and_raise_error(ArgumentError) } + it { is_expected.to run.with_params('test string', 123).and_raise_error(ArgumentError) } + it { is_expected.to run.with_params('test %{interpolate_this}', 'interpolate_this' => 'ok').and_return('test ok') } + it { is_expected.to run.and_raise_error(ArgumentError) } +end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/spec/spec_helper.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,59 @@ +RSpec.configure do |c| + c.mock_with :rspec +end + +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 + +# read default_facts and merge them over what is provided by facterdb +default_facts.each do |fact, value| + add_custom_fact fact, value +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 + RSpec::Puppet::Coverage.report!(0) + end +end + +# Ensures that a module is defined +# @param module_name Name of the module +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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/translate/spec/spec_helper_local.rb Sun Dec 29 15:31:28 2019 +0000 @@ -0,0 +1,28 @@ +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
--- a/modules/vcs/manifests/init.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/vcs/manifests/init.pp Sun Dec 29 15:31:28 2019 +0000 @@ -9,6 +9,10 @@ ensure => installed, provider => 'pip', } + file { '/etc/bash_completion.d/git-prompt.sh': + ensure => 'link', + target => '/usr/share/git-core/contrib/completion/git-prompt.sh', + } } class vcs::client inherits vcs {
--- a/modules/website/manifests/https.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/website/manifests/https.pp Sun Dec 29 15:31:28 2019 +0000 @@ -106,7 +106,10 @@ $sslkey = "/etc/letsencrypt/live/${::fqdn}/privkey.pem" } - if $ssl_ca_chain != '' { + if $ssl_ca_chain == '' and '' in [$ssl_ca_chain] { + # Special case where we're directly under the CA and don't want to unnecessarily send the CA cert + $ssl_chain = undef + } elsif $ssl_ca_chain != undef { $ssl_chain = "/etc/pki/custom/$ssl_ca_chain" if ! defined(File[$ssl_chain]) { file { $ssl_chain: @@ -115,9 +118,6 @@ notify => Service['httpd'], } } - } elsif $ssl_ca_chain == '' and '' in [$ssl_ca_chain] { - # Special case where we're directly under the CA and don't want to unnecessarily send the CA cert - $ssl_chain = undef } elsif $letsencrypt_name != undef { $ssl_chain = "/etc/letsencrypt/live/${letsencrypt_name}/chain.pem" } else {
--- a/modules/website/manifests/https/redir.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/website/manifests/https/redir.pp Sun Dec 29 15:31:28 2019 +0000 @@ -71,7 +71,10 @@ $sslkey = "/etc/letsencrypt/live/${::fqdn}/privkey.pem" } - if $ssl_ca_chain != '' { + if $ssl_ca_chain == '' and '' in [$ssl_ca_chain] { + # Special case where we're directly under the CA and don't want to unnecessarily send the CA cert + $ssl_chain = undef + } elsif $ssl_ca_chain != undef { $ssl_chain = "/etc/pki/custom/$ssl_ca_chain" if ! defined(File[$ssl_chain]) { file { $ssl_chain: @@ -80,9 +83,6 @@ notify => Service['httpd'], } } - } elsif $ssl_ca_chain == '' and '' in [$ssl_ca_chain] { - # Special case where we're directly under the CA and don't want to unnecessarily send the CA cert - $ssl_chain = undef } elsif $letsencrypt_name != undef { $ssl_chain = "/etc/letsencrypt/live/${letsencrypt_name}/chain.pem" } else {
--- a/modules/website/manifests/init.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/website/manifests/init.pp Sun Dec 29 15:31:28 2019 +0000 @@ -66,6 +66,7 @@ file { $unused_default_mods: ensure => file, content => '', + require => Class['apache'], } file { $base_dir: @@ -80,42 +81,49 @@ ensure => directory, recurse => true, source => "puppet:///modules/website/conf.extra", + require => Class['apache'], notify => Service['httpd']; } file { '/etc/httpd/conf/mime.types': ensure => present, source => "puppet:///modules/website/mime.types", + require => Class['apache'], notify => Service['httpd']; } file { '/etc/php.d/datetime.ini': ensure => present, source => "puppet:///modules/website/datetime.ini", + require => Class['apache'], notify => Service['httpd']; } file { '/etc/httpd/conf.d/zzz-custom.conf': ensure => absent, + require => Class['apache'], notify => Service['httpd']; } file { '/etc/httpd/conf.d/zzz-0-custom.conf': ensure => present, source => "puppet:///modules/website/zzz-0-custom.conf", + require => Class['apache'], notify => Service['httpd']; } file { '/etc/httpd/conf.d/php.conf': ensure => present, source => "puppet:///modules/website/php.conf", + require => Class['apache'], notify => Service['httpd']; } file { '/etc/httpd/conf.custom': ensure => directory, recurse => true, source => "puppet:///private/apache/conf.custom", + require => Class['apache'], notify => Service['httpd']; } file { $cert_dir: ensure => directory; } - if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 { + if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '7') >= 0 { exec { 'set_apache_defaults': command => 'semanage fcontext -a -t httpd_sys_content_t "/srv/sites(/.*)?"', path => '/bin:/usr/bin/:/sbin:/usr/sbin', @@ -127,7 +135,13 @@ hour => '*/12', minute => '21', } - package { 'python2-certbot-apache': + if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 { + $certbot_package = 'python3-certbot-apache' + } else { + $certbot_package = 'python2-certbot-apache' + } + package { 'python-certbot-apache': + name => $certbot_package, ensure => installed, } }
--- a/modules/website/manifests/php.pp Sun Dec 29 14:54:45 2019 +0000 +++ b/modules/website/manifests/php.pp Sun Dec 29 15:31:28 2019 +0000 @@ -3,22 +3,7 @@ $opcache = undef, $extras = [], ) { - File { - notify => Service['httpd'], - tag => 'website', - } - Package { - notify => Service['httpd'], - tag => 'website', - } - Package <| tag == 'website' |> -> File <| tag == 'website' |> - define website::php::extra_php ($pkg = $title) { - package { "php${website::php::suffix}-${pkg}": - ensure => installed, - } - } - - website::php::extra_php { $extras: } + Package <| tag == 'php-package' |> -> File <| tag == 'php-file' |> ~> Service['httpd'] if $suffix =~ /^7[1-9]w$/ { $php_core = "mod_php${suffix}" @@ -29,22 +14,26 @@ $packages = [ $php_core, "php${suffix}-mbstring", "php${suffix}-xml", "php${suffix}-gd" ] package { $packages: ensure => installed, + tag => 'php-package', } + file { '/etc/php.d/custom-lockdown.ini': ensure => present, content => 'allow_url_fopen = \'off\' expose_php = Off', + tag => 'php-file', } file { '/etc/php.d/custom-php.ini': ensure => present, source => 'puppet:///modules/website/custom-php.ini', + tag => 'php-file', } if $opcache { package { "php${suffix}-${opcache}": ensure => installed, - notify => Service['httpd'], require => Package[$php_core], + tag => 'php-package', } # Use Remi's (and the OS's) naming convention file { '/etc/php.d/opcache.ini': @@ -53,6 +42,7 @@ file { '/etc/php.d/10-opcache.ini': ensure => present, source => 'puppet:///modules/website/opcache.ini', + tag => 'php-file', } } }