fix cluster list sorting

cmd/cluster.go

@@ -26,6 +26,10 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
+const (
+	SETTINGS = `https://www.elastic.co/docs/reference/elasticsearch/configuration-reference`
+)
+
 func Cluster(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:    "cluster",
@@ -176,7 +180,7 @@ func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
 		Name:      "set",
 		Usage:     "set|update cluster settings",
 		Aliases:   []string{"set", "update"},
-		UsageText: "set [options] setting:value [setting:value ...]",
+		UsageText: "set [options] setting:value [setting:value ...]\n\nReference: " + SETTINGS,
 
 		Flags: []cli.Flag{
 			&cli.BoolFlag{
@@ -194,6 +198,12 @@ func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
+			args := cmd.Args()
+
+			if args.Len() == 0 {
+				return errors.New("at least one setting must be specified (format: setting:value)")
+			}
+
 			if err := es.ClusterSettingsSet(conf, cmd.Args()); err != nil {
 				return err
 			}

pkg/cfg/config.go

@@ -31,7 +31,7 @@ import (
 )
 
 const (
-	Version string = `v0.0.6`
+	Version string = `v0.0.7`
 )
 
 type Cluster struct {
@@ -90,11 +90,12 @@ func (conf *Config) Init() error {
 		}
 	} else {
 		if len(conf.Clusters) == 1 {
-			for _, cluster := range conf.Clusters {
+			for name, cluster := range conf.Clusters {
 				conf.DefaultCluster = cluster
+				conf.CurrentCluster = name
 			}
 		} else {
-			for _, cluster := range conf.Clusters {
+			for name, cluster := range conf.Clusters {
 				_, err := cluster.ES.Cluster.Health().
 					Header("content-type", "application/json").
 					Header("accept", "application/json").
@@ -102,18 +103,33 @@ func (conf *Config) Init() error {
 
 				if err == nil {
 					conf.DefaultCluster = cluster
+					conf.CurrentCluster = name
 				}
 			}
 		}
 	}
 
-	if conf.Debug {
-		repr.Println(conf)
-	}
+	conf.PrintDebug()
 
 	return nil
 }
 
+func (conf *Config) PrintDebug() {
+	if !conf.Debug {
+		return
+	}
+
+	clone := *conf
+
+	for name := range clone.Clusters {
+		clone.Clusters[name] = nil
+	}
+	clone.DefaultCluster = nil
+
+	fmt.Println("config:")
+	repr.Println(clone)
+}
+
 func (conf *Config) LoadEnv() error {
 	cluster := Cluster{
 		Uri:  os.Getenv("ES_URI"),

pkg/es/cluster.go

@@ -18,10 +18,10 @@ package es
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log/slog"
+	"slices"
 	"sync"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
@@ -29,11 +29,6 @@ import (
 	"github.com/elastic/go-elasticsearch/v9/typedapi/cluster/health"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/core/info"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
-	"github.com/urfave/cli/v3"
-)
-
-const (
-	DefaultExclude = `(part|monitoring|.internal|metrics-endpoint)`
 )
 
 const (
@@ -98,8 +93,20 @@ func ClusterList(conf *cfg.Config) error {
 	table.Addheaders("cluster", "uri", "default")
 
 	idx := 0
-	for name, cluster := range conf.Clusters {
+
+	names := make([]string, len(conf.Clusters))
+	for name := range conf.Clusters {
+		names[idx] = name
+		idx++
+	}
+
+	slices.Sort(names)
+
+	idx = 0
+
+	for idx, name := range names {
 		current := name == "default" || name == conf.CurrentCluster
+		cluster := conf.Clusters[name]
 
 		_, err := cluster.ES.Cluster.Health().
 			Header("content-type", "application/json").
@@ -114,7 +121,6 @@ func ClusterList(conf *cfg.Config) error {
 		idx++
 	}
 
-	table.Sort()
 	if err := table.PrintMarkdown(); err != nil {
 		return err
 	}
@@ -204,91 +210,3 @@ func ClusterStatus(conf *cfg.Config) error {
 
 	return nil
 }
-
-func ClusterSettingsList(conf *cfg.Config) error {
-	res, err := conf.DefaultCluster.ES.Cluster.GetSettings().
-		Header("content-type", "application/json").
-		Header("accept", "application/json").
-		Do(context.Background())
-	if err != nil {
-		return fmt.Errorf("failed to get cluster settings: %s", err)
-	}
-
-	table := NewTable(2, 0)
-	table.Addheaders("setting", "value")
-	entries := [][]string{}
-
-	settingshash := res.Persistent // == map[string]json.RawMessage
-
-	switch {
-	case conf.Transient:
-		settingshash = res.Transient
-	case conf.Default:
-		settingshash = res.Defaults
-	}
-
-	for topic, val := range settingshash {
-		data := map[string]map[string]any{}
-
-		err := json.Unmarshal(val, &data)
-
-		if err != nil {
-			return fmt.Errorf("failed to unmarshall setting for topic %s: %s", topic, err)
-		}
-
-		for key, settings := range data {
-			for setting, value := range settings {
-				entries = append(entries, []string{
-					fmt.Sprintf("%s.%s.%s", topic, key, setting),
-					fmt.Sprintf("%v", value),
-				})
-
-			}
-		}
-	}
-
-	table.entries = entries
-	table.Sort()
-
-	if err := table.PrintMarkdown(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
-	put := conf.Clusters[conf.CurrentCluster].ES.Cluster.PutSettings()
-
-	for _, arg := range args.Slice() {
-		setting, value := splitArg(arg)
-
-		switch {
-		case conf.Transient:
-			message, err := json.Marshal(value)
-			if err != nil {
-				return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %s", value, err)
-			}
-			put.AddTransient(setting, message)
-		case conf.Persistent:
-			fallthrough
-		default:
-			message, err := json.Marshal(value)
-			if err != nil {
-				return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %s", value, err)
-			}
-			put.AddPersistent(setting, message)
-		}
-	}
-
-	_, err := put.
-		Header("content-type", "application/json").
-		Header("accept", "application/json").
-		Do(context.Background())
-
-	if err != nil {
-		return fmt.Errorf("failed to set settings: %s", err)
-	}
-
-	return nil
-}

pkg/es/cluster_settings.go

@@ -0,0 +1,141 @@
+/*
+Copyright © 2026 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package es
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+
+	"codeberg.org/scip/esctl/pkg/cfg"
+	"github.com/urfave/cli/v3"
+)
+
+// recursively traverse  the raw  settings hash and  build a  flat map
+// consisting of the translated path and its value.
+//
+// e.g.
+// logger:
+//
+//	org:
+//	  elasticsearch:
+//	    transport:
+//	      OutboundHandler: "ERROR"
+//
+// gets:
+//
+// logger.org.elasticsearch.transport.OutboundHandler: "ERROR"
+func getJsonPath(raw map[string]any, topic string) map[string]string {
+	paths := map[string]string{}
+
+	for name, data := range raw {
+		path := topic + "." + name
+		switch value := data.(type) {
+		case string:
+			paths[path] = value
+		case map[string]any:
+			paths = getJsonPath(value, path)
+		}
+	}
+
+	return paths
+}
+
+func ClusterSettingsList(conf *cfg.Config) error {
+	res, err := conf.DefaultCluster.ES.Cluster.GetSettings().
+		Header("content-type", "application/json").
+		Header("accept", "application/json").
+		Do(context.Background())
+	if err != nil {
+		return fmt.Errorf("failed to get cluster settings: %s", err)
+	}
+
+	table := NewTable(2, 0)
+	table.Addheaders("setting", "value")
+	entries := [][]string{}
+
+	settingshash := res.Persistent // == map[string]json.RawMessage
+
+	switch {
+	case conf.Transient:
+		settingshash = res.Transient
+	case conf.Default:
+		settingshash = res.Defaults
+	}
+
+	for topic, val := range settingshash {
+		data := map[string]any{}
+
+		err := json.Unmarshal(val, &data)
+		if err != nil {
+			return fmt.Errorf("failed to unmarshall setting for topic %s: %s", topic, err)
+		}
+
+		paths := getJsonPath(data, topic)
+		slog.Debug("settings", topic, paths)
+
+		for setting, value := range paths {
+			entries = append(entries, []string{setting, fmt.Sprintf("%v", value)})
+		}
+	}
+
+	table.entries = entries
+	table.Sort()
+
+	if err := table.PrintMarkdown(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
+	put := conf.Clusters[conf.CurrentCluster].ES.Cluster.PutSettings()
+
+	for _, arg := range args.Slice() {
+		setting, value := splitArg(arg)
+
+		switch {
+		case conf.Transient:
+			message, err := json.Marshal(value)
+			if err != nil {
+				return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %s", value, err)
+			}
+			put.AddTransient(setting, message)
+		case conf.Persistent:
+			fallthrough
+		default:
+			message, err := json.Marshal(value)
+			if err != nil {
+				return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %s", value, err)
+			}
+			put.AddPersistent(setting, message)
+		}
+	}
+
+	_, err := put.
+		Header("content-type", "application/json").
+		Header("accept", "application/json").
+		Do(context.Background())
+
+	if err != nil {
+		return fmt.Errorf("failed to set settings: %s", err)
+	}
+
+	return nil
+}

pkg/es/cluster_util.go

@@ -30,6 +30,10 @@ import (
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
 )
 
+const (
+	DefaultExclude = `(part|monitoring|.internal|metrics-endpoint)`
+)
+
 func checkClusterFollower(conf *cfg.Config, leader string) bool {
 	stats, err := conf.Clusters[leader].ES.Ccr.Stats().
 		Header("content-type", "application/json").