Merge branch '2348-postgresql_user-does-not-work-with-geo-postgresql-recipe' into 'master'

Update postgresql_user resource to allow different helpers

Closes #2348

See merge request !1561

files/gitlab-cookbooks/gitlab-ee/recipes/geo-postgresql.rb

@@ -126,6 +126,7 @@ database_name = node['gitlab']['geo-secondary']['db_database']
 if node['gitlab']['geo-postgresql']['enable']
   postgresql_user gitlab_sql_user do
+    helper pg_helper
     action :create
   end

files/gitlab-cookbooks/gitlab/libraries/helpers/base_pg_helper.rb

@@ -97,8 +97,6 @@ class BasePgHelper
     EOF
   end
-  protected
-
   def service_name
     raise NotImplementedError
   end

files/gitlab-cookbooks/gitlab/libraries/helpers/geo_pg_helper.rb

@@ -2,8 +2,6 @@ require_relative 'base_pg_helper'
 # Helper class to interact with bundled Geo PostgreSQL instance
 class GeoPgHelper < BasePgHelper
-  protected
-
   # internal name for the service (node['gitlab'][service_name])
   def service_name
     'geo-postgresql'

files/gitlab-cookbooks/gitlab/libraries/helpers/pg_helper.rb

@@ -2,8 +2,6 @@ require_relative 'base_pg_helper'
 # Helper class to interact with bundled PostgreSQL instance
 class PgHelper < BasePgHelper
-  protected
-
   # internal name for the service (node['gitlab'][service_name])
   def service_name
     'postgresql'

files/gitlab-cookbooks/gitlab/resources/postgresql_user.rb

@@ -2,10 +2,10 @@ resource_name :postgresql_user
 property :username, String, name_property: true
 property :password, String
+property :helper, default: PgHelper.new(node)
 action :create do
   account_helper = AccountHelper.new(node)
-  pg_helper = PgHelper.new(node)
   query = if password.nil?
             "CREATE USER #{username};"
@@ -13,10 +13,10 @@ action :create do
             "CREATE USER #{username} PASSWORD '#{password}';"
           end
   execute "create #{username} postgresql user" do
-    command %(/opt/gitlab/bin/gitlab-psql -d template1 -c "#{query}")
+    command %(/opt/gitlab/bin/#{helper.service_cmd} -d template1 -c "#{query}")
     user account_helper.postgresql_user
     # Added retries to give the service time to start on slower systems
     retries 20
-    not_if { !pg_helper.is_running? || pg_helper.user_exists?(username) }
+    not_if { !helper.is_running? || helper.user_exists?(username) }
   end
 end

spec/chef/gitlab-ee/recipes/geo-postgresql_spec.rb

@@ -32,6 +32,10 @@ describe 'geo postgresql 9.2' do
       expect(chef_run).to include_recipe('gitlab::postgresql-bin')
     end
+    it 'creates the gitlab_geo role in the geo-postgresql database' do
+      expect(chef_run).to create_postgresql_user('gitlab_geo')
+    end
+
     it 'correctly sets the shared_preload_libraries default setting' do
       expect(chef_run.node['gitlab']['geo-postgresql']['shared_preload_libraries']).to be_nil