Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql

Author: osmith

.gitignore

@@ -22,3 +22,5 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc

.pdkignore

@@ -22,6 +22,8 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc
 /appveyor.yml
 /.fixtures.yml
 /Gemfile

.puppet-lint.rc

@@ -1 +0,0 @@
---relative

.sync.yml

@@ -1,4 +1,8 @@
 ---
+.gitignore:
+  required:
+    - ---.project
+
 .travis.yml:
   docker_sets:
     - set: docker/centos-7

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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).
 
+## [v8.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v8.0.1) (2019-03-20)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/8.0.0...v8.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)

README.md

@@ -181,23 +181,22 @@ If required, the password can also be an empty string to allow connections witho
 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 / CentOS 7 / Percona Server 5.7.
+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/centos/$releasever/os/$basearch/',
-  gpgkey   => 'http://www.percona.com/downloads/percona-release/RPM-GPG-KEY-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,
 }
 
 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',
@@ -216,18 +215,15 @@ class {'mysql::server':
 # 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',
-  package_ensure => '5.7.11-4.1.el7',
+  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_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',
@@ -421,7 +417,7 @@ Plugins can be installed by using the `mysql_plugin` defined type. See `examples
 * `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
 

REFERENCE.md

@@ -18,7 +18,7 @@ _Private Classes_
 
 * `mysql::backup::mysqlbackup`: Manage the mysqlbackup client.
 * `mysql::backup::mysqldump`: "Provider" for mysqldump
-* `mysql::backup::xtrabackup`: "Provider" for Percona XtraBackup
+* `mysql::backup::xtrabackup`: "Provider" for Percona XtraBackup or 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.
@@ -45,25 +45,20 @@ _Private Classes_
 
 _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).
-* `mysql_grant`: Manage a MySQL user's rights.
-* `mysql_user`: Manage a MySQL user. This includes management of users password as well as privileges.
 
 **Functions**
 
 * [`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): A wrapper for the 4.x function 'mysql::password' to bridge the gap between
-  it and the 3.x function 'mysql_password'.
 * [`mysql_password`](#mysql_password): Hash a string as mysql's "PASSWORD()" function would do it
-* [`mysql_strip_hash`](#mysql_strip_hash): A wrapper for the 4.x function 'mysql::strip_hash' to bridge the gap between
-  it and the 3.x function 'mysql_strip_hash'.
-* [`mysql_strip_hash`](#mysql_strip_hash): TEMPORARY FUNCTION: EXPIRES 2014-03-10 When given a hash this function strips out all blank entries.
 
 **Tasks**
 
@@ -1050,6 +1045,51 @@ 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.
@@ -1092,95 +1132,105 @@ namevar
 
 The name of the MySQL plugin to manage.
 
-## Functions
+### mysql_user
 
-### mysql::password
+@summary
+Manage a MySQL user. This includes management of users password as well as privileges.
 
-Type: Ruby 4.x API
+#### Properties
 
-Hash a string as mysql's "PASSWORD()" function would do it
+The following properties are available in the `mysql_user` type.
 
-#### `mysql::password(String $password)`
+##### `ensure`
 
-The mysql::password function.
+Valid values: present, absent
 
-Returns: `String` hash
-The mysql password hash from the clear text password.
+The basic property that the resource should be in.
 
-##### `password`
+Default value: present
 
-Data type: `String`
+##### `password_hash`
 
-Plain text password.
+Valid values: %r{\w*}
 
-### mysql::strip_hash
+The password hash of the user. Use mysql_password() for creating such a hash.
 
-Type: Ruby 4.x API
+##### `plugin`
 
-When given a hash this function strips out all blank entries.
+Valid values: %r{\w+}
 
-#### `mysql::strip_hash(Hash $hash)`
+The authentication plugin of the user.
 
-The mysql::strip_hash function.
+##### `max_user_connections`
 
-Returns: `Hash` hash 
-The given hash with all blank entries removed
+Valid values: %r{\d+}
 
-##### `hash`
+Max concurrent connections for the user. 0 means no (or global) limit.
 
-Data type: `Hash`
+##### `max_connections_per_hour`
 
-Hash to be stripped
+Valid values: %r{\d+}
 
-### mysql_password
+Max connections per hour for the user. 0 means no (or global) limit.
 
-Type: Ruby 4.x API
+##### `max_queries_per_hour`
 
-A wrapper for the 4.x function 'mysql::password' to bridge the gap between
-  it and the 3.x function 'mysql_password'.
+Valid values: %r{\d+}
 
-#### `mysql_password(String $password)`
+Max queries per hour for the user. 0 means no (or global) limit.
 
-The mysql_password function.
+##### `max_updates_per_hour`
 
-Returns: `String` The mysql password hash from the 4.x function mysql::password.
+Valid values: %r{\d+}
 
-##### `password`
+Max updates per hour for the user. 0 means no (or global) limit.
 
-Data type: `String`
+##### `tls_options`
 
-Plain text password.
+Options to that set the TLS-related REQUIRE attributes for the user.
 
-### mysql_password
+#### Parameters
 
-Type: Ruby 3.x API
+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::password
+
+Type: Ruby 4.x API
 
 Hash a string as mysql's "PASSWORD()" function would do it
 
-#### `mysql_password(String $password)`
+#### `mysql::password(String $password)`
 
-The mysql_password function.
+The mysql::password function.
 
-Returns: `String` the mysql password hash from the clear text password.
+Returns: `String` hash
+The mysql password hash from the clear text password.
 
 ##### `password`
 
 Data type: `String`
 
 Plain text password.
 
-### mysql_strip_hash
+### mysql::strip_hash
 
 Type: Ruby 4.x API
 
-A wrapper for the 4.x function 'mysql::strip_hash' to bridge the gap between
-  it and the 3.x function 'mysql_strip_hash'.
+When given a hash this function strips out all blank entries.
 
-#### `mysql_strip_hash(Hash $hash)`
+#### `mysql::strip_hash(Hash $hash)`
 
-The mysql_strip_hash function.
+The mysql::strip_hash function.
 
-Returns: `Hash` hash 
+Returns: `Hash` hash
 The given hash with all blank entries removed
 
 ##### `hash`
@@ -1189,19 +1239,23 @@ Data type: `Hash`
 
 Hash to be stripped
 
-### mysql_strip_hash
+### mysql_password
 
 Type: Ruby 3.x API
 
-TEMPORARY FUNCTION: EXPIRES 2014-03-10
-When given a hash this function strips out all blank entries.
+Hash a string as mysql's "PASSWORD()" function would do it
+
+#### `mysql_password(String $password)`
 
-#### `mysql_strip_hash()`
+The mysql_password function.
 
-TEMPORARY FUNCTION: EXPIRES 2014-03-10
-When given a hash this function strips out all blank entries.
+Returns: `String` the mysql password hash from the clear text password.
+
+##### `password`
 
-Returns: `Any`
+Data type: `String`
+
+Plain text password.
 
 ## Tasks
 

Rakefile

@@ -23,7 +23,7 @@ end
 
 def changelog_future_release
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = JSON.load(File.read('metadata.json'))['version']
+  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