Merge branch 'postgres-user-exporter' into 'master'

Ensure the postgresql user is created for use in the postgres exporter

Closes #2425

See merge request !1669

files/gitlab-cookbooks/gitlab/recipes/postgres-exporter.rb

@@ -21,6 +21,8 @@ postgres_exporter_log_dir = node['gitlab']['postgres-exporter']['log_directory']
 postgres_exporter_static_etc_dir = "/opt/gitlab/etc/postgres-exporter"
 postgres_exporter_dir = node['gitlab']['postgres-exporter']['home']
 
+include_recipe 'gitlab::postgresql_user'
+
 directory postgres_exporter_log_dir do
   owner postgresql_user
   mode '0700'

spec/chef/recipes/postgres_exporter_spec.rb

@@ -72,6 +72,17 @@ describe 'gitlab::postgres-exporter' do
     end
   end
 
+  context 'when enabled and run as an isolated recipe' do
+    let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::config', 'gitlab::postgres-exporter') }
+    before do
+      stub_gitlab_rb(postgres_exporter: { enable: true })
+    end
+
+    it 'includes the postgresql_user recipe' do
+      expect(chef_run).to include_recipe('gitlab::postgresql_user')
+    end
+  end
+
   context 'when log dir is changed' do
     before do
       stub_gitlab_rb(