Merge pull request #215 from mbakke/max_connections

Support max_user_connections in database_user

Author: apenney

lib/puppet/provider/database_user/mysql.rb

@@ -15,9 +15,12 @@ def self.instances
   end
 
   def create
-    merged_name   = @resource[:name].sub("@", "'@'")
-    password_hash = @resource.value(:password_hash)
-    mysql([defaults_file, "mysql", "-e", "create user '#{merged_name}' identified by PASSWORD '#{password_hash}'"].compact)
+    merged_name          = @resource[:name].sub("@", "'@'")
+    password_hash        = @resource.value(:password_hash)
+    max_user_connections = @resource.value(:max_user_connections) || 0
+
+    mysql([defaults_file, "mysql", "-e", "grant usage on *.* to '#{merged_name}' identified by PASSWORD
+      '#{password_hash}' with max_user_connections #{max_user_connections}"].compact)
 
     exists? ? (return true) : (return false)
   end
@@ -39,6 +42,16 @@ def password_hash=(string)
     password_hash == string ? (return true) : (return false)
   end
 
+  def max_user_connections
+    mysql([defaults_file, "mysql", "-NBe", "select max_user_connections from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
+  end
+
+  def max_user_connections=(int)
+    mysql([defaults_file, "mysql", "-e", "grant usage on *.* to '%s' with max_user_connections #{int}" % [ @resource[:name].sub("@", "'@'")] ].compact).chomp
+
+    max_user_connections == int ? (return true) : (return false)
+  end
+
   def exists?
     not mysql([defaults_file, "mysql", "-NBe", "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).empty?
   end

lib/puppet/type/database_user.rb

@@ -22,4 +22,9 @@
     newvalue(/\w+/)
   end
 
+  newproperty(:max_user_connections) do
+    desc "Max concurrent connections for the user. 0 means no (or global) limit."
+    newvalue(/\d+/)
+  end
+
 end

spec/unit/puppet/provider/database_user/mysql_spec.rb

@@ -26,7 +26,10 @@
   before :each do
     # password hash = mypass
     @resource = Puppet::Type::Database_user.new(
-      { :password_hash => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4', :name => 'joe@localhost' }
+      { :password_hash => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4',
+        :name => 'joe@localhost',
+        :max_user_connections => '10'
+      }
     )
     @provider = provider_class.new(@resource)
     Facter.stubs(:value).with(:root_home).returns(root_home)
@@ -46,7 +49,8 @@
 
   describe 'create' do
     it 'makes a user' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "create user 'joe'@'localhost' identified by PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'"])
+      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "grant usage on *.* to 'joe'@'localhost' identified by PASSWORD
+      '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' with max_user_connections 10"])
       @provider.expects(:exists?).returns(true)
       @provider.create.should be_true
     end
@@ -76,6 +80,21 @@
     end
   end
 
+  describe 'max_user_connections' do
+    it 'returns max user connections' do
+      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select max_user_connections from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('10')
+      @provider.max_user_connections.should == '10'
+    end
+  end
+
+  describe 'max_user_connections=' do
+    it 'changes max user connections' do
+      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "grant usage on *.* to 'joe'@'localhost' with max_user_connections 42"]).returns('0')
+      @provider.expects(:max_user_connections).returns('42')
+      @provider.max_user_connections=('42')
+    end
+  end
+
   describe 'exists?' do
     it 'checks if user exists' do
       subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select '1' from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('1')