remove workaround to load config in root.Before()

see: https://github.com/urfave/cli/issues/2348

.golangci.yml

@@ -0,0 +1,110 @@
+version: "2"
+
+linters:
+  enable:
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    - arangolint
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - canonicalheader
+    - clickhouselint
+    - containedctx
+    #- contextcheck
+    - copyloopvar
+    #- cyclop
+    - decorder
+    - dogsled
+    - dupword
+    - durationcheck
+    - embeddedstructfieldcheck
+    - errchkjson
+    - errname
+    #- errorlint
+    - exhaustive
+    - exptostd
+    - fatcontext
+    - funcorder
+    #- funlen
+    - ginkgolinter
+    - gocheckcompilerdirectives
+    - gochecknoinits
+    - gochecksumtype
+    #- gocognit
+    - gocritic
+    #- gocyclo
+    #- godoclint
+    - goheader
+    - gomoddirectives
+    - gomodguard_v2
+    - goprintffuncname
+    #- gosec
+    - gosmopolitan
+    - grouper
+    - iface
+    - importas
+    - inamedparam
+    - interfacebloat
+    - intrange
+    - iotamixing
+    - lll
+    - loggercheck
+    - makezero
+    - misspell
+    - modernize
+    - nakedret
+    #- nestif
+    - nilerr
+    - nilnesserr
+    - nlreturn
+    - nonamedreturns
+    - nosprintfhostport
+    - paralleltest
+    - perfsprint
+    - prealloc
+    #- predeclared
+    - promlinter
+    - protogetter
+    - reassign
+    - recvcheck
+    #- revive
+    - rowserrcheck
+    - sloglint
+    - spancheck
+    - sqlclosecheck
+    - tagalign
+    - testableexamples
+    - testifylint
+    - testpackage
+    - thelper
+    - tparallel
+    - unconvert
+    - unparam
+    - unqueryvet
+    - usestdlibvars
+    - usetesting
+    - varnamelen
+    - wastedassign
+    - whitespace
+    - wsl_v5
+    - zerologlint
+
+  settings:
+    varnamelen:
+      ignore-names:
+        - err
+        - wg
+        - mu
+        - ts
+        - to
+        - es
+        - op
+        - fd
+        - id
+        - fn
+      

.woodpecker/build.yaml

@@ -2,7 +2,7 @@ matrix:
   platform:
     - linux/amd64
   goversion:
-    - 1.25.8
+    - 1.26.4
 
 labels:
   platform: ${platform}
@@ -21,6 +21,6 @@ steps:
       event: [push,manual]
     image: golang:${goversion}
     commands:
-      - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
+      - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.12.2
       - golangci-lint --version
       - golangci-lint run ./...

Makefile

@@ -68,10 +68,10 @@ test: clean buildlocal
 testlint: test lint
 
 lint:
-	golangci-lint run
+	golangci-lint run --enable-only errcheck,govet,ineffassign,staticcheck,unused
 
 lint-full:
-	golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
+	golangci-lint run --show-stats=false
 
 testfuzzy: clean
 	go test -fuzz ./... $(ARGS)

cmd/api.go

@@ -72,7 +72,7 @@ func ApiShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Capi)
+			complete(conf, cmd, Capi)
 		},
 	}
 }

cmd/ccr.go

@@ -59,7 +59,7 @@ func CcrStatus(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Ccluster)
+			complete(conf, cmd, Ccluster)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -115,7 +115,7 @@ func CcrRemoteInfo(conf *cfg.Config) *cli.Command {
 		UsageText: "info [options] [<index>]",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/ccr_follower.go

@@ -60,7 +60,7 @@ func CcrFollowerRenew(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -82,7 +82,7 @@ func CcrFollowerResume(conf *cfg.Config) *cli.Command {
 		UsageText: "resume [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -104,7 +104,7 @@ func CcrFollowerPause(conf *cfg.Config) *cli.Command {
 		UsageText: "pause [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -126,7 +126,7 @@ func CcrFollowerUnfollow(conf *cfg.Config) *cli.Command {
 		UsageText: "unfollow [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -158,7 +158,7 @@ func CcrFollowerAdd(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -181,7 +181,7 @@ func CcrFollowerDelete(conf *cfg.Config) *cli.Command {
 		UsageText: "delete <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -205,7 +205,7 @@ func CcrFollowerShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/cluster.go

@@ -83,7 +83,7 @@ func ClusterSwitch(conf *cfg.Config) *cli.Command {
 		Aliases:   []string{"ctx"},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Ccluster)
+			complete(conf, cmd, Ccluster)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/cluster_reroute.go

@@ -50,7 +50,7 @@ func ClusterRerouteMove(conf *cfg.Config) *cli.Command {
 		UsageText: "move [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -95,7 +95,7 @@ func ClusterRerouteAllocateReplica(conf *cfg.Config) *cli.Command {
 		UsageText: "allocate-replica [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -133,7 +133,7 @@ func ClusterRerouteCancel(conf *cfg.Config) *cli.Command {
 		UsageText: "cancel [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -177,7 +177,6 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, stale bool) *cli.Command {
 	if stale {
 		name = "allocate-stale-primary"
 		usage = "allocate a stale primary shard to a node"
-
 	}
 
 	return &cli.Command{
@@ -186,7 +185,7 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, stale bool) *cli.Command {
 		UsageText: name + " [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{

cmd/cluster_settings.go

@@ -105,7 +105,7 @@ func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cclustersettings)
+			complete(conf, cmd, Cclustersettings)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/completion.go

@@ -36,20 +36,15 @@ const (
 	Cclustersettings
 )
 
-func complete(cmd *cli.Command, what int) {
+func complete(conf *cfg.Config, cmd *cli.Command, what int) {
 	if cmd.NArg() > 0 {
 		return
 	}
 
-	// FIXME: config should load from root.Before(), see https://github.com/urfave/cli/issues/2348
+	var (
-	// workaround: load it directly here
+		list []string
-	conf := cfg.NewConfig()
+		err  error
-	if err := conf.Init(); err != nil {
+	)
-		return
-	}
-
-	var list []string
-	var err error
 
 	switch what {
 	case Cindex:

cmd/datastream.go

@@ -91,7 +91,7 @@ func DatastreamShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cdatastream)
+			complete(conf, cmd, Cdatastream)
 		},
 	}
 }
@@ -113,7 +113,7 @@ func DatastreamCreate(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cdatastream)
+			complete(conf, cmd, Cdatastream)
 		},
 	}
 }
@@ -135,7 +135,7 @@ func DatastreamDelete(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cdatastream)
+			complete(conf, cmd, Cdatastream)
 		},
 	}
 }
@@ -148,7 +148,7 @@ func DatastreamRollover(conf *cfg.Config) *cli.Command {
 		UsageText: "rollover <data stream>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -205,7 +205,7 @@ func DatastreamIlm(conf *cfg.Config) *cli.Command {
 		UsageText: "ds ilm <name>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cdatastream)
+			complete(conf, cmd, Cdatastream)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/ilm.go

@@ -123,7 +123,7 @@ func IlmShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cilm)
+			complete(conf, cmd, Cilm)
 		},
 	}
 }

cmd/ilm_forecast.go

@@ -71,7 +71,7 @@ func IlmForecastList(conf *cfg.Config) *cli.Command {
 			},
 			&cli.StringFlag{
 				Name:        "within",
-				Usage:       "<duration> withing which to forecast",
+				Usage:       "<duration> within which to forecast",
 				Destination: &conf.Ilm.Within,
 				Aliases:     []string{"w"},
 			},
@@ -121,7 +121,7 @@ func IlmForecastShow(conf *cfg.Config) *cli.Command {
 			},
 			&cli.StringFlag{
 				Name:        "within",
-				Usage:       "duration withing which to forecast",
+				Usage:       "duration within which to forecast",
 				Destination: &conf.Ilm.Within,
 				Aliases:     []string{"w"},
 			},

cmd/index.go

@@ -19,7 +19,6 @@ package cmd
 import (
 	"context"
 	"errors"
-	"fmt"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/es"
@@ -76,10 +75,10 @@ func IndexList(conf *cfg.Config) *cli.Command {
 				Aliases:     []string{"H"},
 			},
 			&cli.BoolFlag{
-				Name:        "reds",
+				Name:        "failed",
 				Usage:       "include only red failed indicies",
 				Destination: &conf.Failed,
-				Aliases:     []string{"r"},
+				Aliases:     []string{"f"},
 			},
 			&cli.StringSliceFlag{
 				Name:        "filter",
@@ -111,7 +110,7 @@ func IndexShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 	}
 }
@@ -163,7 +162,7 @@ Valid field mapping types: integer, text, date, keyword`,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			args := cmd.Args()
 			if args.Len() == 0 {
-				return fmt.Errorf("no index specified")
+				return errors.New("no index specified")
 			}
 
 			mappings := args.Slice()[1:]
@@ -181,7 +180,7 @@ func IndexDelete(conf *cfg.Config) *cli.Command {
 		UsageText: "delete <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -202,7 +201,7 @@ func IndexClose(conf *cfg.Config) *cli.Command {
 		UsageText: "close <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -244,7 +243,7 @@ func IndexFields(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -265,7 +264,7 @@ func IndexIlm(conf *cfg.Config) *cli.Command {
 		UsageText: "index ilm <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/index_alias.go

@@ -38,7 +38,8 @@ func IndexAlias(conf *cfg.Config) *cli.Command {
 			IndexAliasDelete(conf),
 			IndexAliasRollover(conf),
 			// FIXME: implement IndexAliasAdd
-			//IndexAliasAdd(conf), // see https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases
+			// see https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases
+			// IndexAliasAdd(conf),
 		},
 	}
 }
@@ -51,7 +52,7 @@ func IndexAliasCreate(conf *cfg.Config) *cli.Command {
 		UsageText: "create <index> <alias>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -75,7 +76,7 @@ func IndexAliasDelete(conf *cfg.Config) *cli.Command {
 		UsageText: "delete <index> <alias>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -99,7 +100,7 @@ func IndexAliasRollover(conf *cfg.Config) *cli.Command {
 		UsageText: "rollover <alias>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{

cmd/index_template.go

@@ -19,7 +19,6 @@ package cmd
 import (
 	"context"
 	"errors"
-	"fmt"
 	"slices"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
@@ -72,7 +71,7 @@ func IndexTemplateShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 	}
 }
@@ -180,7 +179,7 @@ https://www.elastic.co/docs/reference/elasticsearch/index-settings
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			args := cmd.Args()
 			if args.Len() == 0 {
-				return fmt.Errorf("no name specified")
+				return errors.New("no name specified")
 			}
 
 			if conf.Mode != "" {
@@ -216,7 +215,7 @@ func IndexTemplateDelete(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cindex)
+			complete(conf, cmd, Cindex)
 		},
 	}
 }

cmd/node.go

@@ -60,7 +60,7 @@ func NodeShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show [options] <node>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cnode)
+			complete(conf, cmd, Cnode)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -90,7 +90,7 @@ func NodeClients(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Cnode)
+			complete(conf, cmd, Cnode)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/roles.go

@@ -68,7 +68,7 @@ func RoleShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show [options] <role>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(cmd, Crole)
+			complete(conf, cmd, Crole)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/root.go

@@ -31,9 +31,61 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
+const (
+	versionFmt = `esctl version: %s
+  build: %s
+  branch: %s
+  commit: %s
+  go version: %s
+  API Version: %s
+`
+
+	jsonPathUsage = `jsonPath usage:
+
+name.last          >> "Anderson"
+age                >> 37
+children           >> ["Sara","Alex","Jack"]
+children.#         >> 3
+children.1         >> "Alex"
+child*.2           >> "Jack"
+c?ildren.0         >> "Sara"
+fav\.movie         >> "Deer Hunter"
+friends.#.first    >> ["Dale","Roger","Jane"]
+friends.1.last     >> "Craig"
+
+You can also  query an array for  the first match by  using #(...), or
+find all matches  with #(...)#. Queries support the ==,  !=, <, <=, >,
+>= comparison operators  and the simple pattern matching  % (like) and
+!% (not like) operators. Eg:
+
+friends.#(last=="Murphy").first    >> "Dale"
+friends.#(last=="Murphy")#.first   >> ["Dale","Jane"]
+friends.#(age>45)#.last            >> ["Craig","Murphy"]
+friends.#(first%"D*").last         >> "Murphy"
+friends.#(first!%"D*").last        >> "Craig"
+friends.#(nets.#(=="fb"))#.first   >> ["Dale","Roger"]
+
+To extract more than one field, use:
+
+{"ns":source.namespace_name,"time":source.@timestamp} >>
+
+{
+  "ns": "3f80316965c64405-275a75782e984bcc8d82",
+  "time": "2026-06-10T04:23:38.914080361+00:00"
+}
+{
+  "ns": "3f80316965c64405-f0e1dcef668e45bb9afd",
+  "time": "2026-06-10T09:39:00.554892542+00:00"
+}
+
+
+Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`
+)
+
 func Finish(err error) int {
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Error: ", err.Error())
+
 		return 1
 	}
 
@@ -127,6 +179,7 @@ func Main() int {
 					return nil, err
 				} else {
 					fmt.Println(cmd.UsageText)
+
 					return nil, nil
 				}
 			}
@@ -161,53 +214,13 @@ func Main() int {
 }
 
 func HelpJsonPath(conf *cfg.Config) *cli.Command {
-	msg := `jsonPath usage:
-
-name.last          >> "Anderson"
-age                >> 37
-children           >> ["Sara","Alex","Jack"]
-children.#         >> 3
-children.1         >> "Alex"
-child*.2           >> "Jack"
-c?ildren.0         >> "Sara"
-fav\.movie         >> "Deer Hunter"
-friends.#.first    >> ["Dale","Roger","Jane"]
-friends.1.last     >> "Craig"
-
-You can also  query an array for  the first match by  using #(...), or
-find all matches  with #(...)#. Queries support the ==,  !=, <, <=, >,
->= comparison operators  and the simple pattern matching  % (like) and
-!% (not like) operators. Eg:
-
-friends.#(last=="Murphy").first    >> "Dale"
-friends.#(last=="Murphy")#.first   >> ["Dale","Jane"]
-friends.#(age>45)#.last            >> ["Craig","Murphy"]
-friends.#(first%"D*").last         >> "Murphy"
-friends.#(first!%"D*").last        >> "Craig"
-friends.#(nets.#(=="fb"))#.first   >> ["Dale","Roger"]
-
-To extract more than one field, use:
-
-{"ns":source.namespace_name,"time":source.@timestamp} >>
-
-{
-  "ns": "3f80316965c64405-275a75782e984bcc8d82",
-  "time": "2026-06-10T04:23:38.914080361+00:00"
-}
-{
-  "ns": "3f80316965c64405-f0e1dcef668e45bb9afd",
-  "time": "2026-06-10T09:39:00.554892542+00:00"
-}
-
-
-Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`
-
 	return &cli.Command{
 		Name:  "help-jsonpath",
 		Usage: "show jsonpath help",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			_, err := fmt.Println(msg)
+			_, err := fmt.Println(jsonPathUsage)
+
 			return err
 		},
 	}
@@ -219,8 +232,9 @@ func Version(conf *cfg.Config) *cli.Command {
 		Usage: "show esctl version information",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			_, err := fmt.Printf("esctl version: %s\n  build: %s\n  branch: %s\n  commit: %s\n  go version: %s\n  API Version: %s\n",
+			_, err := fmt.Printf(versionFmt,
 				cfg.Version, cfg.BUILD, cfg.BRANCH, cfg.COMMIT, cfg.GOVERSION, cfg.APIVERSION)
+
 			return err
 		},
 	}
@@ -327,7 +341,6 @@ func HelpUsage(conf *cfg.Config) *cli.Command {
 			})
 		},
 	}
-
 }
 
 // copy of cmd.Walk() with the exception to skip hidden commands and its siblings

cmd/utilities.go

@@ -26,9 +26,10 @@ import (
 func addReference(ref string) string {
 	indentedRef := []string{}
 
-	for _, line := range strings.Split(ref, "\n") {
+	for line := range strings.SplitSeq(ref, "\n") {
 		indentedRef = append(indentedRef, "   "+line)
 	}
+
 	return fmt.Sprintf("%s\nREFERENCE:\n%s\n",
 		cli.SubcommandHelpTemplate,
 		strings.Join(indentedRef, "\n"))

go.mod

@@ -14,7 +14,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 module codeberg.org/scip/esctl
 
-go 1.25.8
+go 1.26
 
 require (
 	github.com/MichaelMure/go-term-markdown v0.1.4

pkg/cfg/cluster.go

@@ -55,37 +55,6 @@ func (cluster *Cluster) SetClient(client *elasticsearch.TypedClient) {
 	cluster.client = client
 }
 
-func (cluster *Cluster) getTransport() elastictransport.Option {
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-
-	if cluster.DebugHTTP {
-		return elastictransport.WithTransport(
-			&DebugTransport{Transport: transport},
-		)
-	}
-
-	return elastictransport.WithTransport(transport)
-}
-
-func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
-	// These headers are  not needed with ES 9, but with  ES 8, we set
-	// them here  so every API call uses it.  The only exception being
-	// the api repl, which does it on its own.
-	headers := http.Header{}
-	headers.Add("content-type", "application/json")
-	headers.Add("Accept", "application/json")
-
-	return []elasticsearch.Option{
-		elasticsearch.WithAddresses(cluster.Uri),
-		elasticsearch.WithTransportOptions(
-			cluster.getTransport(),
-			elastictransport.WithHeader(headers),
-		),
-	}
-}
-
 // return the  go-elasticsearch client  object but before  doing that,
 // check if we need to tune auth
 func (cluster *Cluster) ES() *elasticsearch.TypedClient {
@@ -114,7 +83,8 @@ func (cluster *Cluster) CheckAuth() error {
 		} else {
 			// k, try interactively
 			fmt.Fprintf(os.Stderr, "Enter password for elasticsearch user %s@%s: ", cluster.User, cluster.Name)
-			pass, err := term.ReadPassword(int(syscall.Stdin))
+
+			pass, err := term.ReadPassword(syscall.Stdin)
 			if err != nil {
 				return err
 			}
@@ -125,6 +95,7 @@ func (cluster *Cluster) CheckAuth() error {
 			}
 
 			cluster.Pass = string(pass)
+
 			fmt.Println()
 		}
 
@@ -132,7 +103,6 @@ func (cluster *Cluster) CheckAuth() error {
 		opts = append(opts, elasticsearch.WithBasicAuth(cluster.User, cluster.Pass))
 
 		es, err := elasticsearch.NewTyped(opts...)
-
 		if err != nil {
 			return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
 		}
@@ -205,6 +175,40 @@ func (cluster *Cluster) IsReachable() (bool, error) {
 	return true, conn.Close()
 }
 
+func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
+	// These headers are  not needed with ES 9, but with  ES 8, we set
+	// them here  so every API call uses it.  The only exception being
+	// the api repl, which does it on its own.
+	headers := http.Header{}
+	headers.Add("Content-Type", "application/json")
+	headers.Add("Accept", "application/json")
+
+	return []elasticsearch.Option{
+		elasticsearch.WithAddresses(cluster.Uri),
+		elasticsearch.WithTransportOptions(
+			cluster.getTransport(),
+			elastictransport.WithHeader(headers),
+		),
+		elasticsearch.WithCompatibilityMode(),
+	}
+}
+
+func (cluster *Cluster) getTransport() elastictransport.Option {
+	transport := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+
+	if cluster.DebugHTTP {
+		return elastictransport.WithTransport(
+			&DebugTransport{Transport: transport},
+		)
+	}
+
+	return elastictransport.WithTransport(
+		&CompatibilityTransport{Transport: transport},
+	)
+}
+
 func (conf *Config) SetupES() error {
 	for name, cluster := range conf.Clusters {
 		cluster.Name = name
@@ -220,7 +224,6 @@ func (conf *Config) SetupES() error {
 		}
 
 		es, err := elasticsearch.NewTyped(opts...)
-
 		if err != nil {
 			return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
 		}

pkg/cfg/config.go

@@ -82,8 +82,9 @@ type Config struct {
 	SortBy    string // sort: -k
 	Ascending bool   // sort: -a
 
+	All                            bool   // doc + node ls: -a
 	Exclude                        string // cluster compare: -e (regexp)
-	All, Verbose                   bool   // cluster status: -a -v
+	Verbose                        bool   // cluster status: -v
 	Persistent, Transient, Default bool   // cluster settings set: -p -t -D
 
 	Force bool // ccr follower renew: -f
@@ -151,45 +152,6 @@ func (conf *Config) Init() error {
 	return nil
 }
 
-func (conf *Config) determineDefaultCluster() error {
-	if conf.CurrentCluster != "" {
-		// -C specified, set current cluster explicitly, no matter what the config says
-		current, exists := conf.Clusters[conf.CurrentCluster]
-		if !exists {
-			return fmt.Errorf("no cluster with alias %s configured", conf.CurrentCluster)
-		} else {
-			conf.DefaultCluster = current
-
-			// disable all others
-			for _, cluster := range conf.Clusters {
-				cluster.Default = false
-			}
-
-			conf.DefaultCluster.Default = true
-		}
-	} else {
-		// we need to determine ourselfes
-		if len(conf.Clusters) == 1 {
-			// ok, just one cluster configured, use this, of course
-			for name, cluster := range conf.Clusters {
-				conf.DefaultCluster = cluster
-				conf.CurrentCluster = name
-				conf.DefaultCluster.Default = true
-			}
-		} else {
-			// multiple ones exists, look if one is set as default
-			for name, cluster := range conf.Clusters {
-				if cluster.Default {
-					conf.DefaultCluster = cluster
-					conf.CurrentCluster = name
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
 // we are  using reflect to  clone a config obj  w/o the ES  stuff for
 // shorter repr.Println() output (the ES structure is just too large)
 func (conf *Config) Clone() Config {
@@ -198,14 +160,14 @@ func (conf *Config) Clone() Config {
 	ref := reflect.ValueOf(*conf)
 	typeOfS := ref.Type()
 
-	for i := 0; i < ref.NumField(); i++ {
+	for idx := range ref.NumField() {
-		field := typeOfS.Field(i).Name
+		field := typeOfS.Field(idx).Name
 
-		if field == "Clusters" || field == "DefaultCluster" || !ref.Field(i).CanInterface() {
+		if field == "Clusters" || field == "DefaultCluster" || !ref.Field(idx).CanInterface() {
 			continue
 		}
 
-		reflect.ValueOf(&clone).Elem().FieldByName(field).Set(reflect.ValueOf(ref.Field(i).Interface()))
+		reflect.ValueOf(&clone).Elem().FieldByName(field).Set(reflect.ValueOf(ref.Field(idx).Interface()))
 	}
 
 	return clone
@@ -266,6 +228,7 @@ func (conf *Config) LoadConfig() error {
 		for _, cluster := range conf.Clusters {
 			if cluster.Default {
 				conf.DefaultCluster = cluster
+
 				break
 			}
 		}
@@ -278,9 +241,47 @@ func (conf *Config) LoadConfig() error {
 	return nil
 }
 
+func (conf *Config) determineDefaultCluster() error {
+	if conf.CurrentCluster != "" {
+		// -C specified, set current cluster explicitly, no matter what the config says
+		current, exists := conf.Clusters[conf.CurrentCluster]
+		if !exists {
+			return fmt.Errorf("no cluster with alias %s configured", conf.CurrentCluster)
+		} else {
+			conf.DefaultCluster = current
+
+			// disable all others
+			for _, cluster := range conf.Clusters {
+				cluster.Default = false
+			}
+
+			conf.DefaultCluster.Default = true
+		}
+	} else {
+		// we need to determine ourselfes
+		if len(conf.Clusters) == 1 {
+			// ok, just one cluster configured, use this, of course
+			for name, cluster := range conf.Clusters {
+				conf.DefaultCluster = cluster
+				conf.CurrentCluster = name
+				conf.DefaultCluster.Default = true
+			}
+		} else {
+			// multiple ones exists, look if one is set as default
+			for name, cluster := range conf.Clusters {
+				if cluster.Default {
+					conf.DefaultCluster = cluster
+					conf.CurrentCluster = name
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
 func fileExists(filename string) bool {
 	info, err := os.Stat(filename)
-
 	if err != nil {
 		// return false on any error
 		return false

pkg/cfg/jq.go

@@ -25,6 +25,7 @@ import (
 
 func isJQinstalled() bool {
 	cmd := exec.CommandContext(context.Background(), "jq", "-h")
+
 	out, err := cmd.Output()
 	if err != nil {
 		return false

pkg/cfg/transport.go

@@ -43,15 +43,18 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 		}
 
 		var pretty bytes.Buffer
+
 		err = json.Indent(&pretty, buf.Bytes(), "", "\t")
 		if err != nil {
-			return nil, fmt.Errorf("json parse error: %s", err)
+			return nil, fmt.Errorf("json parse error: %w", err)
 		}
 
 		content = pretty.String()
 		contentline = buf.String()
 	}
 
+	req = fixRequestHeaders(req)
+
 	slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path,
 		"body", content, "bodyline", contentline,
 		"headers", req.Header,
@@ -59,3 +62,32 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 
 	return t.Transport.RoundTrip(req)
 }
+
+type CompatibilityTransport struct {
+	Transport http.RoundTripper
+}
+
+func (t *CompatibilityTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	req = fixRequestHeaders(req)
+
+	return t.Transport.RoundTrip(req)
+}
+
+// Fixes https://codeberg.org/scip/esctl/issues/79:
+// the API client has this Accept header hardcoded everywhere:
+// req.Header.Set("Accept", "application/vnd.elasticsearch+json;compatible-with=9")
+// While this works pretty well with ES9, it doesn't with ES8. So, we replace
+// this header with a new one without the compatibility part.
+func fixRequestHeaders(req *http.Request) *http.Request {
+	if req.Header.Get("Accept") != "" {
+		req.Header.Del("Accept")
+		req.Header.Add("Accept", "application/json")
+	}
+
+	if req.Header.Get("Content-Type") != "" {
+		req.Header.Del("Content-Type")
+		req.Header.Add("Content-Type", "application/json")
+	}
+
+	return req
+}

pkg/es/api.go

@@ -26,6 +26,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"log/slog"
 	"net/http"
 	"os"
@@ -92,9 +93,8 @@ func ApiRepl(conf *cfg.Config) error {
 		EOFPrompt:         "exit",
 		HistorySearchFold: true,
 	})
-
 	if err != nil {
-		return fmt.Errorf("failed to initialize readline lib: %s", err)
+		return fmt.Errorf("failed to initialize readline lib: %w", err)
 	}
 
 	for {
@@ -112,11 +112,13 @@ func ApiRepl(conf *cfg.Config) error {
 		parts := strings.SplitN(strings.TrimSpace(text), " ", 3)
 		if len(parts) < 2 {
 			fmt.Println("error: you need to input a verb, uri [and post data]")
+
 			continue
 		}
 
 		if !slices.Contains(verbs, strings.ToLower(parts[0])) {
 			fmt.Println("error: verb must be one of " + strings.Join(verbs, ","))
+
 			continue
 		}
 
@@ -144,6 +146,7 @@ func ApiRepl(conf *cfg.Config) error {
 		pageJsonOutput(conf, raw)
 	}
 
+	//nolint:nilerr
 	return nil
 }
 
@@ -175,7 +178,6 @@ func pageJsonOutput(conf *cfg.Config, raw []byte) {
 			pager.Stderr = os.Stderr
 
 			err := pager.Run()
-
 			if err != nil {
 				fmt.Printf("failed to execute pager '%s': %s", conf.Pager, err)
 			}
@@ -197,16 +199,16 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 	verb = strings.ToUpper(verb)
 
 	// we're using port-forwards anyway
-	tr := &http.Transport{
+	noVerifyTransport := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}
 
-	client := &http.Client{Transport: tr}
+	client := &http.Client{Transport: noVerifyTransport}
 
 	if conf.DebugHTTP {
 		client = &http.Client{
 			Transport: &cfg.DebugTransport{
-				Transport: tr}}
+				Transport: noVerifyTransport}}
 	}
 
 	req, err := http.NewRequest(verb, conf.DefaultCluster.Uri+path, bytes.NewBuffer([]byte(data)))
@@ -215,7 +217,7 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 	}
 
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("accept", "application/json")
+	req.Header.Add("Accept", "application/json")
 
 	// make sure we have got all we need
 	if err := conf.DefaultCluster.CheckAuth(); err != nil {
@@ -233,11 +235,16 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			log.Fatal(err)
+		}
+	}()
 
 	// Read and print response
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read response body: %s", err)
+		return nil, fmt.Errorf("failed to read response body: %w", err)
 	}
 
 	return body, nil
@@ -249,6 +256,7 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
 		cmd.Stdin = bytes.NewReader(raw)
 
 		var out bytes.Buffer
+
 		cmd.Stdout = &out
 
 		err := cmd.Run()
@@ -258,10 +266,12 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
 
 		return out.String(), nil
 	}
+
 	var pretty bytes.Buffer
+
 	err := json.Indent(&pretty, raw, "", "\t")
 	if err != nil {
-		return "", fmt.Errorf("json parse error: %s", err)
+		return "", fmt.Errorf("json parse error: %w", err)
 	}
 
 	return pretty.String(), nil
@@ -270,10 +280,10 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
 // interactively  read  arbitrary  JSON  data  from  STDIN,  which  is
 // virtually a repl inside the primary repl
 func readJSON(input string) (string, error) {
-	data := ""
+	data := strings.Builder{}
 
 	if input != "" {
-		data = input
+		data.WriteString(input)
 	} else {
 		scanner := bufio.NewScanner(os.Stdin)
 		for scanner.Scan() {
@@ -283,23 +293,23 @@ func readJSON(input string) (string, error) {
 				break
 			}
 
-			data += line
+			data.WriteString(line)
 		}
 	}
 
-	if data == "" {
+	if data.Len() == 0 {
-		return data, nil
+		return "", nil
 	}
 
 	// validate
 	check := map[string]any{}
-	err := json.Unmarshal([]byte(data), &check)
-	if err != nil {
-		return "", fmt.Errorf("error: input data is not proper JSON: %s", err)
 
+	err := json.Unmarshal([]byte(data.String()), &check)
+	if err != nil {
+		return "", fmt.Errorf("error: input data is not proper JSON: %w", err)
 	}
 
-	return data, nil
+	return data.String(), nil
 }
 
 func ApiList(conf *cfg.Config, pattern string) error {
@@ -338,6 +348,7 @@ func ApiList(conf *cfg.Config, pattern string) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -345,10 +356,13 @@ func ApiList(conf *cfg.Config, pattern string) error {
 func ApiPathNames() []string {
 	assets.LoadAssetOpenApi()
 
-	paths := []string{}
+	paths := make([]string, len(assets.OpenAPI.Spec().Paths.Paths))
+
+	idx := 0
 
 	for path := range assets.OpenAPI.Spec().Paths.Paths {
-		paths = append(paths, path)
+		paths[idx] = path
+		idx++
 	}
 
 	return paths
@@ -356,6 +370,7 @@ func ApiPathNames() []string {
 
 func ApiShow(conf *cfg.Config, showpath, verb string) error {
 	assets.LoadAssetOpenApi()
+
 	out := printer.Builder{}
 
 	op, err := matchOperation(showpath, verb)
@@ -372,18 +387,20 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
 	sample := getApiExample(op)
 	description := markdown.Render(cleanMarkup.ReplaceAllString(op.Op.Description, ""), width, cfg.DefaultMargin)
 
-	var bold = lipgloss.NewStyle().
+	var (
+		bold = lipgloss.NewStyle().
 			Bold(true)
-	var paragraph = lipgloss.NewStyle().
+		paragraph = lipgloss.NewStyle().
 				MarginBottom(1).
 				MarginLeft(cfg.DefaultMargin)
-	var boldparagraph = lipgloss.NewStyle().
+		boldparagraph = lipgloss.NewStyle().
 				MarginBottom(1).
 				MarginLeft(cfg.DefaultMargin).
 				Bold(true)
-	var indentparagraph = lipgloss.NewStyle().
+		indentparagraph = lipgloss.NewStyle().
 				MarginBottom(1).
 				MarginLeft(2)
+	)
 
 	out.WriteStringLine(bold.Render("ID: " + op.Op.ID))
 	out.WriteStringLine(paragraph.Render(fmt.Sprintf("%s %s", op.Verb, showpath)))
@@ -399,10 +416,11 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
 
 	if len(params.Path) > 0 {
 		out.WriteStringLine(bold.Render("Path Parameters"))
+
 		for _, param := range params.Path {
 			out.WriteStringLine(boldparagraph.Render(param.Param))
+
 			if param.Description != "" {
-				//out.WriteStringLine(indentparagraph.Render(param.Description))
 				out.WriteStringLine(param.Description)
 			}
 		}
@@ -410,8 +428,10 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
 
 	if len(params.Query) > 0 {
 		out.WriteStringLine(bold.Render("Query Parameters"))
+
 		for _, param := range params.Query {
 			out.WriteStringLine(boldparagraph.Render(param.Param))
+
 			if param.Description != "" {
 				out.WriteStringLine(indentparagraph.Render(param.Description))
 			}
@@ -493,10 +513,8 @@ func getApiExample(op *Op) string {
 					if hassource {
 						sample = strings.TrimSpace(source.(string))
 					}
-
 				}
 			}
-
 		}
 	}
 
@@ -509,11 +527,13 @@ func getApiExample(op *Op) string {
 func matchOperation(showpath, verb string) (*Op, error) {
 	ops := []*Op{}
 	op := &Op{}
+
 	var found bool
 
 	for path, item := range assets.OpenAPI.Spec().Paths.Paths {
 		if path == showpath {
 			ops = findOperation(item.PathItemProps)
+
 			break
 		}
 	}
@@ -530,6 +550,7 @@ func matchOperation(showpath, verb string) (*Op, error) {
 		if strings.ToLower(item.Verb) == verb {
 			op = item
 			found = true
+
 			break
 		}
 	}

pkg/es/ccr.go

@@ -46,9 +46,8 @@ func CcrStatus(conf *cfg.Config, leader, follower string) error {
 		}
 
 		// reverse attribution
-		f := follower
+		follower, leader = leader, follower
-		follower = leader
+
-		leader = f
 		slog.Debug("leader/follower attribution is invalid, reversing", "leader", leader, "follower", follower)
 	}
 
@@ -58,7 +57,7 @@ func CcrStatus(conf *cfg.Config, leader, follower string) error {
 		res, err := conf.Clusters[alias].ES().Cat.Indices().
 			Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to get indicies on %s: %s", alias, esErrorString(err))
+			return fmt.Errorf("failed to get indicies on %s: %w", alias, esErrorString(err))
 		}
 
 		indices[alias] = make(map[string]*types.IndicesRecord, len(res))
@@ -87,17 +86,19 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Cluster.RemoteInfo().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve follower info: %s", esErrorString(err))
+		return fmt.Errorf("failed to retrieve follower info: %w", esErrorString(err))
 	}
 
 	slog.Debug("ccr remote info", "info", res)
 
 	remote := ""
+
 	var info *types.ClusterRemoteProxyInfo
 
 	for name, data := range res {
 		remote = name
 		info = data.(*types.ClusterRemoteProxyInfo)
+
 		break
 	}
 

pkg/es/ccr_follower.go

@@ -18,6 +18,7 @@ package es
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
@@ -29,17 +30,18 @@ func getRemoteName(conf *cfg.Config) (string, error) {
 	res, err := conf.DefaultCluster.ES().Cluster.RemoteInfo().
 		Do(context.Background())
 	if err != nil {
-		return "", fmt.Errorf("failed to retrieve follower info: %s", esErrorString(err))
+		return "", fmt.Errorf("failed to retrieve follower info: %w", esErrorString(err))
 	}
 
 	remote := ""
 	for name := range res {
 		remote = name
+
 		break
 	}
 
 	if remote == "" {
-		return "", fmt.Errorf("cluster doesn't have a follower")
+		return "", errors.New("cluster doesn't have a follower")
 	}
 
 	return remote, nil
@@ -61,26 +63,31 @@ func CcrFollowerRenew(conf *cfg.Config, index string) error {
 	if err := wrapError(IndexClose, conf, index); err != nil {
 		return err
 	}
+
 	fmt.Printf("closed %s", index)
 
 	if err := wrapError(CcrFollowerPause, conf, index); err != nil {
 		return err
 	}
+
 	fmt.Printf("paused %s", index)
 
 	if err := wrapError(CcrFollowerUnfollow, conf, index); err != nil {
 		return err
 	}
+
 	fmt.Printf("unfollowed %s", index)
 
 	if err := wrapError(IndexDelete, conf, index); err != nil {
 		return err
 	}
+
 	fmt.Printf("deleted %s", index)
 
 	if err := CcrFollowerAdd(conf, index); err != nil {
 		return err
 	}
+
 	fmt.Printf("added follower %s", index)
 
 	return nil
@@ -89,9 +96,8 @@ func CcrFollowerRenew(conf *cfg.Config, index string) error {
 func CcrFollowerResume(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ccr.ResumeFollow(index).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to resume ccr following: %s", esErrorString(err))
+		return fmt.Errorf("failed to resume ccr following: %w", esErrorString(err))
 	}
 
 	return nil
@@ -100,9 +106,8 @@ func CcrFollowerResume(conf *cfg.Config, index string) error {
 func CcrFollowerPause(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ccr.PauseFollow(index).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to pause ccr following: %s", esErrorString(err))
+		return fmt.Errorf("failed to pause ccr following: %w", esErrorString(err))
 	}
 
 	return nil
@@ -111,9 +116,8 @@ func CcrFollowerPause(conf *cfg.Config, index string) error {
 func CcrFollowerUnfollow(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ccr.ForgetFollower(index).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to unfollow index: %s", esErrorString(err))
+		return fmt.Errorf("failed to unfollow index: %w", esErrorString(err))
 	}
 
 	return nil
@@ -134,9 +138,8 @@ func CcrFollowerAdd(conf *cfg.Config, index string) error {
 	}
 
 	_, err = create.Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to create follower index: %s", esErrorString(err))
+		return fmt.Errorf("failed to create follower index: %w", esErrorString(err))
 	}
 
 	return nil
@@ -146,7 +149,7 @@ func CcrFollowerShow(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Ccr.FollowStats(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve follower index info: %s", esErrorString(err))
+		return fmt.Errorf("failed to retrieve follower index info: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "follower stats", res.Indices)

pkg/es/cluster.go

@@ -38,22 +38,22 @@ type clusterReachable struct {
 }
 
 func ClusterList(conf *cfg.Config) error {
-	var mu sync.Mutex
+	var (
-	var wg sync.WaitGroup
+		mu sync.Mutex
+		wg sync.WaitGroup
+	)
+
 	reachable := make(map[string]clusterReachable, len(conf.Clusters))
 
 	// check endpoints in parallel to speed things up
 	for name, cluster := range conf.Clusters {
-		wg.Add(1)
+		wg.Go(func() {
-
-		go func() {
-			defer wg.Done()
 			online, err := cluster.IsReachable()
 
 			mu.Lock()
 			reachable[name] = clusterReachable{reachable: online, err: err}
 			mu.Unlock()
-		}()
+		})
 	}
 
 	wg.Wait()
@@ -121,26 +121,26 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
 
 	var err error
 
-	for i := 0; i < gocount; i++ {
+	for range gocount {
-		r := <-responses
+		res := <-responses
 
-		err = errors.Join(err, r.error)
+		err = errors.Join(err, res.error)
 
-		switch r.which {
+		switch res.which {
 		case ResponseHealth:
-			all.health = r.health
+			all.health = res.health
 		case ResponseCcr:
-			all.ccr = r.ccr
+			all.ccr = res.ccr
 		case ResponseInfo:
-			all.info = r.info
+			all.info = res.info
 		case ResponseStats:
-			all.stats = r.stats
+			all.stats = res.stats
 		case ResponseIndices:
-			all.indices = r.indices
+			all.indices = res.indices
 		case ResponseTasks:
-			all.tasks = r.tasks
+			all.tasks = res.tasks
 		case ResponseHealthReport:
-			all.healthreport = r.healthreport
+			all.healthreport = res.healthreport
 		}
 	}
 
@@ -155,8 +155,10 @@ func ClusterStatus(conf *cfg.Config) error {
 
 	slog.Debug("ES result", "cluster health", res.health)
 
-	var isleader bool
+	var (
-	var ccrfollowing string
+		isleader     bool
+		ccrfollowing string
+	)
 
 	if res.ccr != nil {
 		isleader = len(res.ccr.AutoFollowStats.AutoFollowedClusters) == 0
@@ -172,15 +174,22 @@ func ClusterStatus(conf *cfg.Config) error {
 	}
 
 	// look for red indices, if any
-	redindices := 0
+	failedIndices := 0
+	greenIndices := 0
+
 	for _, index := range *res.indices {
-		if *index.Health == "red" {
+		switch {
-			redindices++
+		case *index.Health != "green":
+			failedIndices++
+		case !strings.HasPrefix(*index.Index, "."):
+			// don't count internal indices
+			greenIndices++
 		}
 	}
 
 	// look for long running tasks
 	longtasks := 0
+
 	for _, task := range *res.tasks {
 		if strings.Contains(*task.RunningTime, "d") {
 			longtasks++
@@ -201,7 +210,8 @@ func ClusterStatus(conf *cfg.Config) error {
 		{"Unassigned Primary Shards", res.health.UnassignedPrimaryShards},
 		{"Pending Tasks", res.health.NumberOfPendingTasks},
 		{"Nodes", res.health.NumberOfNodes},
-		{"Red Indices", redindices},
+		{"Green Indices", greenIndices},
+		{"Failed Indices", failedIndices},
 		{"Long Running Tasks", longtasks},
 	}
 
@@ -213,7 +223,7 @@ func ClusterStatus(conf *cfg.Config) error {
 	}
 
 	if conf.Verbose {
-		table = gatherClusterStats(conf, res.stats, table)
+		table = gatherClusterStats(res.stats, table)
 	}
 
 	if res.health.Status.Name != "green" {
@@ -229,6 +239,10 @@ func ClusterStatus(conf *cfg.Config) error {
 					for resource, items := range diag.AffectedResources {
 						table.Entries = append(table.Entries, []any{"    -> affected " + resource, strings.Join(items, ",")})
 					}
+
+					if diag.Action != "" {
+						table.AddRow("        -> suggested action to fix", diag.Action)
+					}
 				}
 			}
 		}
@@ -241,9 +255,11 @@ func ClusterStatus(conf *cfg.Config) error {
 	return nil
 }
 
-func gatherClusterStats(conf *cfg.Config, clusterstats *clusterstats.Response, table *printer.Table) *printer.Table {
+func gatherClusterStats(clusterstats *clusterstats.Response, table *printer.Table) *printer.Table {
-	var querycount int64
+	var (
-	var vmversion string
+		querycount int64
+		vmversion  string
+	)
 
 	for _, count := range clusterstats.Indices.Search.Queries {
 		querycount += count

pkg/es/cluster_reroute.go

@@ -118,6 +118,7 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, index string, stale bool) e
 		if stale {
 			which = "stale"
 		}
+
 		return fmt.Errorf("failed to allocate %s primary shard: %w", which, err)
 	}
 

pkg/es/cluster_settings.go

@@ -35,11 +35,12 @@ func ClusterSettingsList(conf *cfg.Config) error {
 		FlatSettings(true).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get cluster settings: %s", esErrorString(err))
+		return fmt.Errorf("failed to get cluster settings: %w", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 2, 0)
 	table.Addheaders("setting", "value")
+
 	entries := [][]any{}
 
 	settingshash := res.Persistent // == map[string]json.RawMessage
@@ -75,23 +76,25 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
 		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)
+				return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %w", 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)
+				return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err)
 			}
+
 			put.AddPersistent(setting, message)
 		}
 	}
 
 	_, err := put.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to set settings: %s", esErrorString(err))
+		return fmt.Errorf("failed to set settings: %w", esErrorString(err))
 	}
 
 	return nil
@@ -100,15 +103,14 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
 func ClusterSettingsSetSingle(conf *cfg.Config, setting, value string) error {
 	message, err := json.Marshal(value)
 	if err != nil {
-		return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %s", value, err)
+		return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err)
 	}
 
 	_, err = conf.DefaultCluster.ES().Cluster.PutSettings().
 		AddPersistent(setting, message).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to set %s: %s", setting, esErrorString(err))
+		return fmt.Errorf("failed to set %s: %w", setting, esErrorString(err))
 	}
 
 	return nil

pkg/es/cluster_util.go

@@ -37,6 +37,7 @@ func checkClusterIsLeader(conf *cfg.Config, leader string) bool {
 		Do(context.Background())
 	if err != nil {
 		fmt.Printf("failed to get ccr stats from %s: %s", leader, esErrorString(err))
+
 		return false
 	}
 
@@ -47,6 +48,7 @@ func checkClusterIsLeader(conf *cfg.Config, leader string) bool {
 
 	if stats.AutoFollowStats.AutoFollowedClusters[0].ClusterName != "" {
 		fmt.Println("leader/follower attribution is invalid, reverse cluster attribution and retry")
+
 		return false
 	}
 
@@ -58,14 +60,15 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
 	status := map[string]*health.Response{}
 
 	for _, cluster := range []string{leader, follower} {
-		st, err := conf.Clusters[leader].ES().Cluster.Health().
+		clusterHealth, err := conf.Clusters[leader].ES().Cluster.Health().
 			Do(context.Background())
 		if err != nil {
 			fmt.Printf("failed to get health from %s: %s", cluster, esErrorString(err))
+
 			return false
 		}
 
-		status[cluster] = st
+		status[cluster] = clusterHealth
 	}
 
 	table := printer.NewTable(conf, 3, 6)
@@ -98,6 +101,7 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
 
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
+
 		return false
 	}
 
@@ -120,6 +124,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
 			Do(context.Background())
 		if err != nil {
 			fmt.Printf("failed to get ilm status from %s: %s", cluster, esErrorString(err))
+
 			return false
 		}
 
@@ -158,6 +163,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
 
 			if err := table.Print(); err != nil {
 				fmt.Println(err)
+
 				return false
 			}
 		}
@@ -174,6 +180,7 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 	}
 
 	indexOnlyOnLeader := map[string]*types.IndicesRecord{}
+
 	for name, index := range indices[leader] {
 		if exclude.MatchString(name) {
 			continue
@@ -195,9 +202,11 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 			}
 
 			isWritable := false
+
 			for _, alias := range res[name].Aliases {
 				if *alias.IsWriteIndex {
 					isWritable = true
+
 					break
 				}
 			}
@@ -227,8 +236,10 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
+
 		return false
 	}
 
@@ -275,8 +286,10 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
+
 		return false
 	}
 
@@ -309,8 +322,10 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
+
 		return false
 	}
 

pkg/es/datastream.go

@@ -32,7 +32,7 @@ func DatastreamNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Indices.GetDataStream().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get data streams: %s", esErrorString(err))
+		return nil, fmt.Errorf("failed to get data streams: %w", esErrorString(err))
 	}
 
 	dss := make([]string, len(res.DataStreams))
@@ -47,7 +47,7 @@ func DatastreamList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetDataStream().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get data streams: %s", esErrorString(err))
+		return fmt.Errorf("failed to get data streams: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "data streams", res)
@@ -65,21 +65,22 @@ func DatastreamList(conf *cfg.Config) error {
 	table := printer.NewTable(conf, 7, size)
 	table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
 
-	for idx, ds := range list {
+	for idx, datastream := range list {
-		name := printer.Colorize(conf, ds.Status.String(), ds.Name)
+		name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
+
 		policy := ""
-		if ds.IlmPolicy != nil {
+		if datastream.IlmPolicy != nil {
-			policy = *ds.IlmPolicy
+			policy = *datastream.IlmPolicy
 		}
 
 		table.Entries[idx] = []any{
 			name,
 			policy,
-			ds.Hidden,
+			datastream.Hidden,
-			*ds.System,
+			*datastream.System,
-			*ds.Replicated,
+			*datastream.Replicated,
-			ds.Generation,
+			datastream.Generation,
-			ds.TimestampField.Name,
+			datastream.TimestampField.Name,
 		}
 
 		if idx == size-1 {
@@ -88,6 +89,7 @@ func DatastreamList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -128,7 +130,7 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		Name(dsname).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get data stream: %s", esErrorString(err))
+		return fmt.Errorf("failed to get data stream: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "data stream", res)
@@ -141,28 +143,29 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		Name(dsname).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get data stream stats: %s", esErrorString(err))
+		return fmt.Errorf("failed to get data stream stats: %w", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 11, 2)
 	table.Addheaders("data stream property", "value")
 
-	ds := res.DataStreams[0]
+	datastream := res.DataStreams[0]
+
+	name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
 
-	name := printer.Colorize(conf, ds.Status.String(), ds.Name)
 	policy := ""
-	if ds.IlmPolicy != nil {
+	if datastream.IlmPolicy != nil {
-		policy = *ds.IlmPolicy
+		policy = *datastream.IlmPolicy
 	}
 
 	table.Entries = [][]any{
 		{"name", name},
 		{"ilm policy", policy},
-		{"hidden", ds.Hidden},
+		{"hidden", datastream.Hidden},
-		{"system", *ds.System},
+		{"system", *datastream.System},
-		{"replicated", *ds.Replicated},
+		{"replicated", *datastream.Replicated},
-		{"generation", ds.Generation},
+		{"generation", datastream.Generation},
-		{"timestamp field", ds.TimestampField.Name},
+		{"timestamp field", datastream.TimestampField.Name},
 		{"backing indices", stats.BackingIndices},
 		{"size", printer.Bytes(stats.TotalStoreSizeBytes)},
 		{"shards-failed", stats.Shards_.Failed},
@@ -173,13 +176,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		return err
 	}
 
-	table = printer.NewTable(conf, 5, len(ds.Indices))
+	table = printer.NewTable(conf, 5, len(datastream.Indices))
 	table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
 
-	for idx, index := range ds.Indices {
+	for idx, index := range datastream.Indices {
 		policy := ""
-		if ds.IlmPolicy != nil {
+		if datastream.IlmPolicy != nil {
-			policy = *ds.IlmPolicy
+			policy = *datastream.IlmPolicy
 		}
 
 		table.Entries[idx] = []any{
@@ -190,12 +193,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 			index.ManagedBy.Name,
 		}
 
-		if idx < len(ds.Indices) {
+		if idx < len(datastream.Indices) {
 			fmt.Println()
 		}
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -206,9 +210,8 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 func DatastreamCreate(conf *cfg.Config, dsname string) error {
 	_, err := conf.DefaultCluster.ES().Indices.CreateDataStream(dsname).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to create datastream: %s", esErrorString(err))
+		return fmt.Errorf("failed to create datastream: %w", esErrorString(err))
 	}
 
 	return nil
@@ -217,9 +220,8 @@ func DatastreamCreate(conf *cfg.Config, dsname string) error {
 func DatastreamDelete(conf *cfg.Config, dsname string) error {
 	_, err := conf.DefaultCluster.ES().Indices.DeleteDataStream(dsname).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to delete datastream: %s", esErrorString(err))
+		return fmt.Errorf("failed to delete datastream: %w", esErrorString(err))
 	}
 
 	return nil
@@ -227,9 +229,8 @@ func DatastreamDelete(conf *cfg.Config, dsname string) error {
 
 func DatastreamRollover(conf *cfg.Config, ds string) error {
 	res, err := RolloverAlias(conf, ds)
-
 	if err != nil {
-		return fmt.Errorf("failed to rollover data stream: %s", esErrorString(err))
+		return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 2, 5)

pkg/es/doc.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"math/rand/v2"
+	"strconv"
 	"strings"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
@@ -42,16 +43,16 @@ func DocAdd(conf *cfg.Config, jsondoc string) error {
 
 	err := json.Unmarshal([]byte(jsondoc), &data)
 	if err != nil {
-		return fmt.Errorf("supplied document was not valid JSON: %s", err)
+		return fmt.Errorf("supplied document was not valid JSON: %w", err)
 	}
 
-	now := fmt.Sprintf("%d", rand.Int64())
+	now := strconv.FormatInt(rand.Int64(), 10)
 
 	res, err := conf.DefaultCluster.ES().Create(conf.Index, now).
 		Document(data).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to create new doc in index %s: %s", conf.Index, esErrorString(err))
+		return fmt.Errorf("failed to create new doc in index %s: %w", conf.Index, esErrorString(err))
 	}
 
 	fmt.Println(res.Id_)
@@ -63,7 +64,7 @@ func DocShow(conf *cfg.Config, id string) error {
 	res, err := conf.DefaultCluster.ES().Get(conf.Index, id).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve doc in index %s: %s", conf.Index, esErrorString(err))
+		return fmt.Errorf("failed to retrieve doc in index %s: %w", conf.Index, esErrorString(err))
 	}
 
 	if !res.Found {
@@ -94,7 +95,7 @@ func DocDelete(conf *cfg.Config, queries []string) error {
 		_, err := conf.DefaultCluster.ES().Delete(conf.Index, id).
 			Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to delete doc in index %s: %s", conf.Index, esErrorString(err))
+			return fmt.Errorf("failed to delete doc in index %s: %w", conf.Index, esErrorString(err))
 		}
 
 		return nil
@@ -117,7 +118,7 @@ func DocDelete(conf *cfg.Config, queries []string) error {
 		Request(req).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to delete docs in index %s: %s", conf.Index, esErrorString(err))
+		return fmt.Errorf("failed to delete docs in index %s: %w", conf.Index, esErrorString(err))
 	}
 
 	return nil

pkg/es/duration.go

@@ -45,7 +45,6 @@ Convert a  duration into  an integer.  Valid  time units  are "s", "m", "h" and
 	via https://codeberg.org/scip/tablizer/src/branch/main/lib/sort.go#L113
 */
 func parseDuration(duration string) time.Duration {
-
 	seconds := 0
 
 	for _, match := range matchDuration.FindAllStringSubmatch(duration, -1) {
@@ -111,12 +110,14 @@ func formatDuration(val time.Duration) string {
 		if esd.minutes == 0 {
 			return fmt.Sprintf("%dh", esd.hours)
 		}
+
 		return fmt.Sprintf("%dh:%dm", esd.hours, int64(esd.minutes))
 
 	default:
 		if esd.minutes == 0 && hoursLeft == 0 {
 			return fmt.Sprintf("%dd", int64(days))
 		}
+
 		return fmt.Sprintf("%dd:%dh:%dm",
 			int64(days),
 			int64(hoursLeft),

pkg/es/errors.go

@@ -17,29 +17,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package es
 
 import (
+	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
 )
 
-func esErrorString(err error) string {
+func esErrorString(err error) error {
 	msg := err.Error()
 
-	switch e := err.(type) {
+	//nolint:gocritic
+	switch errVal := err.(type) {
 	case *types.ElasticsearchError:
-		causes := ""
+		var causes strings.Builder
 
-		for _, cause := range e.ErrorCause.RootCause {
+		for _, cause := range errVal.ErrorCause.RootCause {
-			causes += fmt.Sprintf("%s\n", *cause.Reason)
+			fmt.Fprintf(&causes, "%s\n", *cause.Reason)
 		}
 
-		if e.ErrorCause.Reason != nil {
+		if errVal.ErrorCause.Reason != nil {
-			msg = *e.ErrorCause.Reason + ": " + causes
+			msg = *errVal.ErrorCause.Reason + ": " + causes.String()
 		} else {
-			msg = fmt.Sprintf("http status %d: ", e.Status)
+			msg = fmt.Sprintf("http status %d: ", errVal.Status)
+		}
 	}
 
-	}
+	return errors.New(msg)
-
-	return msg
 }

pkg/es/ilm.go

@@ -37,7 +37,7 @@ func IlmRetry(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ilm.Retry(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retry ilm: %s", esErrorString(err))
+		return fmt.Errorf("failed to retry ilm: %w", esErrorString(err))
 	}
 
 	return nil
@@ -47,7 +47,7 @@ func IlmStatus(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Ilm.GetStatus().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm status: %s", esErrorString(err))
+		return fmt.Errorf("failed to get ilm status: %w", esErrorString(err))
 	}
 
 	fmt.Println(res.OperationMode.Name)
@@ -59,7 +59,7 @@ func IlmNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Ilm.GetLifecycle().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get ilm policies: %s", esErrorString(err))
+		return nil, fmt.Errorf("failed to get ilm policies: %w", esErrorString(err))
 	}
 
 	names := make([]string, len(res))
@@ -82,7 +82,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
 
 	res, err := ilm.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm policies: %s", esErrorString(err))
+		return fmt.Errorf("failed to get ilm policies: %w", esErrorString(err))
 	}
 
 	if conf.Debug {
@@ -102,6 +102,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -110,7 +111,7 @@ func IlmShow(conf *cfg.Config, policy string) error {
 		Policy(policy).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm status: %s", esErrorString(err))
+		return fmt.Errorf("failed to get ilm status: %w", esErrorString(err))
 	}
 
 	if conf.Debug {
@@ -166,6 +167,7 @@ func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
 			}
 
 			indent += "    "
+
 			continue
 		}
 
@@ -260,7 +262,7 @@ func ilmPhaseString(phase *types.Phase, short bool) string {
 	}
 
 	if phase.Actions.SearchableSnapshot != nil {
-		out = append(out, fmt.Sprintf("searchable-snapshot:%s", phase.Actions.SearchableSnapshot.SnapshotRepository))
+		out = append(out, "searchable-snapshot:"+phase.Actions.SearchableSnapshot.SnapshotRepository)
 	}
 
 	return strings.Join(out, ",")
@@ -270,7 +272,7 @@ func IlmExplain(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Ilm.ExplainLifecycle(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm state: %s", esErrorString(err))
+		return fmt.Errorf("failed to get ilm state: %w", esErrorString(err))
 	}
 
 	slog.Debug("ilm status", "ilm", res)
@@ -286,6 +288,7 @@ func IlmExplain(conf *cfg.Config, index string) error {
 	table.Addheaders("ilm status field", "value")
 
 	info := ""
+
 	err = json.Unmarshal(ilm.StepInfo["reason"], &info)
 	if err != nil {
 		return fmt.Errorf("failed to unmarshal step info: %w", err)
@@ -345,7 +348,9 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 	if cfg.HaveHot() {
 		hot := types.Phase{}
+
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
+
 		rollover := &types.RolloverAction{}
 		haveroll := false
 
@@ -383,15 +388,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		hot.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Hot = &hot
-	} else {
+	} else if policy != nil {
-		if policy != nil {
 		// update
 		phases.PhasesCaster().Hot = policy.Phases.Hot
 	}
-	}
 
 	if cfg.HaveWarm() {
 		warm := types.Phase{}
+
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -417,15 +421,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		warm.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Warm = &warm
-	} else {
+	} else if policy != nil && policy.Phases.Warm != nil {
-		if policy != nil && policy.Phases.Warm != nil {
 		// update
 		phases.PhasesCaster().Warm = policy.Phases.Warm
 	}
-	}
 
 	if cfg.HaveCold() {
 		cold := types.Phase{}
+
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -452,15 +455,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		cold.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Cold = &cold
-	} else {
+	} else if policy != nil && policy.Phases.Cold != nil {
-		if policy != nil && policy.Phases.Cold != nil {
 		// update
 		phases.PhasesCaster().Cold = policy.Phases.Cold
 	}
-	}
 
 	if cfg.HaveFrozen() {
 		froze := types.Phase{}
+
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -479,16 +481,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		froze.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Frozen = &froze
-	} else {
+	} else if policy != nil && policy.Phases.Frozen != nil {
-		if policy != nil && policy.Phases.Frozen != nil {
 		// update
 		phases.PhasesCaster().Frozen = policy.Phases.Frozen
 	}
-	}
 
 	if cfg.HaveDelete() {
 		del := types.Phase{}
 		delete := types.DeleteAction{}
+
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -507,12 +508,10 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 		actions.IlmActionsCaster().Delete = &delete
 		del.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Delete = &del
-	} else {
+	} else if policy != nil && policy.Phases.Delete != nil {
-		if policy != nil && policy.Phases.Delete != nil {
 		// update
 		phases.PhasesCaster().Delete = policy.Phases.Delete
 	}
-	}
 
 	put := &putlifecycle.Request{}
 	newpolicy := &types.IlmPolicy{}
@@ -523,7 +522,7 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 	_, err = ilm.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed create ilm policy: %s", esErrorString(err))
+		return fmt.Errorf("failed create ilm policy: %w", esErrorString(err))
 	}
 
 	return nil

pkg/es/ilm_forecast.go

@@ -138,6 +138,7 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -154,14 +155,11 @@ func IlmForecastShow(conf *cfg.Config) error {
 	}
 
 	within := parseDuration(conf.Ilm.Within)
+
 	var toBeFreed int64 = 0
 
 	for _, phase := range phaseData {
-		age := virtualAge(&phase)
+		age := max(virtualAge(&phase), phase.age)
-
-		if age < phase.age {
-			age = phase.age
-		}
 
 		if age+within >= phase.minage {
 			toBeFreed += phase.size
@@ -196,24 +194,26 @@ func getIlmPhaseData(conf *cfg.Config) ([]PhaseData, error) {
 
 	wg.Wait()
 
-	var ilmdetails *explainlifecycle.Response
+	var (
-	var indicesres *indices.Response
+		ilmdetails  *explainlifecycle.Response
-	var ilmpolicies getlifecycle.Response
+		indicesres  *indices.Response
+		ilmpolicies getlifecycle.Response
+	)
 
-	for i := 0; i < 3; i++ {
+	for range 3 {
-		r := <-responses
+		res := <-responses
 
-		if r.error != nil {
+		if res.error != nil {
-			return nil, r.error
+			return nil, res.error
 		}
 
-		switch r.which {
+		switch res.which {
 		case ResponseExplain:
-			ilmdetails = r.explainlifecycle
+			ilmdetails = res.explainlifecycle
 		case ResponseIndices:
-			indicesres = r.indicesbytes
+			indicesres = res.indicesbytes
 		case ResponseLifecycle:
-			ilmpolicies = *r.lifecycle
+			ilmpolicies = *res.lifecycle
 		}
 	}
 

pkg/es/index.go

@@ -37,9 +37,8 @@ import (
 func IndexNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Cat.Indices().
 		Do(context.Background())
-
 	if err != nil {
-		return nil, fmt.Errorf("failed to get indicies: %s", esErrorString(err))
+		return nil, fmt.Errorf("failed to get indicies: %w", esErrorString(err))
 	}
 
 	indices := make([]string, len(res))
@@ -97,7 +96,7 @@ func IndexList(conf *cfg.Config) error {
 
 	res, err := cat.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get indicies: %s", esErrorString(err))
+		return fmt.Errorf("failed to get indicies: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "indicies", res)
@@ -126,6 +125,7 @@ func IndexList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -133,13 +133,14 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
 	res, err := conf.DefaultCluster.ES().Indices.Get(indexpattern).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get index: %s", esErrorString(err))
+		return fmt.Errorf("failed to get index: %w", esErrorString(err))
 	}
 
 	slog.Debug("index show", "index", res)
 
 	for name, index := range res {
 		fields := make([]string, len(index.Mappings.Properties))
+
 		idx := 0
 		for field := range index.Mappings.Properties {
 			fields[idx] = field
@@ -195,6 +196,7 @@ func IndexCreate(conf *cfg.Config, index string, mappings []string) error {
 	if conf.Shards > 0 {
 		settings.NumberOfShards(strconv.Itoa(conf.Shards))
 	}
+
 	if conf.Replicas > 0 {
 		settings.NumberOfReplicas(strconv.Itoa(conf.Replicas))
 	}
@@ -232,9 +234,8 @@ func IndexCreate(conf *cfg.Config, index string, mappings []string) error {
 
 	_, err := create.Settings(settings).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to create index: %s", esErrorString(err))
+		return fmt.Errorf("failed to create index: %w", esErrorString(err))
 	}
 
 	return nil
@@ -244,7 +245,7 @@ func IndexDelete(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Indices.Delete(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to delete index: %s", esErrorString(err))
+		return fmt.Errorf("failed to delete index: %w", esErrorString(err))
 	}
 
 	return nil
@@ -253,9 +254,8 @@ func IndexDelete(conf *cfg.Config, index string) error {
 func IndexClose(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Indices.Close(index).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to close index: %s", esErrorString(err))
+		return fmt.Errorf("failed to close index: %w", esErrorString(err))
 	}
 
 	return nil
@@ -267,13 +267,14 @@ func IndexFields(conf *cfg.Config, index string) error {
 		Fields("*").
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve field capabilties: %s", esErrorString(err))
+		return fmt.Errorf("failed to retrieve field capabilties: %w", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 5, 0)
 	table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
 
 	idx := 0
+
 	for name, field := range res.Fields {
 		for fieldtype, caps := range field {
 			// fields only have 1 type, so this one is it

pkg/es/index_alias.go

@@ -35,7 +35,7 @@ func IndexAliasCreate(conf *cfg.Config, index, alias string) error {
 	slog.Debug("create alias", "result", res)
 
 	if err != nil {
-		return fmt.Errorf("failed to create index alias: %s", esErrorString(err))
+		return fmt.Errorf("failed to create index alias: %w", esErrorString(err))
 	}
 
 	return nil
@@ -52,9 +52,8 @@ func IndexAliasList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetAlias().
 		Index("_all").
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to list index aliases: %s", esErrorString(err))
+		return fmt.Errorf("failed to list index aliases: %w", esErrorString(err))
 	}
 
 	slog.Debug("aliases list", "result", res)
@@ -102,7 +101,7 @@ func IndexAliasDelete(conf *cfg.Config, index, alias string) error {
 	slog.Debug("delete alias", "result", res)
 
 	if err != nil {
-		return fmt.Errorf("failed to delete index alias: %s", esErrorString(err))
+		return fmt.Errorf("failed to delete index alias: %w", esErrorString(err))
 	}
 
 	return nil
@@ -110,9 +109,8 @@ func IndexAliasDelete(conf *cfg.Config, index, alias string) error {
 
 func IndexAliasRollover(conf *cfg.Config, alias string) error {
 	res, err := RolloverAlias(conf, alias)
-
 	if err != nil {
-		return fmt.Errorf("failed to rollover index alias: %s", esErrorString(err))
+		return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 2, 5)

pkg/es/index_template.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"maps"
 	"strconv"
 	"strings"
 
@@ -35,9 +36,8 @@ import (
 func IndexTemplateList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to get index templates: %s", esErrorString(err))
+		return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
 	}
 
 	slog.Debug("res", "index templates", res)
@@ -55,6 +55,7 @@ func IndexTemplateList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -62,9 +63,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(tplname).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to get index template: %s", esErrorString(err))
+		return fmt.Errorf("failed to get index template: %w", esErrorString(err))
 	}
 
 	slog.Debug("res", "index template", res)
@@ -108,10 +108,11 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 
 	err = getIndexTemplateSettings(conf, tplname, table)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	fmt.Println()
+
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -136,6 +137,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 		}
 
 		fmt.Println()
+
 		if err := table.Print(); err != nil {
 			return err
 		}
@@ -223,9 +225,8 @@ func IndexTemplateCreate(conf *cfg.Config, name string, mappings []string) error
 	create.IndexPatterns(conf.Patterns...)
 
 	_, err := create.Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to create index template: %s", esErrorString(err))
+		return fmt.Errorf("failed to create index template: %w", esErrorString(err))
 	}
 
 	return nil
@@ -240,9 +241,8 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(name).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to get index template: %s", esErrorString(err))
+		return fmt.Errorf("failed to get index template: %w", esErrorString(err))
 	}
 
 	slog.Debug("res", "index template", res)
@@ -334,9 +334,8 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
 	modify.IndexPatterns(patterns...)
 
 	_, err = modify.Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to modify index template: %s", esErrorString(err))
+		return fmt.Errorf("failed to modify index template: %w", esErrorString(err))
 	}
 
 	if conf.Rollover {
@@ -352,7 +351,7 @@ func IndexTemplateDelete(conf *cfg.Config, name string) error {
 	_, err := conf.DefaultCluster.ES().Indices.DeleteIndexTemplate(name).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to delete index template: %s", esErrorString(err))
+		return fmt.Errorf("failed to delete index template: %w", esErrorString(err))
 	}
 
 	return nil
@@ -365,9 +364,8 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(name).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to get index template: %s", esErrorString(err))
+		return fmt.Errorf("failed to get index template: %w", esErrorString(err))
 	}
 
 	slog.Debug("res", "index template", res)
@@ -384,7 +382,7 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 		res, err := conf.DefaultCluster.ES().Indices.ResolveIndex(pattern).
 			Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to resolve index pattern: %s", esErrorString(err))
+			return fmt.Errorf("failed to resolve index pattern: %w", esErrorString(err))
 		}
 
 		for _, index := range res.Indices {
@@ -416,7 +414,6 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 	}
 
 	return nil
-
 }
 
 func modMappings(mappings []string) (types.TypeMappingVariant, error) {
@@ -448,9 +445,7 @@ func modMappings(mappings []string) (types.TypeMappingVariant, error) {
 func modMeta(conf *cfg.Config, meta types.Metadata) (map[string]json.RawMessage, error) {
 	metadata := map[string]json.RawMessage{}
 
-	for key, value := range meta {
+	maps.Copy(metadata, meta)
-		metadata[key] = value
-	}
 
 	for _, meta := range conf.Meta {
 		parts := strings.Split(meta, ":")

pkg/es/index_template_settings.go

@@ -43,6 +43,7 @@ func getIndexTemplateSettings(conf *cfg.Config, tplname string, table *printer.T
 		if err != nil {
 			return err
 		}
+
 		fmt.Println(output)
 	}
 

pkg/es/license.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"strconv"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
@@ -29,7 +30,7 @@ func LicenseShow(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().License.Get().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get license: %s", esErrorString(err))
+		return fmt.Errorf("failed to get license: %w", esErrorString(err))
 	}
 
 	slog.Debug("license show", "license", res)
@@ -38,12 +39,14 @@ func LicenseShow(conf *cfg.Config) error {
 
 	lic := res.License
 
-	var maxnodes = "infinite"
+	var (
-	var maxunits = "infinite"
+		maxnodes = "infinite"
-	var expire = "never"
+		maxunits = "infinite"
+		expire   = "never"
+	)
 
 	if lic.MaxNodes != nil {
-		maxnodes = fmt.Sprintf("%d", *lic.MaxNodes)
+		maxnodes = strconv.FormatInt(*lic.MaxNodes, 10)
 	}
 
 	if lic.ExpiryDate != nil {
@@ -51,7 +54,7 @@ func LicenseShow(conf *cfg.Config) error {
 	}
 
 	if lic.MaxResourceUnits != nil {
-		maxunits = fmt.Sprintf("%d", *lic.MaxResourceUnits)
+		maxunits = strconv.Itoa(*lic.MaxResourceUnits)
 	}
 
 	table.Entries = [][]any{

pkg/es/node.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"strconv"
 	"strings"
 	"time"
 
@@ -32,7 +33,7 @@ func NodeList(conf *cfg.Config) error {
 	// get nodes
 	nodes, err := conf.DefaultCluster.ES().Cat.Nodes().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get nodes: %s", esErrorString(err))
+		return fmt.Errorf("failed to get nodes: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "nodes", nodes)
@@ -53,6 +54,7 @@ func NodeList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -64,7 +66,7 @@ func NodeNames(conf *cfg.Config) ([]string, error) {
 	nodes, err := conf.DefaultCluster.ES().Cat.Nodes().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get nodes: %s", esErrorString(err))
+		return nil, fmt.Errorf("failed to get nodes: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "nodes", nodes)
@@ -86,7 +88,7 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 		Metric("os, jvm, thread_pool, remote_cluster_server").
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get node info: %s", esErrorString(err))
+		return fmt.Errorf("failed to get node info: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "node", res)
@@ -95,7 +97,7 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 		NodeId(nodename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get node stats: %s", esErrorString(err))
+		return fmt.Errorf("failed to get node stats: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "stat", stats)
@@ -159,7 +161,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
 		NodeId(nodename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get node stats: %s", esErrorString(err))
+		return fmt.Errorf("failed to get node stats: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "stat", stats)
@@ -187,7 +189,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
 
 				table.AddRow(
 					agent,
-					fmt.Sprintf("%d", *client.Id),
+					strconv.FormatInt(*client.Id, 10),
 					time.UnixMilli(*client.LastRequestTimeMillis).String(),
 					*client.RemoteAddress,
 					uri,
@@ -199,5 +201,6 @@ func NodeClients(conf *cfg.Config, nodename string) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }

pkg/es/parallel.go

@@ -69,7 +69,8 @@ func getApiData(
 	which string) {
 	defer wg.Done()
 
-	ar := apiResponse{}
+	apiRes := apiResponse{}
+
 	var arerr error
 
 	switch which {
@@ -77,47 +78,47 @@ func getApiData(
 		res, err := es.Cluster.Health().
 			Do(context.Background())
 
-		ar.health = res
+		apiRes.health = res
-		ar.which = ResponseHealth
+		apiRes.which = ResponseHealth
 		arerr = err
 
 	case "healthreport":
 		report, err := getHealthReport(conf)
 
-		ar.healthreport = report
+		apiRes.healthreport = report
-		ar.which = ResponseHealthReport
+		apiRes.which = ResponseHealthReport
 		arerr = err
 
 	case "info":
 		res, err := es.Info().
 			Do(context.Background())
 
-		ar.info = res
+		apiRes.info = res
-		ar.which = ResponseInfo
+		apiRes.which = ResponseInfo
 		arerr = err
 
 	case "ccr":
 		res, err := es.Ccr.Stats().
 			Do(context.Background())
 
-		ar.ccr = res
+		apiRes.ccr = res
-		ar.which = ResponseCcr
+		apiRes.which = ResponseCcr
 		arerr = err
 
 	case "stats":
 		res, err := es.Cluster.Stats().
 			Do(context.Background())
 
-		ar.stats = res
+		apiRes.stats = res
-		ar.which = ResponseStats
+		apiRes.which = ResponseStats
 		arerr = err
 
 	case "indices":
 		res, err := es.Cat.Indices().
 			Do(context.Background())
 
-		ar.indices = &res
+		apiRes.indices = &res
-		ar.which = ResponseIndices
+		apiRes.which = ResponseIndices
 		arerr = err
 
 	case "indicesbytes":
@@ -126,16 +127,16 @@ func getApiData(
 			Bytes(bytes.Bytes{Name: "b"}).
 			Do(context.Background())
 
-		ar.indicesbytes = &res
+		apiRes.indicesbytes = &res
-		ar.which = ResponseIndices
+		apiRes.which = ResponseIndices
 		arerr = err
 
 	case "tasks":
 		res, err := es.Cat.Tasks().
 			Do(context.Background())
 
-		ar.tasks = &res
+		apiRes.tasks = &res
-		ar.which = ResponseTasks
+		apiRes.which = ResponseTasks
 		arerr = err
 
 	case "explain":
@@ -143,8 +144,8 @@ func getApiData(
 			ExplainLifecycle("_all").
 			Do(context.Background())
 
-		ar.explainlifecycle = res
+		apiRes.explainlifecycle = res
-		ar.which = ResponseExplain
+		apiRes.which = ResponseExplain
 		arerr = err
 
 	case "policies":
@@ -152,14 +153,14 @@ func getApiData(
 			GetLifecycle().
 			Do(context.Background())
 
-		ar.lifecycle = &res
+		apiRes.lifecycle = &res
-		ar.which = ResponseLifecycle
+		apiRes.which = ResponseLifecycle
 		arerr = err
 	}
 
 	if arerr != nil {
-		ar.error = fmt.Errorf("failed to get data from API: %s", arerr)
+		apiRes.error = fmt.Errorf("failed to get data from API: %w", arerr)
 	}
 
-	reschan <- ar
+	reschan <- apiRes
 }

pkg/es/role.go

@@ -30,10 +30,11 @@ func RoleNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Security.GetRole().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get roles: %s", esErrorString(err))
+		return nil, fmt.Errorf("failed to get roles: %w", esErrorString(err))
 	}
 
 	roles := make([]string, len(res))
+
 	idx := 0
 	for name := range res {
 		roles[idx] = name
@@ -47,7 +48,7 @@ func RoleList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Security.GetRole().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get roles: %s", esErrorString(err))
+		return fmt.Errorf("failed to get roles: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "roles", res)
@@ -66,6 +67,7 @@ func RoleList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -74,7 +76,7 @@ func RoleShow(conf *cfg.Config, rolename string) error {
 		Name(rolename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get role: %s", esErrorString(err))
+		return fmt.Errorf("failed to get role: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "role", res)
@@ -132,7 +134,9 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 2, len(role.RemoteCluster))
 	table.Addheaders("remote cluster", "privilege")
+
 	idx := 0
+
 	for _, priv := range role.RemoteCluster {
 		perms := []string{}
 		for _, perm := range priv.Privileges {
@@ -145,6 +149,7 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -155,6 +160,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 1, len(role.Cluster))
 	table.Addheaders("cluster rights")
+
 	idx := 0
 	for _, cluster := range role.Cluster {
 		table.Entries[idx] = []any{cluster.Name}
@@ -162,6 +168,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -172,7 +179,9 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 3, len(role.RemoteIndices))
 	table.Addheaders("remote index names", "index permissions", "allow restricted")
+
 	idx := 0
+
 	for _, priv := range role.RemoteIndices {
 		perms := []string{}
 		for _, perm := range priv.Privileges {
@@ -185,6 +194,7 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -195,7 +205,9 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 3, len(role.Indices))
 	table.Addheaders("index names", "index permissions", "allow restricted")
+
 	idx := 0
+
 	for _, priv := range role.Indices {
 		perms := []string{}
 		for _, perm := range priv.Privileges {
@@ -208,6 +220,7 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }
 
@@ -218,6 +231,7 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 3, len(role.Applications))
 	table.Addheaders("application", "privileges", "resources")
+
 	idx := 0
 	for _, priv := range role.Applications {
 		table.Entries[idx] = []any{
@@ -230,5 +244,6 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
+
 	return table.Print()
 }

pkg/es/role_diff.go

@@ -75,7 +75,7 @@ type Register struct {
 func getCsvRecords(conf *cfg.Config, csvfile string) (map[string]Record, error) {
 	data, err := os.ReadFile(csvfile)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read CSV file: %s", err)
+		return nil, fmt.Errorf("failed to read CSV file: %w", err)
 	}
 
 	csvreader := csv.NewReader(bytes.NewReader(data))
@@ -85,7 +85,7 @@ func getCsvRecords(conf *cfg.Config, csvfile string) (map[string]Record, error)
 
 	rows, err := csvreader.ReadAll()
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse CSV: %s", err)
+		return nil, fmt.Errorf("failed to parse CSV: %w", err)
 	}
 
 	records := make(map[string]Record, len(rows)-1)
@@ -118,7 +118,7 @@ func getCsvRecords(conf *cfg.Config, csvfile string) (map[string]Record, error)
 func getCsvRecord(conf *cfg.Config, csvfile, rolename string) (*Record, error) {
 	fd, err := os.Open(csvfile)
 	if err != nil {
-		return nil, fmt.Errorf("failed to open CSV file: %s", err)
+		return nil, fmt.Errorf("failed to open CSV file: %w", err)
 	}
 	defer func() {
 		if err := fd.Close(); err != nil {
@@ -179,6 +179,7 @@ func diffRoles(conf *cfg.Config, records map[string]Record, res getrole.Response
 	// iterate over records from CSV and register only those which are not deployed
 	for name := range records {
 		reg := Register{name: name, defined: true}
+
 		_, deployed := deployed[name]
 		if !deployed {
 			rows = append(rows, reg)
@@ -210,7 +211,7 @@ func RoleDiff(conf *cfg.Config, csvfile, role string) error {
 	res, err := conf.DefaultCluster.ES().Security.GetRole().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get roles: %s", esErrorString(err))
+		return fmt.Errorf("failed to get roles: %w", esErrorString(err))
 	}
 
 	rows := diffRoles(conf, records, res)
@@ -245,10 +246,11 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
 	mappings, err := conf.DefaultCluster.ES().Security.GetRoleMapping().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get role mappings: %s", esErrorString(err))
+		return nil, fmt.Errorf("failed to get role mappings: %w", esErrorString(err))
 	}
 
 	groups := []string{}
+
 	for _, mapping := range mappings {
 		if slices.Contains(mapping.Roles, rolename) {
 			for _, rule := range mapping.Rules.Any {
@@ -262,13 +264,13 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
 	return groups, nil
 }
 
-func compareSlices(name string, a, b []string) {
+func compareSlices(name string, left, right []string) {
-	slices.Sort(a)
+	slices.Sort(left)
-	slices.Sort(b)
+	slices.Sort(right)
 
-	if slices.Compare(a, b) != 0 {
+	if slices.Compare(left, right) != 0 {
 		fmt.Printf("%s differs:\ndeployed: %s\n     csv: %s\n",
-			name, strings.Join(a, ","), strings.Join(b, ","))
+			name, strings.Join(left, ","), strings.Join(right, ","))
 	} else {
 		fmt.Printf("deployed %s matches csv definition\n", name)
 	}
@@ -279,7 +281,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 		Name(rolename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get role: %s", esErrorString(err))
+		return fmt.Errorf("failed to get role: %w", esErrorString(err))
 	}
 
 	record, err := getCsvRecord(conf, csvfile, rolename)
@@ -289,16 +291,19 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 
 	if !record.defined {
 		fmt.Printf("role %s is not defined\n", rolename)
+
 		return nil
 	}
 
 	role, exists := res[rolename]
 	if !exists {
 		fmt.Printf("role %s is not deployed\n", rolename)
+
 		return nil
 	} else {
 		fmt.Printf("role %s is deployed\n", rolename)
 	}
+
 	slog.Debug("found role", "role", role)
 
 	if conf.Debug {
@@ -310,6 +315,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 	if err != nil {
 		return err
 	}
+
 	slog.Debug("group mappings", "groups", groups)
 
 	// check cluster setting
@@ -321,6 +327,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 	// check index names+privs
 	indices := []string{}
 	privs := []string{}
+
 	for _, index := range role.Indices {
 		for _, name := range index.Names {
 			indices = append(indices, strings.ReplaceAll(name, "**", "*"))
@@ -333,6 +340,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 
 	// check kibana application space
 	spaces := []string{}
+
 	for _, app := range role.Applications {
 		for _, resource := range app.Resources {
 			if strings.Contains(resource, "space:") {

pkg/es/rollover.go

@@ -31,14 +31,17 @@ func RolloverConditions(conf *cfg.Config) types.RolloverConditionsVariant {
 	if conf.MaxAge != "" {
 		cond.MaxAge(esdsl.NewDuration().String(conf.MaxAge))
 	}
+
 	if conf.MaxDocs > 0 {
 		cond.MaxDocs(int64(conf.MaxDocs))
 	}
+
 	if conf.MaxShardSize > 0 {
 		bs := esdsl.NewByteSize()
 		bs.Int64(int64(conf.MaxShardSize))
 		cond.MaxPrimaryShardSize(bs)
 	}
+
 	if conf.MaxShardDocs > 0 {
 		cond.MaxPrimaryShardDocs(int64(conf.MaxShardDocs))
 	}

pkg/es/search.go

@@ -82,13 +82,13 @@ func explainSearch(conf *cfg.Config, search *search.Search) error {
 		Size(1). // one's enough for explain
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to call explain search (esdsl): %s", esErrorString(err))
+		return fmt.Errorf("failed to call explain search (esdsl): %w", esErrorString(err))
 	}
 
 	if conf.Debug {
 		raw, err := json.Marshal(res)
 		if err != nil {
-			return fmt.Errorf("failed to marshal explain result: %s", err)
+			return fmt.Errorf("failed to marshal explain result: %w", err)
 		}
 
 		value := gjson.Get(string(raw), "hits.hits.0._explanation")
@@ -111,6 +111,7 @@ func explainSearch(conf *cfg.Config, search *search.Search) error {
 
 func explain(res *types.ExplanationDetail, indent string) {
 	fmt.Println(indent + "- " + res.Description)
+
 	for _, ex := range res.Details {
 		fmt.Println(indent + "  - " + ex.Description)
 		fmt.Println(indent + fmt.Sprintf("    score: %f", res.Value))
@@ -134,7 +135,7 @@ func validateSearch(conf *cfg.Config, queries []string) error {
 	res, err := validate.
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to validate search (esdsl): %s", esErrorString(err))
+		return fmt.Errorf("failed to validate search (esdsl): %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "search", res)
@@ -154,7 +155,7 @@ func searchOnce(conf *cfg.Config, search *search.Search) error {
 		Size(conf.To).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to run search (esdsl): %s", esErrorString(err))
+		return fmt.Errorf("failed to run search (esdsl): %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "search", res)
@@ -167,9 +168,10 @@ func searchOnce(conf *cfg.Config, search *search.Search) error {
 // https://www.elastic.co/docs/reference/elasticsearch/clients/go/using-the-api/searching#_pit_search_after
 func searchPit(conf *cfg.Config, req *search.Request) error {
 	ctx := context.Background()
+
 	pit, err := conf.DefaultCluster.ES().OpenPointInTime(conf.Index).KeepAlive("1m").Do(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to open point-in-time request for search: %s", err)
+		return fmt.Errorf("failed to open point-in-time request for search: %w", err)
 	}
 	defer func() {
 		_, err := conf.DefaultCluster.ES().ClosePointInTime().Id(pit.Id).Do(ctx)
@@ -192,7 +194,7 @@ func searchPit(conf *cfg.Config, req *search.Request) error {
 	for {
 		res, err := search.Do(ctx)
 		if err != nil {
-			return fmt.Errorf("failed to run search (esdsl pit): %s", esErrorString(err))
+			return fmt.Errorf("failed to run search (esdsl pit): %w", esErrorString(err))
 		}
 
 		if len(res.Hits.Hits) == 0 {
@@ -222,7 +224,7 @@ func searchTail(conf *cfg.Config, search *search.Search) error {
 	for {
 		res, err := search.Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to run search (esdsl): %s", esErrorString(err))
+			return fmt.Errorf("failed to run search (esdsl): %w", esErrorString(err))
 		}
 
 		slog.Debug("ES result", "search", res)

pkg/es/search_filter.go

@@ -63,6 +63,7 @@ type filter struct {
 // must match literally, and range filters using -r "@timestamp:2026-05-28T10:00:00 to now"
 func NewFilter(query string) (*filter, error) {
 	var separator string
+
 	var criteria int // we use the constants on top for this
 
 	switch {
@@ -76,7 +77,7 @@ func NewFilter(query string) (*filter, error) {
 
 	part := strings.Split(query, separator)
 	if len(part) != 2 {
-		return nil, fmt.Errorf("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
+		return nil, errors.New("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
 	}
 
 	flt := &filter{term: part[0], filter: part[1], criteria: criteria}
@@ -234,7 +235,6 @@ func addFilters(conf *cfg.Config) ([]types.QueryVariant, error) {
 		}
 
 		filters[count-1] = rng
-
 	}
 
 	return filters, nil
@@ -247,7 +247,6 @@ func addSort(conf *cfg.Config, search *search.Search) *search.Search {
 		Index(conf.Index).
 		Fields(conf.SortBy).
 		Do(context.Background())
-
 	if err != nil {
 		// whatever it was, do not add Sort()
 		slog.Debug("get field capabilities", "field", conf.SortBy, "error", esErrorString(err))

pkg/es/shard.go

@@ -40,8 +40,7 @@ func colorzizeShard(conf *cfg.Config, state, name string) string {
 }
 
 func resolvePrirep(state string) string {
-	switch state {
+	if state == "p" {
-	case "p":
 		return "primary"
 	}
 
@@ -86,7 +85,7 @@ func ShardList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Cat.Shards().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get shards: %s", esErrorString(err))
+		return fmt.Errorf("failed to get shards: %w", esErrorString(err))
 	}
 
 	shardlist := filterShards(conf, res)
@@ -125,6 +124,7 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -136,7 +136,7 @@ func ShardShow(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Cat.Shards().Index(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get shards: %s", esErrorString(err))
+		return fmt.Errorf("failed to get shards: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "shards", res)
@@ -158,7 +158,7 @@ func ShardAllocation(conf *cfg.Config, index string) error {
 
 	res, err := explain.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get shard allocation explain: %s", esErrorString(err))
+		return fmt.Errorf("failed to get shard allocation explain: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "explain", res)

pkg/es/snapshot.go

@@ -45,7 +45,7 @@ func SnapshotList(conf *cfg.Config) error {
 	// get partial indicies
 	ires, err := conf.DefaultCluster.ES().Cat.Indices().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get indicies: %s", esErrorString(err))
+		return fmt.Errorf("failed to get indicies: %w", esErrorString(err))
 	}
 
 	indicies := map[string]int{}
@@ -58,7 +58,7 @@ func SnapshotList(conf *cfg.Config) error {
 	// get snapshots
 	sres, err := conf.DefaultCluster.ES().Cat.Snapshots().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get snapshots: %s", esErrorString(err))
+		return fmt.Errorf("failed to get snapshots: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "indicies", sres)
@@ -98,6 +98,7 @@ func SnapshotList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
+
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -108,7 +109,7 @@ func SnapshotList(conf *cfg.Config) error {
 func SnapshotShow(conf *cfg.Config, snapshot string) error {
 	res, err := conf.DefaultCluster.ES().Snapshot.Get("*", snapshot).Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get snapshot: %s", esErrorString(err))
+		return fmt.Errorf("failed to get snapshot: %w", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "snapshot", res)

pkg/es/task.go

@@ -30,15 +30,15 @@ import (
 func TaskList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Cat.Tasks().
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to get index templates: %s", esErrorString(err))
+		return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
 	}
 
 	slog.Debug("res", "tasks", res)
 
 	table := printer.NewTable(conf, 8, len(res))
 	table.Addheaders("task id", "action", "start time", "run time", "node", "type")
+
 	for idx, task := range res {
 		var ts time.Time
 
@@ -66,9 +66,8 @@ func TaskCancel(conf *cfg.Config, taskid string) error {
 	_, err := conf.DefaultCluster.ES().Tasks.Cancel().
 		TaskId(taskid).
 		Do(context.Background())
-
 	if err != nil {
-		return fmt.Errorf("failed to cancel task: %s", esErrorString(err))
+		return fmt.Errorf("failed to cancel task: %w", esErrorString(err))
 	}
 
 	return nil

pkg/printer/cast.go

@@ -26,6 +26,7 @@ import (
 )
 
 func any2string(in any) string {
+	//nolint:gocritic
 	switch val := in.(type) {
 	case string:
 		return val
@@ -45,10 +46,10 @@ func any2string(in any) string {
 		return val.Format("2006-01-02 15:04:05")
 	case []byte:
 		return string(val)
-	case types.DateTime, types.Percentage:
-		return val.(string)
 	case nil:
 		return "null"
+	case types.Percentage, types.DateTime:
+		return val.(string)
 	}
 
 	return ""
@@ -78,6 +79,7 @@ func (data *Table) preprocessRows() {
 	// determine max width per column
 	for _, entries := range data.rows {
 		currentWidth := 0
+
 		for idx, entry := range entries {
 			length := visibleLen(entry)
 

pkg/printer/doc.go

@@ -33,7 +33,6 @@ func PrintDocs(conf *cfg.Config, hits []types.Hit) {
 	for _, hit := range hits {
 		PrintDoc(conf, hit)
 	}
-
 }
 
 func PrintDoc(conf *cfg.Config, hit types.Hit) {

pkg/printer/pager.go

@@ -34,12 +34,14 @@ var (
 	titleStyle = func() lipgloss.Style {
 		b := lipgloss.RoundedBorder()
 		b.Right = "├"
+
 		return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
 	}()
 
 	infoStyle = func() lipgloss.Style {
 		b := lipgloss.RoundedBorder()
 		b.Left = "┤"
+
 		return titleStyle.BorderStyle(b)
 	}()
 )
@@ -56,10 +58,9 @@ func (m model) Init() tea.Cmd {
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var (
+	var cmd tea.Cmd
-		cmd  tea.Cmd
+
-		cmds []tea.Cmd
+	cmds := make([]tea.Cmd, 1)
-	)
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
@@ -90,7 +91,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	// Handle keyboard and mouse events in the viewport
 	m.viewport, cmd = m.viewport.Update(msg)
-	cmds = append(cmds, cmd)
+	cmds[0] = cmd
 
 	return m, tea.Batch(cmds...)
 }
@@ -99,6 +100,7 @@ func (m model) View() string {
 	if !m.ready {
 		return "\n  Initializing..."
 	}
+
 	return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
 }
 
@@ -106,30 +108,25 @@ func (m model) headerView() string {
 	// title := titleStyle.Render("RPN Help Overview")
 	title := titleStyle.Render(m.title)
 	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
+
 	return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
 }
 
 func (m model) footerView() string {
 	info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
 	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
+
 	return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
 }
 
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
 func Pager(title, message string) {
-	p := tea.NewProgram(
+	pager := tea.NewProgram(
 		model{content: message, title: title},
 		tea.WithAltScreen(),       // use the full size of the terminal in its "alternate screen buffer"
 		tea.WithMouseCellMotion(), // turn on mouse support so we can track the mouse wheel
 	)
 
-	if _, err := p.Run(); err != nil {
+	if _, err := pager.Run(); err != nil {
 		fmt.Println("could not run pager:", err)
 		os.Exit(1)
 	}

pkg/printer/table.go

@@ -55,6 +55,7 @@ func NewTable(conf *cfg.Config, columns, rows int) *Table {
 func NewTableEmpty(conf *cfg.Config) *Table {
 	table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
 	table.alignInts = conf.AlignInts
+
 	return &table
 }
 
@@ -70,14 +71,14 @@ func (table *Table) WithHeaders(headers ...string) *Table {
 	return table
 }
 
-func (data *Table) Print() error {
+func (table *Table) Print() error {
-	switch data.Mode {
+	switch table.Mode {
 	case "json":
-		return data.PrintJSON()
+		return table.PrintJSON()
 	case "yaml":
-		return data.PrintYAML()
+		return table.PrintYAML()
 	default:
-		return data.PrintTSV()
+		return table.PrintTSV()
 	}
 }
 
@@ -85,26 +86,12 @@ var (
 	ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`)
 )
 
-// needed for json and yaml output
+func (table *Table) PrintYAML() error {
-func (data *Table) toMap() []map[string]any {
+	raw := table.toMap()
-	raw := make([]map[string]any, len(data.Entries))
-
-	for idx, entries := range data.Entries {
-		raw[idx] = make(map[string]any, len(data.Headers))
-		for eidx, entry := range entries {
-			raw[idx][data.Headers[eidx]] = entry
-		}
-	}
-
-	return raw
-}
-
-func (data *Table) PrintYAML() error {
-	raw := data.toMap()
 
 	body, err := yaml.Marshal(raw)
 	if err != nil {
-		return fmt.Errorf("failed to produce YAML output: %s", err)
+		return fmt.Errorf("failed to produce YAML output: %w", err)
 	}
 
 	fmt.Println(string(body))
@@ -112,12 +99,12 @@ func (data *Table) PrintYAML() error {
 	return nil
 }
 
-func (data *Table) PrintJSON() error {
+func (table *Table) PrintJSON() error {
-	raw := data.toMap()
+	raw := table.toMap()
 
 	body, err := json.MarshalIndent(raw, "", "  ")
 	if err != nil {
-		return fmt.Errorf("failed to produce JSON output: %s", err)
+		return fmt.Errorf("failed to produce JSON output: %w", err)
 	}
 
 	fmt.Println(string(body))
@@ -125,34 +112,35 @@ func (data *Table) PrintJSON() error {
 	return nil
 }
 
-func (data *Table) PrintTSV() error {
+func (table *Table) PrintTSV() error {
 	// length's, convert cell types
-	data.preprocessRows()
+	table.preprocessRows()
 
 	// output headers
-	for idx, header := range data.Headers {
+	for idx, header := range table.Headers {
-		if idx+1 != len(data.Headers) {
+		if idx+1 != len(table.Headers) {
-			fmt.Print(header, strings.Repeat(" ", data.lenHeaders[idx]-visibleLen(header)))
+			fmt.Print(header, strings.Repeat(" ", table.lenHeaders[idx]-visibleLen(header)))
 		} else {
 			// no padding for last header
 			fmt.Print(header)
 		}
 
-		if idx < len(data.Headers)-1 {
+		if idx < len(table.Headers)-1 {
 			fmt.Print("  ")
 		}
 	}
+
 	fmt.Println()
 
-	for _, entries := range data.rows {
+	for _, entries := range table.rows {
 		currentWidth := 0
 
 		for idx, entry := range entries {
 			length := visibleLen(entry)
 
-			if length+currentWidth > data.maxwidth && data.maxwidth-currentWidth > 1 {
+			if length+currentWidth > table.maxwidth && table.maxwidth-currentWidth > 1 {
 				// text is too wide to be put into one line, wrap it
-				wrapper := wordwrap.Wrapper(data.maxwidth-currentWidth, false)
+				wrapper := wordwrap.Wrapper(table.maxwidth-currentWidth, false)
 				wrapped := wrapper(entry)
 
 				// and indent it
@@ -165,55 +153,71 @@ func (data *Table) PrintTSV() error {
 				}
 			}
 
-			currentWidth += data.lenHeaders[idx]
+			currentWidth += table.lenHeaders[idx]
 
-			if isInt(entry) && data.alignInts {
+			switch {
+			case isInt(entry) && table.alignInts:
 				// align right
-				fmt.Print(strings.Repeat(" ", data.lenHeaders[idx]-length), entry)
+				fmt.Print(strings.Repeat(" ", table.lenHeaders[idx]-length), entry)
-			} else if length < data.lenHeaders[idx] && idx+1 != len(entries) {
+			case length < table.lenHeaders[idx] && idx+1 != len(entries):
 				// pad right, if required
-				fmt.Print(entry, strings.Repeat(" ", data.lenHeaders[idx]-length))
+				fmt.Print(entry, strings.Repeat(" ", table.lenHeaders[idx]-length))
-			} else {
+			default:
 				// no padding for last entry
 				fmt.Print(entry)
 			}
 
-			if idx < len(data.Headers)-1 {
+			if idx < len(table.Headers)-1 {
 				fmt.Print("  ")
 			}
 		}
+
 		fmt.Println()
 	}
 
 	return nil
 }
 
-func (data *Table) Sort() {
+func (table *Table) Sort() {
 	// sanity checks
-	if len(data.Entries) == 0 {
+	if len(table.Entries) == 0 {
 		return
 	}
 
-	data.preprocessRows()
+	table.preprocessRows()
 
-	sort.Slice(data.rows, func(i, j int) bool {
+	sort.Slice(table.rows, func(i, j int) bool {
-		return data.rows[i][0] < data.rows[j][0]
+		return table.rows[i][0] < table.rows[j][0]
 	})
 }
 
-func (data *Table) Addheaders(headers ...string) {
+func (table *Table) Addheaders(headers ...string) {
 	for idx, header := range headers {
-		switch data.Mode {
+		switch table.Mode {
 		case "json", "yaml":
-			data.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
+			table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
 		default:
-			data.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
+			table.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
 		}
 	}
 }
 
-func (data *Table) AddRow(fields ...any) {
+func (table *Table) AddRow(fields ...any) {
-	data.Entries = append(data.Entries, fields)
+	table.Entries = append(table.Entries, fields)
+}
+
+// needed for json and yaml output
+func (table *Table) toMap() []map[string]any {
+	raw := make([]map[string]any, len(table.Entries))
+
+	for idx, entries := range table.Entries {
+		raw[idx] = make(map[string]any, len(table.Headers))
+		for eidx, entry := range entries {
+			raw[idx][table.Headers[eidx]] = entry
+		}
+	}
+
+	return raw
 }
 
 // return the length of a string but only visible chars, w/o ansi color escapes