Remove user config for container gateway backup

Author: ianballou

lib/foreman_maintain/concerns/base_database.rb

@@ -57,10 +57,7 @@ def query_csv(sql, config = configuration)
       def psql(query, config = configuration)
         if ping(config)
           if local?
-            execute(psql_command(config),
-              :stdin => query,
-              :hidden_patterns => [config['password']],
-              :user => 'postgres')
+            execute("runuser - postgres -c '#{psql_command(config)}' -c '#{query}'")
           else
             execute(psql_command(config),
               :stdin => query,
@@ -73,9 +70,7 @@ def psql(query, config = configuration)
 
       def ping(config = configuration)
         if local?
-          execute?(psql_command(config) + ' -c "SELECT 1 as ping"',
-            :hidden_patterns => [config['password']],
-            :user => 'postgres')
+          execute?("runuser - postgres -c '#{psql_command(config)}' -c 'SELECT 1 as ping'")
         else
           execute?(psql_command(config) + ' -c "SELECT 1 as ping"',
             :hidden_patterns => [config['password']])
@@ -85,8 +80,7 @@ def ping(config = configuration)
       def dump_db(file, config = configuration)
         if local?
           execute!("chown -R postgres:postgres #{File.dirname(file)}")
-          execute!(dump_command(config) + " -f #{file}",
-            :hidden_patterns => [config['password']], :user => 'postgres')
+          execute!("runuser - postgres -c '#{dump_command(config)} -f #{file}'")
         else
           execute!(dump_command(config) + " -f #{file}", :hidden_patterns => [config['password']])
         end
@@ -146,7 +140,7 @@ def db_version(config = configuration)
             # 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')
+              version_string = execute!("runuser - postgres -c '#{server_version_cmd}'")
             else
               version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']])
             end

lib/foreman_maintain/utils/command_runner.rb

@@ -8,17 +8,11 @@ class CommandRunner
       attr_reader :logger, :command
 
       def initialize(logger, command, options)
-        options.validate_options!(
-          :stdin, :hidden_patterns, :interactive, :valid_exit_statuses, :user
-        )
+        options.validate_options!(:stdin, :hidden_patterns, :interactive, :valid_exit_statuses)
         options[:valid_exit_statuses] ||= [0]
         @logger = logger
         @user = options[:user]
-        @command = if @user && !@user.empty?
-                     "runuser -u #{@user} -- " + command
-                   else
-                     command
-                   end
+        @command = command
         @stdin = options[:stdin]
         @hidden_patterns = Array(options[:hidden_patterns]).compact
         @interactive = options[:interactive]