use explicit database name with psql

sapcc · Jan 4, 2024 · 5c19926 · 5c19926
1 parent 1fe7bea
commit 5c19926
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/backup/backup.go b/internal/backup/backup.go
@@ -97,8 +97,7 @@ func Create(cfg *core.Configuration, reason string) (nowTime time.Time, returned
 
 		// determine postgresql server version
 		cmd := exec.CommandContext(ctx, "psql", //nolint:gosec // input is user supplied and self executed
-			"-h", cfg.PgHostname, "-U", cfg.PgUsername, //NOTE: PGPASSWORD comes via inherited env variable
-			"--csv", "--tuples-only", "-c", "SHOW SERVER_VERSION") // output not decoration or padding
+			cfg.ArgsForPsql("--csv", "--tuples-only", "-c", "SHOW SERVER_VERSION")...) // output not decoration or padding
 		output, err := cmd.Output()
 		if err != nil {
 			return nowTime, fmt.Errorf("could not determine postgresql server version: %w", err)

diff --git a/internal/core/config.go b/internal/core/config.go
@@ -100,6 +100,7 @@ func NewConfiguration() (*Configuration, error) {
 func (cfg Configuration) ArgsForPsql(args ...string) []string {
 	common := []string{
 		"-qA", "-h", cfg.PgHostname, "-U", cfg.PgUsername, //NOTE: PGPASSWORD comes via inherited env variable
+		"-d", "postgres", //ensure that -d does not default to the app username
 	}
 	return append(common, args...)
 }