freighthop 0.3.3 → 0.4.0

data/modules/firewall/spec/unit/puppet/type/firewall_spec.rb

@@ -8,18 +8,18 @@ describe firewall do
   before :each do
     @class = firewall
     @provider = double 'provider'
-    @provider.stubs(:name).returns(:iptables)
-    Puppet::Type::Firewall.stubs(:defaultprovider).returns @provider
+    allow(@provider).to receive(:name).and_return(:iptables)
+    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return @provider
 
     @resource = @class.new({:name  => '000 test foo'})
 
     # Stub iptables version
-    Facter.fact(:iptables_version).stubs(:value).returns("1.4.2")
-    Facter.fact(:ip6tables_version).stubs(:value).returns("1.4.2")
+    allow(Facter.fact(:iptables_version)).to receive(:value).and_return('1.4.2')
+    allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return('1.4.2')
 
     # Stub confine facts
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:operatingsystem).stubs(:value).returns("Debian")
+    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
+    allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
   end
 
   it 'should have :name be its namevar' do
@@ -130,6 +130,10 @@ describe firewall do
           @resource[addr].should == nil
         end
       end
+      it "should accept a negated #{addr} as a string" do
+        @resource[addr] = '! 127.0.0.1'
+        @resource[addr].should == '! 127.0.0.1/32'
+      end
     end
   end
 
@@ -316,6 +320,23 @@ describe firewall do
     end
   end
 
+  describe ':ctstate' do
+    it 'should accept value as a string' do
+      @resource[:ctstate] = :INVALID
+      @resource[:ctstate].should == [:INVALID]
+    end
+
+    it 'should accept value as an array' do
+      @resource[:ctstate] = [:INVALID, :NEW]
+      @resource[:ctstate].should == [:INVALID, :NEW]
+    end
+
+    it 'should sort values alphabetically' do
+      @resource[:ctstate] = [:NEW, :ESTABLISHED]
+      @resource[:ctstate].should == [:ESTABLISHED, :NEW]
+    end
+  end
+
   describe ':burst' do
     it 'should accept numeric values' do
       @resource[:burst] = 12
@@ -327,6 +348,15 @@ describe firewall do
     end
   end
 
+  describe ':recent' do
+    ['set', 'update', 'rcheck', 'remove'].each do |recent|
+      it "should accept recent value #{recent}" do
+        @resource[:recent] = recent
+        @resource[:recent].should == "--#{recent}"
+      end
+    end
+  end
+
   describe ':action and :jump' do
     it 'should allow only 1 to be set at a time' do
       expect {
@@ -362,8 +392,8 @@ describe firewall do
       describe "with iptables #{iptables_version}" do
         before {
           Facter.clear
-          Facter.fact(:iptables_version).stubs(:value).returns(iptables_version)
-          Facter.fact(:ip6tables_version).stubs(:value).returns(iptables_version)
+          allow(Facter.fact(:iptables_version)).to receive(:value).and_return iptables_version
+          allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return iptables_version
         }
 
         if iptables_version == '1.3.2'
@@ -486,6 +516,67 @@ describe firewall do
         rel.source.ref.should == chain.ref
         rel.target.ref.should == @resource.ref
       end
+
+      # test where autorequire is still needed (table != filter)
+      ['INPUT', 'OUTPUT', 'FORWARD'].each do |test_chain|
+        it "should autorequire fwchain #{test_chain} when table is mangle and provider is undefined" do
+          @resource[param] = test_chain
+          @resource[:table] = :mangle
+          @resource[:provider].should == :iptables
+
+          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:mangle:IPv4")
+          catalog = Puppet::Resource::Catalog.new
+          catalog.add_resource @resource
+          catalog.add_resource chain
+          rel = @resource.autorequire[0]
+          rel.source.ref.should == chain.ref
+          rel.target.ref.should == @resource.ref
+        end
+
+        it "should autorequire fwchain #{test_chain} when table is mangle and provider is ip6tables" do
+          @resource[param] = test_chain
+          @resource[:table] = :mangle
+          @resource[:provider] = :ip6tables
+
+          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:mangle:IPv6")
+          catalog = Puppet::Resource::Catalog.new
+          catalog.add_resource @resource
+          catalog.add_resource chain
+          rel = @resource.autorequire[0]
+          rel.source.ref.should == chain.ref
+          rel.target.ref.should == @resource.ref
+        end
+      end
+
+      # test of case where autorequire should not happen
+      ['INPUT', 'OUTPUT', 'FORWARD'].each do |test_chain|
+
+        it "should not autorequire fwchain #{test_chain} when table and provider are undefined" do
+          @resource[param] = test_chain
+          @resource[:table].should == :filter
+          @resource[:provider].should == :iptables
+
+          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:filter:IPv4")
+          catalog = Puppet::Resource::Catalog.new
+          catalog.add_resource @resource
+          catalog.add_resource chain
+          rel = @resource.autorequire[0]
+          rel.should == nil
+        end
+
+        it "should not autorequire fwchain #{test_chain} when table is undefined and provider is ip6tables" do
+          @resource[param] = test_chain
+          @resource[:table].should == :filter
+          @resource[:provider] = :ip6tables
+
+          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:filter:IPv6")
+          catalog = Puppet::Resource::Catalog.new
+          catalog.add_resource @resource
+          catalog.add_resource chain
+          rel = @resource.autorequire[0]
+          rel.should == nil
+        end
+      end
     end
   end
 

data/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb

@@ -5,19 +5,19 @@ require 'spec_helper'
 firewallchain = Puppet::Type.type(:firewallchain)
 
 describe firewallchain do
-  before do
+  before(:each) do
     # Stub confine facts
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:operatingsystem).stubs(:value).returns("Debian")
+    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
+    allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
   end
   let(:klass) { firewallchain }
   let(:provider) {
     prov = double 'provider'
-    prov.stubs(:name).returns(:iptables_chain)
+    allow(prov).to receive(:name).and_return(:iptables_chain)
     prov
   }
   let(:resource) {
-    Puppet::Type::Firewallchain.stubs(:defaultprovider).returns provider
+    allow(Puppet::Type::Firewallchain).to receive(:defaultprovider).and_return provider
     klass.new({:name => 'INPUT:filter:IPv4', :policy => :accept })
   }
 
@@ -26,7 +26,7 @@ describe firewallchain do
   end
 
   describe ':name' do
-    {'nat' => ['PREROUTING', 'POSTROUTING', 'OUTPUT'],
+    {'nat' => ['PREROUTING', 'POSTROUTING', 'INPUT', 'OUTPUT'],
      'mangle' => [ 'PREROUTING', 'POSTROUTING', 'INPUT', 'FORWARD', 'OUTPUT' ],
      'filter' => ['INPUT','OUTPUT','FORWARD'],
      'raw' => [ 'PREROUTING', 'OUTPUT'],
@@ -138,4 +138,48 @@ describe firewallchain do
       end
     end
   end
+
+  describe 'purge iptables rules' do
+    before(:each) do
+      allow(Puppet::Type.type(:firewall).provider(:iptables)).to receive(:iptables_save).and_return(<<EOS
+# Completed on Sun Jan  5 19:30:21 2014
+# Generated by iptables-save v1.4.12 on Sun Jan  5 19:30:21 2014
+*filter
+:INPUT DROP [0:0]
+:FORWARD DROP [0:0]
+:OUTPUT ACCEPT [0:0]
+:LOCAL_FORWARD - [0:0]
+:LOCAL_FORWARD_PRE - [0:0]
+:LOCAL_INPUT - [0:0]
+:LOCAL_INPUT_PRE - [0:0]
+:fail2ban-ssh - [0:0]
+-A INPUT -p tcp -m multiport --dports 22 -j fail2ban-ssh
+-A INPUT -i lo -m comment --comment "012 accept loopback" -j ACCEPT
+-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "020 ssh" -j ACCEPT
+-A OUTPUT -d 1.2.1.2 -j DROP
+-A fail2ban-ssh -j RETURN
+COMMIT
+# Completed on Sun Jan  5 19:30:21 2014
+EOS
+)
+    end
+
+    it 'should generate iptables resources' do
+      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4', :purge => true)
+
+      expect(resource.generate.size).to eq(3)
+    end
+
+    it 'should not generate ignored iptables rules' do
+      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4', :purge => true, :ignore => ['-j fail2ban-ssh'])
+
+      expect(resource.generate.size).to eq(2)
+    end
+
+    it 'should not generate iptables resources when not enabled' do
+      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4')
+
+      expect(resource.generate.size).to eq(0)
+    end
+  end
 end

data/modules/firewall/spec/unit/puppet/util/firewall_spec.rb

@@ -25,6 +25,27 @@ describe 'Puppet::Util::Firewall' do
     specify { subject.host_to_ip('::/0').should == nil }
   end
 
+  describe '#host_to_mask' do
+    subject { resource }
+    specify {
+      expect(Resolv).to receive(:getaddress).at_least(:once).with('puppetlabs.com').and_return('96.126.112.51')
+      subject.host_to_mask('puppetlabs.com').should == '96.126.112.51/32'
+      subject.host_to_mask('!puppetlabs.com').should == '! 96.126.112.51/32'
+    }
+    specify { subject.host_to_mask('96.126.112.51').should == '96.126.112.51/32' }
+    specify { subject.host_to_mask('!96.126.112.51').should == '! 96.126.112.51/32' }
+    specify { subject.host_to_mask('96.126.112.51/32').should == '96.126.112.51/32' }
+    specify { subject.host_to_mask('! 96.126.112.51/32').should == '! 96.126.112.51/32' }
+    specify { subject.host_to_mask('2001:db8:85a3:0:0:8a2e:370:7334').should == '2001:db8:85a3::8a2e:370:7334/128' }
+    specify { subject.host_to_mask('!2001:db8:85a3:0:0:8a2e:370:7334').should == '! 2001:db8:85a3::8a2e:370:7334/128' }
+    specify { subject.host_to_mask('2001:db8:1234::/48').should == '2001:db8:1234::/48' }
+    specify { subject.host_to_mask('! 2001:db8:1234::/48').should == '! 2001:db8:1234::/48' }
+    specify { subject.host_to_mask('0.0.0.0/0').should == nil }
+    specify { subject.host_to_mask('!0.0.0.0/0').should == nil }
+    specify { subject.host_to_mask('::/0').should == nil }
+    specify { subject.host_to_mask('! ::/0').should == nil }
+  end
+
   describe '#icmp_name_to_number' do
     describe 'proto unsupported' do
       subject { resource }

data/modules/mysql/CHANGELOG

@@ -1,33 +1,3 @@
-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 grantts, 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.
-
-Fixes:
-- 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:

data/modules/mysql/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'mime-types', '<2.0',      :require => false
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false

data/modules/mysql/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.4)
-    beaker (1.0.0)
+    beaker (0.0.0)
       blimpy
       fission
       inifile
@@ -11,22 +11,20 @@ GEM
       net-ssh
       nokogiri (= 1.5.10)
       rbvmomi
-      unf
     blimpy (0.6.7)
       fog
       minitar
       thor
     builder (3.2.2)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.0)
-    excon (0.28.0)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
+    excon (0.27.6)
     facter (1.7.3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.18.0)
+    fog (1.16.0)
       builder
-      excon (~> 0.28.0)
+      excon (~> 0.27.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -34,12 +32,15 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5)
       ruby-hmac
+      unicode (~> 0.4.4)
     formatador (0.2.4)
+    hiera (1.2.1)
+      json_pure
     highline (1.6.20)
     inifile (2.0.2)
     json (1.8.1)
+    json_pure (1.8.1)
     kwalify (0.7.2)
-    lockfile (2.1.0)
     metaclass (0.0.1)
     method_source (0.8.2)
     mime-types (1.25)
@@ -51,12 +52,14 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
     nokogiri (1.5.10)
-    pry (0.9.12.3)
-      coderay (~> 1.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puppet (2.7.23)
-      facter (~> 1.5)
+    puppet (3.3.1)
+      facter (~> 1.6)
+      hiera (~> 1.0)
+      rgen (~> 0.6.5)
     puppet-lint (0.3.2)
     puppetlabs_spec_helper (0.4.1)
       mocha (>= 0.10.5)
@@ -68,23 +71,24 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
+    rgen (0.6.6)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     rspec-puppet (0.1.6)
       rspec
-    rspec-system (2.7.2)
+    rspec-system (2.5.1)
       kwalify (~> 0.7.2)
       net-scp (~> 1.1)
-      net-ssh (~> 2.7)
-      nokogiri (~> 1.5.10)
+      net-ssh (~> 2.6)
+      nokogiri (~> 1.5.9)
       rbvmomi (~> 1.6)
-      rspec (~> 2.14)
+      rspec (~> 2.13)
       systemu (~> 2.5)
     rspec-system-puppet (2.2.1)
       rspec-system (~> 2.0)
@@ -92,32 +96,27 @@ GEM
       rspec-system (~> 2.0)
       serverspec (~> 0.0)
     ruby-hmac (0.4.0)
-    serverspec (0.11.1)
+    serverspec (0.10.9)
       highline
       net-ssh
       rspec (>= 2.13.0)
-    simplecov (0.8.1)
-      docile (~> 1.1.0)
-      lockfile (>= 2.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (3.4.6)
     systemu (2.5.2)
     thor (0.18.1)
     trollop (2.0)
-    unf (0.1.3)
-      unf_ext
-    unf_ext (0.0.6)
+    unicode (0.4.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   beaker
-  mime-types (< 2.0)
   pry
-  puppet (~> 2.7.0)
+  puppet (~> 3.3.0)
   puppet-lint
   puppetlabs_spec_helper
   rake

data/modules/mysql/Modulefile

@@ -1,5 +1,5 @@
 name 'puppetlabs-mysql'
-version '2.1.0'
+version '2.0.1'
 source 'git://github.com/puppetlabs/puppetlabs-mysql.git'
 author 'Puppet Labs'
 license 'Apache 2.0'

data/modules/mysql/README.md

@@ -54,7 +54,6 @@ pass in an override hash as seen below:
 
 ```puppet
 class { '::mysql::server':
-  root_password    => 'strongpassword',
   override_options => { 'mysqld' => { 'max_connections' => '1024' } }
 }
 ```
@@ -70,7 +69,7 @@ client you use `mysql::client`, and to install bindings you can use
 The hash structure for overrides in `mysql::server` is as follows:
 
 ```puppet
-$override_options = {
+override_options = {
   'section' => {
     'item'             => 'thing',
   }
@@ -112,7 +111,6 @@ hardcoded into the my.cnf template file.
 * `mysql::server::config`: Configures MYSQL.
 * `mysql::server::service`: Manages service.
 * `mysql::server::root_password`: Sets MySQL root password.
-* `mysql::server::providers`: Creates users, grants, and databases.
 * `mysql::bindings::java`: Installs Java bindings.
 * `mysql::bindings::perl`: Installs Perl bindings.
 * `mysql::bindings::python`: Installs Python bindings.
@@ -137,7 +135,7 @@ This is the hash of override options to pass into MySQL.  It can be visualized
 like a hash of the my.cnf file, so that entries look like:
 
 ```puppet
-$override_options = {
+override_options = {
   'section' => {
     'item'             => 'thing',
   }
@@ -203,51 +201,6 @@ What is the name of the mysql server service.
 
 Which provider to use to manage the service.
 
-#####`users`
-
-Optional hash of users to create, which are passed to [mysql_user](#mysql_user). Example:
-```puppet
-$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). Example:
-```puppet
-$grants = {
-  'someuser@localhost/somedb.*' => {
-    ensure     => 'present',
-    options    => ['GRANT'],
-    privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'],
-    table      => 'somedb.*',
-    user       => 'someuser@localhost',
-  },
-}
-```
-
-#####`databases`
-
-Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). Example:
-```puppet
-$databases = {
-  'somedb' => {
-    ensure  => 'present',
-    charset => 'utf8',
-  },
-}
-```
-
-#####`service_provider`
-
 ####mysql::server::backup
 
 #####`backupuser`

data/modules/mysql/files/mysqltuner.pl

@@ -294,7 +294,7 @@ sub mysql_setup {
 		}
 	} elsif ( -r "/etc/mysql/debian.cnf" and $doremote == 0 ){
 		# We have a debian maintenance account, use it
-		$mysqllogin = "--defaults-extra-file=/etc/mysql/debian.cnf";
+		$mysqllogin = "--defaults-file=/etc/mysql/debian.cnf";
 		my $loginstatus = `mysqladmin $mysqllogin ping 2>&1`;
 		if ($loginstatus =~ /mysqld is alive/) {
 			goodprint "Logged in using credentials from debian maintenance account.\n";

data/modules/mysql/lib/puppet/provider/database/mysql.rb

@@ -8,7 +8,7 @@ Puppet::Type.type(:database).provide(:mysql) do
 
   def self.defaults_file
     if File.file?("#{Facter.value(:root_home)}/.my.cnf")
-      "--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf"
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
     else
       nil
     end

data/modules/mysql/lib/puppet/provider/database_grant/mysql.rb

@@ -198,7 +198,7 @@ Puppet::Type.type(:database_grant).provide(:mysql) do
   # 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"
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
     else
       nil
     end

data/modules/mysql/lib/puppet/provider/database_user/mysql.rb

@@ -64,7 +64,7 @@ Puppet::Type.type(:database_user).provide(:mysql) do
   # 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"
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
     else
       nil
     end

data/modules/mysql/lib/puppet/provider/mysql.rb

@@ -8,12 +8,11 @@ class Puppet::Provider::Mysql < Puppet::Provider
   # 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"
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
     else
       nil
     end
   end
-  
   def defaults_file
     self.class.defaults_file
   end

data/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb

@@ -1,9 +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) do
   desc 'Manages MySQL databases.'
 
   commands :mysql => 'mysql'
 
+  def self.defaults_file
+    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
+    else
+      nil
+    end
+  end
+
+  def defaults_file
+    self.class.defaults_file
+  end
+
   def self.instances
     mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
       attributes = {}

data/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb

@@ -4,6 +4,18 @@ Puppet::Type.type(:mysql_user).provide(:mysql, :parent => Puppet::Provider::Mysq
   desc 'manage users for a mysql database.'
   commands :mysql => 'mysql'
 
+  # Optional defaults file
+  def self.defaults_file
+    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
+    else
+      nil
+    end
+  end
+  def defaults_file
+    self.class.defaults_file
+  end
+
   # Build a property_hash containing all the discovered information about MySQL
   # users.
   def self.instances

data/modules/mysql/lib/puppet/type/database_user.rb

@@ -7,7 +7,7 @@ Puppet::Type.newtype(:database_user) do
   newparam(:name, :namevar=>true) do
     desc "The name of the user. This uses the 'username@hostname' or username@hostname."
     validate do |value|
-      Puppet.warning("database has been deprecated in favor of mysql_user.")
+      Puppet.warning("database has been deprecated in favor of mysql_database.")
       # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
       # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
       raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/

data/modules/mysql/lib/puppet/type/mysql_grant.rb

@@ -3,7 +3,9 @@ Puppet::Type.newtype(:mysql_grant) do
   @doc = "Manage a MySQL user's rights."
   ensurable
 
-  autorequire(:file) { '/root/.my.cnf' }
+  autorequire(:file) do
+    '/root/.my.cnf'
+  end
 
   def initialize(*args)
     super
@@ -36,10 +38,6 @@ Puppet::Type.newtype(:mysql_grant) do
 
   newproperty(:privileges, :array_matching => :all) do
     desc 'Privileges for user'
-
-    munge do |value|
-      value.upcase
-    end
   end
 
   newproperty(:table) do