Use postgres user for container gateway backup/restore

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
+        current_db_version = feature(:foreman_database).db_version(feature(:foreman_database).local?)
         fail!(db_upgrade_message(current_db_version)) if current_db_version.major < 13
       end
 

definitions/features/container_gateway_database.rb

@@ -32,7 +32,6 @@ def load_configuration
     if connection_string
       uri = URI.parse(connection_string)
       @configuration['connection_string'] = connection_string
-      @configuration['user'] = 'foreman-proxy'
       @configuration['database'] = uri.path[1..]
     end
     @configuration

definitions/procedures/backup/online/container_gateway_db.rb

@@ -12,8 +12,9 @@ class ContainerGatewayDB < ForemanMaintain::Procedure
 
       def run
         with_spinner('Getting Container Gateway DB dump') do
+          local = feature(:container_gateway_database).local?
           feature(:container_gateway_database).
-            dump_db(File.join(@backup_dir, 'container_gateway.dump'))
+            dump_db(File.join(@backup_dir, 'container_gateway.dump'), local)
         end
       end
     end

lib/foreman_maintain/concerns/base_database.rb

@@ -56,49 +56,54 @@ def query_csv(sql, config = configuration)
 
       def psql(query, config = configuration)
         if ping(config)
-          execute(psql_command(config),
-            :stdin => query,
-            :hidden_patterns => [config['password']],
-            :config => user)
+          if local?
+            execute(psql_command(config),
+              :stdin => query,
+              :hidden_patterns => [config['password']],
+              :user => 'postgres')
+          else
+            execute(psql_command(config),
+              :stdin => query,
+              :hidden_patterns => [config['password']])
+          end
         else
           raise_service_error
         end
       end
 
       def ping(config = configuration)
-        execute?(psql_command(config) + ' -c "SELECT 1 as ping"',
-          :hidden_patterns => [config['password']],
-          :user => config['user'])
+        if local?
+          execute?(psql_command(config) + ' -c "SELECT 1 as ping"',
+            :hidden_patterns => [config['password']],
+            :user => 'postgres')
+        else
+          execute?(psql_command(config) + ' -c "SELECT 1 as ping"',
+            :hidden_patterns => [config['password']])
+        end
       end
 
       def dump_db(file, config = configuration)
-        if config['user']
-          execute!("chown -R #{config['user']}:#{config['user']} #{File.dirname(file)}")
+        if local?
+          execute!("chown -R postgres:postgres #{File.dirname(file)}")
+          execute!(dump_command(config) + " -f #{file}",
+            :hidden_patterns => [config['password']], :user => 'postgres')
+        else
+          execute!(dump_command(config) + " -f #{file}", :hidden_patterns => [config['password']])
         end
-        execute!(dump_command(config) + " -f #{file}",
-          :hidden_patterns => [config['password']], :user => config['user'])
       end
 
-      def restore_dump(file, localdb, config = configuration)
-        if localdb
+      def restore_dump(file, config = configuration)
+        if local?
           dump_cmd = "runuser - postgres -c 'pg_restore -C -d postgres #{file}'"
           execute!(dump_cmd)
         else
           # TODO: figure out how to completely ignore errors. Currently this
           # sometimes exits with 1 even though errors are ignored by pg_restore
-          base_cmd = if config['connection_string']
-                       'pg_restore'
-                     else
-                       base_command(config, 'pg_restore')
-                     end
-          dump_cmd = base_cmd +
+          dump_cmd = base_command(config, 'pg_restore') +
                      ' --no-privileges --clean --disable-triggers -n public ' \
                      "-d #{config['database']} #{file}"
-          if config['user']
-            execute!("chown -R #{config['user']}:#{config['user']} #{File.dirname(file)}")
-          end
           execute!(dump_cmd, :hidden_patterns => [config['password']],
-            :valid_exit_statuses => [0, 1], :user => config['user'])
+            :valid_exit_statuses => [0, 1])
         end
       end
 
@@ -137,14 +142,18 @@ def dropdb(config = configuration)
       end
 
       def db_version(config = configuration)
-        if ping(config)
-          # Note - t removes headers, -A removes alignment whitespace
-          server_version_cmd = psql_command(config) + ' -c "SHOW server_version" -t -A'
-          version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']])
-          version(version_string)
-        else
-          raise_service_error
-        end
+          if ping(config)
+            # Note - t removes headers, -A removes alignment whitespace
+            server_version_cmd = psql_command(config) + ' -c "SHOW server_version" -t -A'
+            if local?
+              version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']], :user => 'postgres')
+            else
+              version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']])
+            end
+            version(version_string)
+          else
+            raise_service_error
+          end
       end
 
       def psql_cmd_available?