fix: helm tests

Author: moshloop

Dockerfile

@@ -5,6 +5,11 @@
 # Build stage for pgconfig binary
 FROM golang:1.25-bookworm AS pgconfig-builder
 
+# Build arguments for version information
+ARG VERSION=dev
+ARG GIT_COMMIT=unknown
+ARG BUILD_DATE=unknown
+
 # Copy source code
 WORKDIR /src/postgres
 COPY postgres/go.mod postgres/go.sum ./
@@ -13,10 +18,15 @@ RUN go mod download
 
 COPY postgres/ /src/postgres
 COPY clicky /src/clicky
-# Build pgconfig binary with cache mounts
+# Build pgconfig binary with cache mounts and version info
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    CGO_ENABLED=0 GOOS=linux go build -o postgres-cli ./cmd
+    CGO_ENABLED=0 GOOS=linux go build \
+    -ldflags "-s -w \
+      -X 'main.Version=${VERSION}' \
+      -X 'main.GitCommit=${GIT_COMMIT}' \
+      -X 'main.BuildDate=$(date)'" \
+    -o postgres-cli ./cmd
 
 # Main stage
 FROM debian:bookworm-slim

Taskfile.build.yaml

@@ -12,12 +12,24 @@ vars:
   IMAGE_BASE: '{{.IMAGE_BASE | default "flanksource/postgres"}}'
   IMAGE_TAG: '{{.IMAGE_TAG | default "latest"}}'
   TARGET_VERSIONS: [15, 16, 17]
+  VERSION:
+    sh: git describe --tags --always --dirty 2>/dev/null || echo "dev"
+  GIT_COMMIT:
+    sh: git rev-parse --short HEAD 2>/dev/null || echo "unknown"
+  BUILD_DATE:
+    sh: date -u '+%Y-%m-%dT%H:%M:%SZ'
 
 tasks:
   build:
     desc: Build the flanksource/postgres Docker image
     cmds:
-      - docker build -t {{.IMAGE_NAME}} .
+      - >-
+        docker build
+        --build-arg VERSION={{.VERSION}}
+        --build-arg GIT_COMMIT={{.GIT_COMMIT}}
+        --build-arg BUILD_DATE={{.BUILD_DATE}}
+        -t {{.IMAGE_NAME}}
+        .
     sources:
       - Dockerfile
       - docker-entrypoint.sh
@@ -46,7 +58,15 @@ tasks:
     vars:
       VERSION: "{{.VERSION}}"
     cmds:
-      - docker build --build-arg TARGET_VERSION={{.VERSION}} -t {{.REGISTRY}}/{{.IMAGE_BASE}}:to-{{.VERSION}} -t {{.REGISTRY}}/{{.IMAGE_BASE}}:to-{{.VERSION}}-{{.IMAGE_TAG}} .
+      - >-
+        docker build
+        --build-arg TARGET_VERSION={{.VERSION}}
+        --build-arg VERSION={{.VERSION}}
+        --build-arg GIT_COMMIT={{.GIT_COMMIT}}
+        --build-arg BUILD_DATE={{.BUILD_DATE}}
+        -t {{.REGISTRY}}/{{.IMAGE_BASE}}:to-{{.VERSION}}
+        -t {{.REGISTRY}}/{{.IMAGE_BASE}}:to-{{.VERSION}}-{{.IMAGE_TAG}}
+        .
     sources:
       - Dockerfile
       - docker-entrypoint.sh

Taskfile.pgconfig.yaml

@@ -9,18 +9,32 @@ output:
 vars:
   CLI_NAME: "postgres-cli"
   GOBIN: '{{.GOBIN | default "$(go env GOPATH)/bin"}}'
+  VERSION:
+    sh: git describe --tags --always --dirty 2>/dev/null || echo "dev"
+  GIT_COMMIT:
+    sh: git rev-parse --short HEAD 2>/dev/null || echo "unknown"
+  BUILD_DATE:
+    sh: date -u '+%Y-%m-%dT%H:%M:%SZ'
 
 tasks:
   build:
     desc: Build the postgres-cli and install to GOBIN
-
+    vars:
+      GOBIN_PATH:
+        sh: go env GOPATH
+      LDFLAGS: >-
+        -s -w
+        -X 'main.Version={{.VERSION}}'
+        -X 'main.GitCommit={{.GIT_COMMIT}}'
+        -X 'main.BuildDate={{.BUILD_DATE}}'
     cmds:
-      - echo "Building postgres-cli..."
-      - |
-        GOBIN_PATH="$(go env GOPATH)/bin"
-        echo "Installing to: $GOBIN_PATH/{{.CLI_NAME}}"
-        go build -ldflags "-s -w" -o "$GOBIN_PATH/{{.CLI_NAME}}" ./cmd
-      - echo "✅ Built and installed {{.CLI_NAME}} to $(go env GOPATH)/bin"
+      - echo "Building {{.CLI_NAME}} {{.VERSION}} ({{.GIT_COMMIT}})..."
+      - >-
+        go build
+        -ldflags "{{.LDFLAGS}}"
+        -o "{{.GOBIN_PATH}}/bin/{{.CLI_NAME}}"
+        ./cmd
+      - echo "✅ Built and installed {{.CLI_NAME}} to {{.GOBIN_PATH}}/bin"
     method: timestamp
 
   install:

cmd/main.go

@@ -16,8 +16,6 @@ import (
 	"github.com/flanksource/postgres/pkg/utils"
 )
 
-const version = "1.0.0"
-
 var (
 	postgres server.Postgres
 
@@ -58,17 +56,16 @@ func getPostgresPassword() utils.SensitiveString {
 }
 
 func main() {
+	clicky.Infof(GetVersionInfo())
 	rootCmd := &cobra.Command{
 		Use:   "postgres-cli",
 		Short: "PostgreSQL Management CLI",
 		Long: `A comprehensive CLI tool for managing PostgreSQL servers, generating configurations, and working with schemas.
 This unified tool combines PostgreSQL server management, configuration generation, and schema operations.`,
-		Version: version,
+		Version: Version,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+
 			clicky.Flags.UseFlags()
-			if err := postgres.Validate(); err != nil {
-				return err
-			}
 
 			// Load configuration if specified
 			if configFile != "" {
@@ -89,6 +86,9 @@ This unified tool combines PostgreSQL server management, configuration generatio
 			if postgres.Password.IsEmpty() {
 				postgres.Password = getPostgresPassword()
 			}
+			if err := postgres.Validate(); err != nil {
+				return err
+			}
 
 			return nil
 		},
@@ -241,8 +241,6 @@ func runAutoStart(cmd *cobra.Command, args []string) error {
 
 	// Step 4: Reset password if requested
 	if autoResetPassword {
-		clicky.Infof("🔑 Resetting postgres superuser password from POSTGRES_PASSWORD")
-
 		newPassword := os.Getenv("POSTGRES_PASSWORD")
 		sensitivePassword := utils.NewSensitiveString(newPassword)
 		if err := postgres.ResetPassword(sensitivePassword); err != nil {
@@ -283,8 +281,7 @@ func createVersionCommand() *cobra.Command {
 		Use:   "version",
 		Short: "Show version information",
 		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("postgres-cli version %s\n", version)
-
+			fmt.Println(GetVersionInfo())
 		},
 	}
 }

cmd/server.go

@@ -7,7 +7,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/flanksource/clicky"
-	"github.com/flanksource/postgres/pkg/utils"
 )
 
 // createServerCommands creates the server command group
@@ -224,21 +223,20 @@ func createResetPasswordCommand() *cobra.Command {
 		Short: "Reset PostgreSQL password",
 		Long:  "Reset the PostgreSQL superuser password",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			password, _ := cmd.Flags().GetString("password")
-			if password == "" {
+			if postgres.Password.IsEmpty() {
 				return fmt.Errorf("password is required")
 			}
 
-			sensitivePassword := utils.SensitiveString(password)
-			if err := postgres.ResetPassword(sensitivePassword); err != nil {
+			clicky.Infof("Resetting password for user %s", postgres.Username)
+
+			if err := postgres.ResetPassword(postgres.Password); err != nil {
 				return fmt.Errorf("failed to reset password: %w", err)
 			}
 			fmt.Println("Password reset successfully")
 			return nil
 		},
 	}
-	resetPasswordCmd.Flags().StringP("password", "p", "", "New password (required)")
-	resetPasswordCmd.MarkFlagRequired("password")
+
 	return resetPasswordCmd
 }
 

cmd/version.go

@@ -0,0 +1,24 @@
+package main
+
+import (
+	"fmt"
+	"runtime"
+)
+
+var (
+	// Version is the semantic version (set via ldflags)
+	Version = "dev"
+	// GitCommit is the git commit hash (set via ldflags)
+	GitCommit = "unknown"
+	// BuildDate is the build timestamp (set via ldflags)
+	BuildDate = "unknown"
+)
+
+// GetVersionInfo returns formatted version information
+func GetVersionInfo() string {
+	return fmt.Sprintf(`postgres-cli version: %s
+Git commit: %s
+Build date: %s
+Go version: %s
+OS/Arch: %s/%s`, Version, GitCommit, BuildDate, runtime.Version(), runtime.GOOS, runtime.GOARCH)
+}

pkg/server/postgres.go

@@ -67,6 +67,9 @@ func NewPostgres(config *pkg.PostgresConf, dataDir string) *Postgres {
 }
 
 func (p *Postgres) Validate() error {
+	if !p.Password.IsEmpty() {
+		clicky.RedactSecretValues(p.Password.Value())
+	}
 
 	// Try to auto-detect directories
 	detectedDirs, err := utils.DetectPostgreSQLDirs()
@@ -89,18 +92,7 @@ func (p *Postgres) Validate() error {
 		return fmt.Errorf("postgres binary directory not set")
 	}
 
-	if err := utils.CheckPGDATAPermissions(p.DataDir); err != nil {
-		if permErr, ok := err.(*utils.PermissionError); ok {
-			// Exit with code 126 (permission denied)
-			fmt.Fprintf(os.Stderr, "\n❌ %s\n", permErr.Error())
-			os.Exit(126)
-		}
-		if !os.IsNotExist(err) {
-			return fmt.Errorf("permission check failed: %w", err)
-		}
-	}
-
-	return nil
+	return utils.CheckPGDATAPermissions(p.DataDir)
 }
 
 // Note: For embedded postgres functionality, use pkg/embedded.NewEmbeddedPostgres() instead
@@ -459,7 +451,7 @@ func (p *Postgres) bin(name string, args ...string) *exec.Process {
 	}
 	cmd.Timeout = 10 * time.Second
 
-	return cmd.Debug()
+	return cmd
 }
 
 func WrappedError(err error) exec.WrapperFunc {

pkg/utils/permissions.go

@@ -74,51 +74,23 @@ func CheckDirectoryPermissions(path string) (*PermissionCheckResult, error) {
 	// Check if directory is writable
 	result.Writable = info.Mode().Perm()&0200 != 0 || result.OwnerUID == currentUID
 
-	// Check for permission mismatches
-	if result.OwnerUID != 999 || result.OwnerGID != 999 {
-		result.ErrorMsg = fmt.Sprintf(
-			"directory is owned by UID %d:GID %d, expected postgres user (999:999)",
-			result.OwnerUID,
-			result.OwnerGID,
-		)
-
-		// Generate fix commands
+	if !result.Readable || !result.Writable {
+		result.ErrorMsg = fmt.Sprintf("directory permissions are too restrictive: readable=%t, writable=%t",
+			result.Readable, result.Writable)
+
+		// Suggest fix commands
 		if currentUID == 0 {
 			result.FixCommands = []string{
 				fmt.Sprintf("chown -R postgres:postgres %s", path),
-			}
-		} else if currentUID == result.OwnerUID {
-			// User owns the directory but needs to run as root to fix
-			result.FixCommands = []string{
-				fmt.Sprintf("# Directory is owned by current user (UID %d), not postgres (999)", currentUID),
-				fmt.Sprintf("# Option 1: Run container as root to fix permissions, then restart as postgres:"),
-				fmt.Sprintf("docker run --user root -v <volume>:/var/lib/postgresql/data <image>"),
-				fmt.Sprintf(""),
-				fmt.Sprintf("# Option 2: Fix permissions on host (if using bind mount):"),
-				fmt.Sprintf("sudo chown -R 999:999 %s", path),
-				fmt.Sprintf(""),
-				fmt.Sprintf("# Option 3: Use named volume (Docker handles permissions automatically):"),
-				fmt.Sprintf("docker run -v pgdata:/var/lib/postgresql/data <image>"),
+				fmt.Sprintf("chmod -R u+rw %s", path),
 			}
 		} else {
 			result.FixCommands = []string{
-				fmt.Sprintf("# Directory is owned by UID %d, not postgres (999) or current user (%d)", result.OwnerUID, currentUID),
-				fmt.Sprintf("# Option 1: Run container explicitly as root to fix permissions:"),
-				fmt.Sprintf("docker run --user root -v <volume>:/var/lib/postgresql/data <image>"),
-				fmt.Sprintf(""),
-				fmt.Sprintf("# Option 2: Fix permissions from host:"),
-				fmt.Sprintf("docker run --rm --user root -v <volume>:/data alpine chown -R 999:999 /data"),
+				fmt.Sprintf("# Run as root to fix permissions:"),
+				fmt.Sprintf("sudo chown -R 999:999 %s", path),
+				fmt.Sprintf("sudo chmod -R u+rw %s", path),
 			}
 		}
-	} else if currentUID != 999 {
-		result.ErrorMsg = fmt.Sprintf(
-			"running as UID %d, but directory is owned by postgres (999). Container should run as postgres user",
-			currentUID,
-		)
-		result.FixCommands = []string{
-			"# Container is running as wrong user",
-			"# Remove --user flag from docker run command to use default (postgres) user",
-		}
 	}
 
 	return result, nil

pkg/utils/sensitive.go

@@ -59,6 +59,7 @@ func (s SensitiveString) Equals(other SensitiveString) bool {
 
 // NewSensitiveString creates a new SensitiveString from a regular string
 func NewSensitiveString(value string) SensitiveString {
+
 	return SensitiveString(value)
 }