1 files changed, 82 insertions, 8 deletions

diff --git a/spec/lib/backup/database_model_spec.rb b/spec/lib/backup/database_model_spec.rb
index 5758ad2c1aa..c9d036b37f8 100644
--- a/spec/lib/backup/database_model_spec.rb
+++ b/spec/lib/backup/database_model_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Backup::DatabaseModel, :reestablished_active_record_base, feature_category: :backup_restore do
+  using RSpec::Parameterized::TableSyntax
+
   let(:gitlab_database_name) { 'main' }
 
   describe '#connection' do
@@ -30,7 +32,7 @@ RSpec.describe Backup::DatabaseModel, :reestablished_active_record_base, feature
       ).to receive(:configuration_hash).and_return(application_config)
     end
 
-    context 'when no GITLAB_BACKUP_PG* variables are set' do
+    shared_examples 'no configuration is overridden' do
       it 'ActiveRecord backup configuration is expected to equal application configuration' do
         expect(subject[:activerecord]).to eq(application_config)
       end
@@ -45,9 +47,23 @@ RSpec.describe Backup::DatabaseModel, :reestablished_active_record_base, feature
       end
     end
 
-    context 'when GITLAB_BACKUP_PG* variables are set' do
-      using RSpec::Parameterized::TableSyntax
+    shared_examples 'environment variables override application configuration' do
+      let(:active_record_key) { described_class::SUPPORTED_OVERRIDES.invert[pg_env] }
+
+      it 'ActiveRecord backup configuration overrides application configuration' do
+        expect(subject[:activerecord]).to eq(application_config.merge(active_record_key => overridden_value))
+      end
+
+      it 'PostgreSQL ENV overrides application configuration' do
+        expect(subject[:pg_env]).to include({ pg_env => overridden_value })
+      end
+    end
 
+    context 'when no GITLAB_BACKUP_PG* variables are set' do
+      it_behaves_like 'no configuration is overridden'
+    end
+
+    context 'when GITLAB_BACKUP_PG* variables are set' do
       where(:env_variable, :overridden_value) do
         'GITLAB_BACKUP_PGHOST'           | 'test.invalid.'
         'GITLAB_BACKUP_PGUSER'           | 'some_user'
@@ -63,18 +79,76 @@ RSpec.describe Backup::DatabaseModel, :reestablished_active_record_base, feature
 
       with_them do
         let(:pg_env) { env_variable[/GITLAB_BACKUP_(\w+)/, 1] }
-        let(:active_record_key) { described_class::SUPPORTED_OVERRIDES.invert[pg_env] }
 
         before do
           stub_env(env_variable, overridden_value)
         end
 
-        it 'ActiveRecord backup configuration overrides application configuration' do
-          expect(subject[:activerecord]).to eq(application_config.merge(active_record_key => overridden_value))
+        it_behaves_like 'environment variables override application configuration'
+      end
+    end
+
+    context 'when GITLAB_BACKUP_<DBNAME>_PG* variables are set' do
+      context 'and environment variables are for the current database name' do
+        where(:env_variable, :overridden_value) do
+          'GITLAB_BACKUP_MAIN_PGHOST'           | 'test.invalid.'
+          'GITLAB_BACKUP_MAIN_PGUSER'           | 'some_user'
+          'GITLAB_BACKUP_MAIN_PGPORT'           | '1543'
+          'GITLAB_BACKUP_MAIN_PGPASSWORD'       | 'secret'
+          'GITLAB_BACKUP_MAIN_PGSSLMODE'        | 'allow'
+          'GITLAB_BACKUP_MAIN_PGSSLKEY'         | 'some_key'
+          'GITLAB_BACKUP_MAIN_PGSSLCERT'        | '/path/to/cert'
+          'GITLAB_BACKUP_MAIN_PGSSLROOTCERT'    | '/path/to/root/cert'
+          'GITLAB_BACKUP_MAIN_PGSSLCRL'         | '/path/to/crl'
+          'GITLAB_BACKUP_MAIN_PGSSLCOMPRESSION' | '1'
+        end
+
+        with_them do
+          let(:pg_env) { env_variable[/GITLAB_BACKUP_MAIN_(\w+)/, 1] }
+
+          before do
+            stub_env(env_variable, overridden_value)
+          end
+
+          it_behaves_like 'environment variables override application configuration'
+        end
+      end
+
+      context 'and environment variables are for another database' do
+        where(:env_variable, :overridden_value) do
+          'GITLAB_BACKUP_CI_PGHOST'           | 'test.invalid.'
+          'GITLAB_BACKUP_CI_PGUSER'           | 'some_user'
+          'GITLAB_BACKUP_CI_PGPORT'           | '1543'
+          'GITLAB_BACKUP_CI_PGPASSWORD'       | 'secret'
+          'GITLAB_BACKUP_CI_PGSSLMODE'        | 'allow'
+          'GITLAB_BACKUP_CI_PGSSLKEY'         | 'some_key'
+          'GITLAB_BACKUP_CI_PGSSLCERT'        | '/path/to/cert'
+          'GITLAB_BACKUP_CI_PGSSLROOTCERT'    | '/path/to/root/cert'
+          'GITLAB_BACKUP_CI_PGSSLCRL'         | '/path/to/crl'
+          'GITLAB_BACKUP_CI_PGSSLCOMPRESSION' | '1'
+        end
+
+        with_them do
+          let(:pg_env) { env_variable[/GITLAB_BACKUP_CI_(\w+)/, 1] }
+
+          before do
+            stub_env(env_variable, overridden_value)
+          end
+
+          it_behaves_like 'no configuration is overridden'
+        end
+      end
+
+      context 'when both GITLAB_BACKUP_PGUSER and GITLAB_BACKUP_MAIN_PGUSER variable are present' do
+        before do
+          stub_env('GITLAB_BACKUP_PGUSER', 'generic_user')
+          stub_env('GITLAB_BACKUP_MAIN_PGUSER', 'specfic_user')
         end
 
-        it 'PostgreSQL ENV overrides application configuration' do
-          expect(subject[:pg_env]).to include({ pg_env => overridden_value })
+        it 'prefers more specific GITLAB_BACKUP_MAIN_PGUSER' do
+          config = subject
+          expect(config.dig(:activerecord, :username)).to eq('specfic_user')
+          expect(config.dig(:pg_env, 'PGUSER')).to eq('specfic_user')
         end
       end
     end