Merge branch '2628-allow-setting-of-arbitrary-settings-per-pgbouncer-database-entry' into 'master'

Resolve "Allow setting of arbitrary settings per pgbouncer database entry"

Closes #2628

See merge request !1858

files/gitlab-cookbooks/gitlab-ee/libraries/pgbouncer_helper.rb

+class PgbouncerHelper
+  attr_reader :node
+
+  def initialize(node)
+    @node = node
+  end
+
+  def database_config(database)
+    settings = node['gitlab']['pgbouncer']['databases'][database].to_hash
+    # The recipe uses user and passowrd for the auth_user option and the pg_auth file
+    settings['auth_user'] = settings.delete('user') if settings.key?('user')
+    settings.delete('password') if settings.key?('password')
+    settings.map do |setting, value|
+      "#{setting}=#{value}"
+    end.join(' ').chomp
+  end
+end

files/gitlab-cookbooks/gitlab-ee/recipes/pgbouncer.rb

@@ -52,6 +52,7 @@ end
 template node['gitlab']['pgbouncer']['databases_ini'] do
   source "#{File.basename(name)}.erb"
   user node['gitlab']['pgbouncer']['databases_ini_user']
+  helper(:pgb_helper) { pgb_helper }
   variables lazy { node['gitlab']['pgbouncer'].to_hash }
   notifies :run, 'execute[reload pgbouncer]', :immediately
 end

files/gitlab-cookbooks/gitlab-ee/templates/default/databases.ini.erb

 [databases]
 <% @databases.each do |db, settings| %>
-<%= db %> = host=<%= settings['host'] %> port=<%= settings['port'] %> dbname=<%= db %> auth_user=<%= settings['user'] %>
+<%= db %> = <%= pgb_helper.database_config(db) %>
 <% end %>

files/gitlab-ctl-commands-ee/pgbouncer.rb

@@ -98,7 +98,7 @@ def get_pg_options
       options['pg_database'] = db
     end
-    opts.on('--newhost HOSTNAME', 'The new master when updating pgbouncer') do|h|
+    opts.on('--newhost HOSTNAME', 'The new master when updating pgbouncer') do |h|
       options['newhost'] = h
     end
   end.parse!(ARGV)

spec/chef/gitlab-ee/recipes/pgbouncer_spec.rb

@@ -153,8 +153,8 @@ describe 'gitlab-ee::pgbouncer' do
       }
     )
     expect(chef_run).to render_file(databases_ini).with_content { |content|
-      expect(content).to match(%r{^first = host=1\.2\.3\.4 port=6432 dbname=first auth_user=first_user$})
-      expect(content).to match(%r{^second = host=5\.6\.7\.8 port=7432 dbname=second auth_user=second_user$})
+      expect(content).to match(%r{^first = host=1\.2\.3\.4 port=6432 auth_user=first_user$})
+      expect(content).to match(%r{^second = host=5\.6\.7\.8 port=7432 auth_user=second_user$})
     }
   end
@@ -179,7 +179,7 @@ describe 'gitlab-ee::pgbouncer' do
       }
     )
     expect(chef_run).to render_file(databases_ini)
-      .with_content(/^gitlabhq_production = host=127\.0\.0\.1 port=5432 dbname=gitlabhq_production auth_user=fakeuser$/)
+      .with_content(/^gitlabhq_production = host=127\.0\.0\.1 port=5432 auth_user=fakeuser$/)
     expect(chef_run).to render_file('/var/opt/gitlab/pgbouncer/pg_auth')
       .with_content(%r{^"fakeuser" "md5fakemd5password"$})
   end