Merge pull request #1043 from hunner/release_5.2.0

(MODULES-6312) Release 5.2.0

Author: david22swan

.gitignore

@@ -1,24 +1,23 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
+# This file is generated by ModuleSync, do not edit.
+*.iml
+.*.sw[op]
+.DS_Store
 .bundle/
-coverage/
-log/
 .idea/
 .metadata
-*.iml
-.*.sw[op]
+.vagrant/
 .yardoc
 .yardwarns
-.DS_Store
+Gemfile.local
+Gemfile.lock
+bin/
+coverage/
+doc/
+junit/
+log/
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 tmp/
 vendor/
-doc/
 

.rubocop_todo.yml

@@ -1,167 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-12-06 17:18:57 +0000 using RuboCop version 0.51.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-
-# Offense count: 1
-Lint/RescueWithoutErrorClass:
-  Exclude:
-    - 'lib/facter/mysql_server_id.rb'
-
-# Offense count: 16
-Lint/ReturnInVoidContext:
-  Exclude:
-    - 'lib/puppet/provider/mysql_database/mysql.rb'
-    - 'lib/puppet/provider/mysql_user/mysql.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/ScriptPermission:
-  Exclude:
-    - 'spec/unit/puppet/functions/mysql_deepmerge_spec.rb'
-
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/unit/puppet/functions/mysql_deepmerge_spec.rb'
-
-# Offense count: 56
-# Configuration parameters: Blacklist.
-# Blacklist: END, (?-mix:EO[A-Z]{1})
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'lib/puppet/parser/functions/mysql_deepmerge.rb'
-    - 'lib/puppet/parser/functions/mysql_dirname.rb'
-    - 'lib/puppet/parser/functions/mysql_password.rb'
-    - 'lib/puppet/parser/functions/mysql_strip_hash.rb'
-    - 'spec/acceptance/locales_spec.rb'
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/acceptance/mysql_db_spec.rb'
-    - 'spec/acceptance/mysql_server_spec.rb'
-    - 'spec/acceptance/sql_task_spec.rb'
-    - 'spec/acceptance/types/mysql_database_spec.rb'
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_plugin_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Exclude:
-    - 'lib/puppet/parser/functions/mysql_strip_hash.rb'
-    - 'lib/puppet/provider/mysql_database/mysql.rb'
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_plugin/mysql.rb'
-    - 'lib/puppet/provider/mysql_user/mysql.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 40
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/graceful_failures_spec.rb'
-    - 'spec/classes/mycnf_template_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_mysqltuner_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/unit/facter/mysql_server_id_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-    - 'spec/unit/puppet/type/mysql_user_spec.rb'
-
-# Offense count: 56
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/acceptance/types/mysql_database_spec.rb'
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_plugin_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_monitor_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-
-# Offense count: 3
-# Configuration parameters: CustomTransform, IgnoreMethods.
-RSpec/FilePath:
-  Exclude:
-    - 'spec/unit/facter/mysql_server_id_spec.rb'
-    - 'spec/unit/facter/mysql_version_spec.rb'
-    - 'spec/unit/facter/mysqld_version_spec.rb'
-
-# Offense count: 41
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/acceptance/mysql_server_spec.rb'
-    - 'spec/unit/puppet/type/mysql_database_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-    - 'spec/unit/puppet/type/mysql_plugin_spec.rb'
-    - 'spec/unit/puppet/type/mysql_user_spec.rb'
-
-# Offense count: 42
-RSpec/MultipleExpectations:
-  Max: 4
-
-# Offense count: 42
-# Configuration parameters: Max.
-RSpec/NestedGroups:
-  Exclude:
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/classes/mycnf_template_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExample:
-  Exclude:
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-
-# Offense count: 3
-RSpec/ScatteredLet:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-Style/CommentedKeyword:
-  Exclude:
-    - 'spec/spec_helper_acceptance.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/classes/mycnf_template_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'

.travis.yml

@@ -4,9 +4,6 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake release_checks"
-#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
-before_install:
-  - gem update bundler
 matrix:
   fast_finish: true
   include:

CHANGELOG.md

@@ -3,6 +3,15 @@
 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).
 
+## 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.
@@ -843,5 +852,6 @@ configuration variables.
 ## 2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
 * initial commit
 
+[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

Gemfile

@@ -28,10 +28,19 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 # Used for gem conditionals
-supports_windows = false
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
+# The following gems are not included by default as they require DevKit on Windows.
+# You should probably include them in a Gemfile.local or a ~/.gemfile
+#gem 'pry' #this may already be included in the gemfile
+#gem 'pry-stack_explorer', :require => false
+#if RUBY_VERSION =~ /^2/
+#  gem 'pry-byebug'
+#else
+#  gem 'pry-debugger'
+#end
+
 group :development do
   gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
   gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
@@ -62,7 +71,6 @@ gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
 gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
 
-
 # Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)

NOTICE

@@ -1,6 +1,6 @@
 Puppet Module - puppetlabs-mysql
 
-Copyright 2017 Puppet, Inc.
+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.

README.md

@@ -1301,6 +1301,8 @@ Testing on other platforms has been minimal and cannot be guaranteed.
 
 **Note:** The mysqlbackup.sh does not work and is not supported on MySQL 5.7 and greater.
 
+Debian 9 compatibility has not been fully verified.
+
 ## 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.
@@ -1324,3 +1326,4 @@ This module is based on work by David Schmitt. The following contributors have c
 * Chris Weyl
 * Daniël van Eeden
 * Jan-Otto Kröpke
+* Timothy Sven Nelson

lib/puppet/provider/mysql.rb

@@ -7,7 +7,7 @@ class Puppet::Provider::Mysql < Puppet::Provider
   ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/local/libexec:/usr/local/bin'
 
   # rubocop:disable Style/HashSyntax
-  commands :mysql      => 'mysql'
+  commands :mysql_raw  => 'mysql'
   commands :mysqld     => 'mysqld'
   commands :mysqladmin => 'mysqladmin'
   # rubocop:enable Style/HashSyntax
@@ -54,8 +54,18 @@ def defaults_file
     self.class.defaults_file
   end
 
+  def self.mysql_caller(text_of_sql, type)
+    if type.eql? 'system'
+      mysql_raw([defaults_file, '--host=', system_database, '-e', text_of_sql].flatten.compact)
+    elsif type.eql? 'regular'
+      mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact)
+    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.

lib/puppet/provider/mysql_database/mysql.rb

@@ -2,12 +2,12 @@
 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").map 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|
+      mysql_caller(["show variables like '%_database'", name], 'regular').split("\n").each do |line|
         k, v = line.split(%r{\s})
         attributes[k] = v
       end
@@ -29,7 +29,7 @@ def self.prefetch(resources)
   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]
@@ -39,7 +39,7 @@ def create
   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)
@@ -52,13 +52,13 @@ def exists?
   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)
   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)
   end

lib/puppet/provider/mysql_datadir/mysql.rb

@@ -5,7 +5,26 @@
   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/mysql55/root/usr/bin:/opt/rh/mysql55/root/usr/libexec:/usr/mysql/5.5/bin:/usr/mysql/5.6/bin:/usr/mysql/5.7/bin'
+  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/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'