Use postgres for local connections in all DBs

Author: ianballou

definitions/checks/foreman/validate_external_db_version.rb

@@ -11,7 +11,7 @@ class ValidateExternalDbVersion < ForemanMaintain::Check
       end
 
       def run
-        current_db_version = feature(:foreman_database).db_version(feature(:foreman_database).local?)
+        current_db_version = feature(:foreman_database).db_version
         fail!(db_upgrade_message(current_db_version)) if current_db_version.major < 13
       end
 

definitions/features/candlepin_database.rb

@@ -47,6 +47,10 @@ def load_configuration
       'driver_class' => full_config['jpa.config.hibernate.connection.driver_class'],
       'url' => url,
     }
+
+    # Build connection string for pg_dump (only used for local databases)
+    @configuration['connection_string'] = "postgres:///#{@configuration['database']}"
+    @configuration
   end
 
   def extend_with_db_options

definitions/features/foreman_database.rb

@@ -43,6 +43,9 @@ def load_configuration
 
     @configuration = config['production']
     @configuration['host'] ||= 'localhost'
+
+    # Build connection string for pg_dump (only used for local databases)
+    @configuration['connection_string'] = "postgres:///#{@configuration['database']}"
     @configuration
   end
 end

definitions/features/pulpcore_database.rb

@@ -41,6 +41,9 @@ def load_configuration
     @configuration['database'] = db_config['NAME']
     @configuration['username'] = db_config['USER']
     @configuration['password'] = db_config['PASSWORD']
+
+    # Build connection string for pg_dump (only used for local databases)
+    @configuration['connection_string'] = "postgres:///#{db_config['NAME']}"
     @configuration
   end
 end

definitions/scenarios/restore.rb

@@ -51,7 +51,7 @@ def compose
       add_step_with_context(Procedures::Crond::Start)
     end
 
-    # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity
     def restore_sql_dumps(backup)
       if feature(:instance).postgresql_local?
         add_step(Procedures::Service::Start.new(:only => ['postgresql']))

lib/foreman_maintain/concerns/base_database.rb

@@ -143,7 +143,7 @@ def db_version
 
         query = 'SHOW server_version'
         server_version_cmd = 'psql --tuples-only --no-align'
-        version_string = if localdb
+        version_string = if local?
                            execute!("runuser - postgres -c '#{server_version_cmd} -c \"#{query}\"'")
                          else
                            execute!(server_version_cmd, :stdin => query, :env => base_env)

test/definitions/features/candlepin_database_test.rb

@@ -36,5 +36,21 @@ def stub_without_ssl_config(&block)
         refute_includes url, 'sslrootcert=/usr/share/foreman/root.crt'
       end
     end
+
+    it 'Sets connection_string for local database backups with SSL' do
+      stub_with_ssl_config do
+        config = subject.configuration
+        assert_equal 'candlepin1db', config['database']
+        assert_equal 'postgres:///candlepin1db', config['connection_string']
+      end
+    end
+
+    it 'Sets connection_string for local database backups without SSL' do
+      stub_without_ssl_config do
+        config = subject.configuration
+        assert_equal 'candlepin', config['database']
+        assert_equal 'postgres:///candlepin', config['connection_string']
+      end
+    end
   end
 end

test/definitions/features/foreman_database_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+describe Features::ForemanDatabase do
+  include DefinitionsTestHelper
+
+  subject { Features::ForemanDatabase.new }
+
+  describe '.configuration' do
+    it 'returns hash with DB config and connection_string' do
+      database_yml_content = {
+        'production' => {
+          'adapter' => 'postgresql',
+          'host' => 'localhost',
+          'port' => 5432,
+          'database' => 'foreman',
+          'username' => 'foreman',
+          'password' => 'password',
+        },
+      }
+
+      File.expects(:exist?).with('/etc/foreman/database.yml').returns(true)
+      File.expects(:read).with('/etc/foreman/database.yml').returns('mocked_yaml_content')
+      YAML.expects(:load).with('mocked_yaml_content').returns(database_yml_content)
+
+      expected = {
+        'adapter' => 'postgresql',
+        'host' => 'localhost',
+        'port' => 5432,
+        'database' => 'foreman',
+        'username' => 'foreman',
+        'password' => 'password',
+        'connection_string' => 'postgres:///foreman',
+      }
+      assert_equal expected, subject.configuration
+    end
+  end
+end

test/definitions/features/pulpcore_database_test.rb

@@ -15,7 +15,8 @@
       JSON
       subject.expects(:execute!).with(expected_command, merge_stderr: false).returns(manager_return)
       expected = { "adapter" => "postgresql", "host" => "remotedb", "port" => "5432",
-                   "database" => "pulpcore", "username" => "pulp", "password" => "password" }
+                   "database" => "pulpcore", "username" => "pulp", "password" => "password",
+                   "connection_string" => "postgres:///pulpcore" }
       assert_equal expected, subject.configuration
     end
   end

test/lib/concerns/base_database_test.rb

@@ -37,14 +37,24 @@ module ForemanMaintain
         assert db.local?
       end
 
-      it 'fetches server version' do
+      it 'fetches server version remotely' do
+        db.expects(:local?).returns(false)
         db.expects(:ping!)
         db.expects(:execute!).with(
           'psql --tuples-only --no-align',
           stdin: 'SHOW server_version',
           env: expected_env
         ).returns('13.16')
-        db.expects(:localdb).returns(false)
+
+        assert db.db_version
+      end
+
+      it 'fetches server version locally' do
+        db.expects(:local?).returns(true)
+        db.expects(:ping!)
+        db.expects(:execute!).with(
+          "runuser - postgres -c 'psql --tuples-only --no-align -c \"SHOW server_version\"'"
+        ).returns('13.16')
 
         assert db.db_version
       end