fix: postgres auto-start and dryrun

Author: moshloop

pkg/config/conf.go

@@ -1,9 +1,12 @@
 package config
 
 import (
+	"fmt"
 	"sort"
+	"strconv"
 	"strings"
 
+	"github.com/flanksource/clicky/api"
 	"github.com/samber/lo"
 )
 
@@ -31,32 +34,137 @@ type ConfigSetting struct {
 	PendingRestart bool     `json:"pending_restart,omitempty"`
 }
 
+func (cs ConfigSetting) GetInt() (int, error) {
+	unit := 1
+
+	if cs.Unit != nil {
+		switch *cs.Unit {
+		case "8kb":
+			unit = 8 * 1024
+		case "kB", "KB":
+			unit = KB
+		case "MB":
+			unit = MB
+		case "GB":
+			unit = GB
+		}
+	}
+
+	num, err := strconv.Atoi(cs.Setting)
+	if err != nil {
+		return 0, err
+	}
+	return num * unit, nil
+}
+
+var KB = 1024
+var MB = 1024 * KB
+var GB = 1024 * MB
+
+func (cs ConfigSetting) IsBytes() bool {
+	if cs.Unit == nil {
+		return false
+	}
+	switch *cs.Unit {
+	case "8kb", "kB", "MB", "GB", "KB":
+		return true
+	}
+	return false
+}
+
+func (cs ConfigSetting) String() string {
+	if cs.IsBytes() {
+		val, err := cs.GetInt()
+		if err != nil {
+			return cs.Setting
+		}
+
+		if val%GB == 0 && val >= GB {
+			return fmt.Sprintf("%dGB", val/GB)
+		} else if val >= MB && val%MB == 0 {
+			return fmt.Sprintf("%dMB", val/MB)
+		}
+		return fmt.Sprintf("%dkB", val/KB)
+	}
+
+	return cs.Setting
+}
+
+func (cs ConfigSetting) GetBool() (bool, error) {
+	if cs.Setting == "" {
+		return false, nil
+	}
+	switch strings.ToLower(cs.Setting) {
+	case "on", "true", "yes":
+		return true, nil
+	case "off", "false", "no":
+		return false, nil
+	}
+	return false, fmt.Errorf("Uknown bool type: %s", cs.Setting)
+}
+
 // ConfSettings is a map of configuration parameter names to their full settings
 type ConfSettings []ConfigSetting
 
-// ToMap converts ConfSettings to a simple map of name->setting values
-func (cs ConfSettings) ToMap() Conf {
-	result := Conf{}
+func (cs ConfSettings) AsMap() map[string]ConfigSetting {
+	result := map[string]ConfigSetting{}
 	for _, setting := range cs {
-		result[setting.Name] = setting.Setting
+		result[setting.Name] = setting
 	}
 	return result
 }
 
-func (c Conf) AsArgs() []string {
-	args := []string{}
-	// sort keys for consistent output
-	keys := lo.Keys(c)
+func (cs ConfSettings) Pretty() api.Text {
+	t := api.Text{}
+	keys := lo.Keys(cs.AsMap())
 	sort.StringSlice(keys).Sort()
-	for _, k := range keys {
-		v := c[k]
+	for _, name := range keys {
+		setting := cs.AsMap()[name]
+
+		t = t.Append(setting.Name).Append("=", "text-muted").Append(setting.String(), "bold").Append(" #", "text-muted")
+		if setting.Unit != nil {
+			t = t.Append(setting.Setting, "text-muted").Space().Append(*setting.Unit, "text-muted")
+		}
+		t = t.Append("@ source: "+setting.Source, "text-muted")
+
+		t = t.NewLine()
+	}
+	return t
+}
+
+// ToConf converts ConfSettings to a simple map of name->setting values
+func (cs ConfSettings) ToConf() Conf {
+	result := Conf{}
+	for _, setting := range cs {
+		if setting.Setting == "" {
+			continue
+		}
+		result[setting.Name] = setting.String()
+	}
+	return result
+}
+
+func (c Conf) Sorted() []struct{ Key, Value string } {
+	var result []struct{ Key, Value string }
+	for k, v := range c {
 		if v == "" {
 			continue
 		}
-		if strings.ContainsAny(v, " ") {
-			v = "'" + v + "'"
+		result = append(result, struct{ Key, Value string }{Key: k, Value: v})
+	}
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Key < result[j].Key
+	})
+	return result
+}
+
+func (c Conf) AsArgs() []string {
+	args := []string{}
+	for _, e := range c.Sorted() {
+		if strings.ContainsAny(e.Value, " ") {
+			e.Value = "'" + e.Value + "'"
 		}
-		args = append(args, " --"+k+"="+v)
+		args = append(args, " --"+e.Key+"="+e.Value)
 	}
 	return args
 }
@@ -74,8 +182,9 @@ func (c Conf) MergeFrom(other Conf) Conf {
 
 func (c Conf) AsFile() string {
 	var sb strings.Builder
-	for k, v := range c {
-		sb.WriteString(k + " = " + v + "\n")
+
+	for _, e := range c.Sorted() {
+		sb.WriteString(e.Key + " = " + e.Value + "\n")
 	}
 
 	return sb.String()

pkg/config/loader.go

@@ -32,25 +32,6 @@ func DefaultPostgresConf() *pkg.PostgresConf {
 	}
 }
 
-func LoadFromCSV(records []map[string]any) (Conf, error) {
-
-	conf := Conf{}
-
-	for _, record := range records {
-		name := strings.TrimSpace(fmt.Sprintf("%v", record["name"]))
-		value := strings.TrimSpace(fmt.Sprintf("%v", record["setting"]))
-
-		// Skip empty values
-		if name == "" || value == "" {
-			continue
-		}
-
-		conf[name] = value
-	}
-
-	return conf, nil
-}
-
 // LoadSettingsFromQuery parses pg_settings query results into ConfSettings
 func LoadSettingsFromQuery(records []map[string]any) (ConfSettings, error) {
 	settings := ConfSettings{}

pkg/config/postmaster.go

@@ -6,8 +6,6 @@ import (
 	"strings"
 )
 
-// LoadPostmasterOpts loads postmaster options from a file like:"
-// /usr/lib/postgresql/14/bin/postgres "-D" "/var/lib/postgresql/data" "--config-file=/etc/postgresql/postgresql.conf" "--checkpoint_completion_target=0.9" "--db_user_namespace=false" "--effective_cache_size=3GB" "--effective_io_concurrency=200" "--extra_float_digits=0" "--lc_messages=C" "--listen_addresses=*" "--log_autovacuum_min_duration=10s" "--log_checkpoints=true" "--log_connections=false" "--log_destination=stderr" "--log_disconnections=false" "--log_filename=postgresql-%d.log" "--log_line_prefix=%m [%p] %q[user=%u,db=%d,app=%a] " "--log_lock_waits=true" "--log_min_duration_statement=10s" "--log_rotation_age=1d" "--log_rotation_size=100MB" "--log_temp_files=100MB" "--log_timezone=UTC" "--log_truncate_on_rotation=true" "--logging_collector=true" "--maintenance_work_mem=205MB" "--max_connections=100" "--max_parallel_workers=2" "--max_parallel_workers_per_gather=2" "--max_wal_size=3GB" "--max_worker_processes=8" "--min_wal_size=2GB" "--password_encryption=scram-sha-256" "--random_page_cost=1.1" "--shared_buffers=1GB" "--ssl=false" "--timezone=UTC" "--wal_buffers=-1" "--work_mem=10MB"
 func LoadPostmasterOpts(path string) (Conf, error) {
 	opts := Conf{}
 	data, err := os.ReadFile(path)

pkg/generators/pgbouncer.go

@@ -136,7 +136,7 @@ func (g *PgBouncerConfigGenerator) generateHeader() string {
 		g.SystemInfo.OSType,
 		time.Now().Format("2006-01-02 15:04:05"),
 		g.SystemInfo.TotalMemoryGB(),
-		g.SystemInfo.CPUCount,
+		g.SystemInfo.EffectiveCPUCount(),
 		g.TunedParams.MaxConnections,
 	)
 }