Use --file and --format with pg_dump

definitions/checks/restore/validate_postgresql_dump_permissions.rb

@@ -13,7 +13,7 @@ def run
       backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
       if feature(:instance).postgresql_local?
         errors = []
-        [:candlepin_dump, :foreman_dump, :pulpcore_dump].each do |dump|
+        [:candlepin_dump, :foreman_dump, :pulpcore_dump, :container_gateway_dump].each do |dump|
           next unless backup.file_map[dump][:present]
 
           unless system("runuser - postgres -c 'test -r #{backup.file_map[dump][:path]}'")

lib/foreman_maintain/concerns/base_database.rb

@@ -66,14 +66,18 @@ def psql(query, config = configuration)
       end
 
       def ping(config = configuration)
-        execute?(psql_command(config),
-          :stdin => 'SELECT 1 as ping',
+        execute?(psql_command(config) + ' -c "SELECT 1 as ping"',
           :hidden_patterns => [config['password']],
           :user => config['user'])
       end
 
       def dump_db(file, config = configuration)
-        execute!(dump_command(config) + " > #{file}", :hidden_patterns => [config['password']], :user => config['user'])
+        if config['user']
+          execute!("chown -R #{config['user']}:#{config['user']} #{File.dirname(file)}")
+          execute!(dump_command(config) + " -f #{file}", :hidden_patterns => [config['password']], :user => config['user'])
+        else
+          execute!(dump_command(config) + " -f #{file}", :hidden_patterns => [config['password']], :user => config['user'])
+        end
       end
 
       def restore_dump(file, localdb, config = configuration)
@@ -84,12 +88,17 @@ def restore_dump(file, localdb, config = configuration)
           # TODO: figure out how to completely ignore errors. Currently this
           # sometimes exits with 1 even though errors are ignored by pg_restore
           dump_cmd = ''
+          base_cmd = ''
           if config['connection_string']
-            dump_cmd = "pg_restore --no-privileges --clean --disable-triggers -n public -d #{config['database']} #{file}"
+            base_cmd = 'pg_restore'
           else
-            dump_cmd = base_command(config, 'pg_restore') +
-                      ' --no-privileges --clean --disable-triggers -n public ' \
-                      "-d #{config['database']} #{file}"
+            base_cmd = base_command(config, 'pg_restore')
+          end
+          dump_cmd = base_cmd +
+                    ' --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'])
@@ -169,9 +178,9 @@ def psql_command(config)
 
       def dump_command(config)
         if config['connection_string']
-          "pg_dump -Fc #{config['connection_string']}"
+          "pg_dump --format=c #{config['connection_string']}"
         else
-          base_command(config, 'pg_dump') + " -Fc #{config['database']}"
+          base_command(config, 'pg_dump') + " --format=c #{config['database']}"
         end
       end
 

lib/foreman_maintain/utils/command_runner.rb

@@ -13,7 +13,7 @@ def initialize(logger, command, options)
         @logger = logger
         @user = options[:user]
         if @user && !@user.empty?
-          @command = "sudo -u #{@user} -- " + command
+          @command = "pushd /tmp && runuser -u #{@user} -- " + command + ' && popd'
         else
           @command = command
         end