Compare commits

..

7 Commits

Author SHA1 Message Date
734dea4dff fix go version 2026-07-08 09:30:33 +02:00
5d7050018f fix #79: remove compatibility header 2026-07-08 09:28:28 +02:00
1d45a3cd4c set go version for releaser 2026-07-08 00:00:37 +02:00
0104e1bf58 fix go releaser go version 2026-07-07 23:53:47 +02:00
2dc716d1c9 fix version newline 2026-07-07 23:49:57 +02:00
T. von Dein
0d63e7c4d2 satisfy full linter (#77) 2026-07-07 23:46:43 +02:00
T. von Dein
b8e0ee074c internal/gofix and fix error wrapping (#76) 2026-07-07 10:41:34 +02:00
49 changed files with 1235 additions and 1172 deletions

110
.golangci.yml Normal file
View File

@@ -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

View File

@@ -16,6 +16,7 @@ builds:
goos: goos:
- linux - linux
- darwin - darwin
tool: "go1.26.4"
changelog: changelog:
sort: asc sort: asc

View File

@@ -68,10 +68,10 @@ test: clean buildlocal
testlint: test lint testlint: test lint
lint: lint:
golangci-lint run golangci-lint run --enable-only errcheck,govet,ineffassign,staticcheck,unused
lint-full: 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 testfuzzy: clean
go test -fuzz ./... $(ARGS) go test -fuzz ./... $(ARGS)

View File

@@ -177,7 +177,6 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, stale bool) *cli.Command {
if stale { if stale {
name = "allocate-stale-primary" name = "allocate-stale-primary"
usage = "allocate a stale primary shard to a node" usage = "allocate a stale primary shard to a node"
} }
return &cli.Command{ return &cli.Command{

View File

@@ -48,8 +48,10 @@ func complete(cmd *cli.Command, what int) {
return return
} }
var list []string var (
var err error list []string
err error
)
switch what { switch what {
case Cindex: case Cindex:

View File

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

View File

@@ -19,7 +19,6 @@ package cmd
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"codeberg.org/scip/esctl/pkg/cfg" "codeberg.org/scip/esctl/pkg/cfg"
"codeberg.org/scip/esctl/pkg/es" "codeberg.org/scip/esctl/pkg/es"
@@ -163,7 +162,7 @@ Valid field mapping types: integer, text, date, keyword`,
Action: func(ctx context.Context, cmd *cli.Command) error { Action: func(ctx context.Context, cmd *cli.Command) error {
args := cmd.Args() args := cmd.Args()
if args.Len() == 0 { if args.Len() == 0 {
return fmt.Errorf("no index specified") return errors.New("no index specified")
} }
mappings := args.Slice()[1:] mappings := args.Slice()[1:]

View File

@@ -38,7 +38,8 @@ func IndexAlias(conf *cfg.Config) *cli.Command {
IndexAliasDelete(conf), IndexAliasDelete(conf),
IndexAliasRollover(conf), IndexAliasRollover(conf),
// FIXME: implement IndexAliasAdd // 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),
}, },
} }
} }

View File

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

View File

@@ -31,9 +31,61 @@ import (
"github.com/urfave/cli/v3" "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 { func Finish(err error) int {
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, "Error: ", err.Error()) fmt.Fprintln(os.Stderr, "Error: ", err.Error())
return 1 return 1
} }
@@ -127,6 +179,7 @@ func Main() int {
return nil, err return nil, err
} else { } else {
fmt.Println(cmd.UsageText) fmt.Println(cmd.UsageText)
return nil, nil return nil, nil
} }
} }
@@ -161,53 +214,13 @@ func Main() int {
} }
func HelpJsonPath(conf *cfg.Config) *cli.Command { 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{ return &cli.Command{
Name: "help-jsonpath", Name: "help-jsonpath",
Usage: "show jsonpath help", Usage: "show jsonpath help",
Action: func(ctx context.Context, cmd *cli.Command) error { Action: func(ctx context.Context, cmd *cli.Command) error {
_, err := fmt.Println(msg) _, err := fmt.Println(jsonPathUsage)
return err return err
}, },
} }
@@ -219,8 +232,9 @@ func Version(conf *cfg.Config) *cli.Command {
Usage: "show esctl version information", Usage: "show esctl version information",
Action: func(ctx context.Context, cmd *cli.Command) error { 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) cfg.Version, cfg.BUILD, cfg.BRANCH, cfg.COMMIT, cfg.GOVERSION, cfg.APIVERSION)
return err 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 // copy of cmd.Walk() with the exception to skip hidden commands and its siblings

View File

@@ -29,6 +29,7 @@ func addReference(ref string) string {
for line := range strings.SplitSeq(ref, "\n") { for line := range strings.SplitSeq(ref, "\n") {
indentedRef = append(indentedRef, " "+line) indentedRef = append(indentedRef, " "+line)
} }
return fmt.Sprintf("%s\nREFERENCE:\n%s\n", return fmt.Sprintf("%s\nREFERENCE:\n%s\n",
cli.SubcommandHelpTemplate, cli.SubcommandHelpTemplate,
strings.Join(indentedRef, "\n")) strings.Join(indentedRef, "\n"))

2
go.mod
View File

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

View File

@@ -55,37 +55,6 @@ func (cluster *Cluster) SetClient(client *elasticsearch.TypedClient) {
cluster.client = client 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, // return the go-elasticsearch client object but before doing that,
// check if we need to tune auth // check if we need to tune auth
func (cluster *Cluster) ES() *elasticsearch.TypedClient { func (cluster *Cluster) ES() *elasticsearch.TypedClient {
@@ -114,7 +83,8 @@ func (cluster *Cluster) CheckAuth() error {
} else { } else {
// k, try interactively // k, try interactively
fmt.Fprintf(os.Stderr, "Enter password for elasticsearch user %s@%s: ", cluster.User, cluster.Name) 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 { if err != nil {
return err return err
} }
@@ -125,6 +95,7 @@ func (cluster *Cluster) CheckAuth() error {
} }
cluster.Pass = string(pass) cluster.Pass = string(pass)
fmt.Println() fmt.Println()
} }
@@ -132,7 +103,6 @@ func (cluster *Cluster) CheckAuth() error {
opts = append(opts, elasticsearch.WithBasicAuth(cluster.User, cluster.Pass)) opts = append(opts, elasticsearch.WithBasicAuth(cluster.User, cluster.Pass))
es, err := elasticsearch.NewTyped(opts...) es, err := elasticsearch.NewTyped(opts...)
if err != nil { if err != nil {
return fmt.Errorf("failed to setup elasticsearch connection: %w", err) return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
} }
@@ -205,6 +175,40 @@ func (cluster *Cluster) IsReachable() (bool, error) {
return true, conn.Close() 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 { func (conf *Config) SetupES() error {
for name, cluster := range conf.Clusters { for name, cluster := range conf.Clusters {
cluster.Name = name cluster.Name = name
@@ -220,7 +224,6 @@ func (conf *Config) SetupES() error {
} }
es, err := elasticsearch.NewTyped(opts...) es, err := elasticsearch.NewTyped(opts...)
if err != nil { if err != nil {
return fmt.Errorf("failed to setup elasticsearch connection: %w", err) return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
} }

View File

@@ -151,45 +151,6 @@ func (conf *Config) Init() error {
return nil 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 // 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) // shorter repr.Println() output (the ES structure is just too large)
func (conf *Config) Clone() Config { func (conf *Config) Clone() Config {
@@ -198,14 +159,14 @@ func (conf *Config) Clone() Config {
ref := reflect.ValueOf(*conf) ref := reflect.ValueOf(*conf)
typeOfS := ref.Type() 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 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 return clone
@@ -266,6 +227,7 @@ func (conf *Config) LoadConfig() error {
for _, cluster := range conf.Clusters { for _, cluster := range conf.Clusters {
if cluster.Default { if cluster.Default {
conf.DefaultCluster = cluster conf.DefaultCluster = cluster
break break
} }
} }
@@ -278,9 +240,47 @@ func (conf *Config) LoadConfig() error {
return nil 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 { func fileExists(filename string) bool {
info, err := os.Stat(filename) info, err := os.Stat(filename)
if err != nil { if err != nil {
// return false on any error // return false on any error
return false return false

View File

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

View File

@@ -43,6 +43,7 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
} }
var pretty bytes.Buffer var pretty bytes.Buffer
err = json.Indent(&pretty, buf.Bytes(), "", "\t") err = json.Indent(&pretty, buf.Bytes(), "", "\t")
if err != nil { if err != nil {
return nil, fmt.Errorf("json parse error: %w", err) return nil, fmt.Errorf("json parse error: %w", err)
@@ -52,6 +53,11 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
contentline = buf.String() contentline = buf.String()
} }
if req.Header.Get("Accept") != "" {
req.Header.Del("Accept")
req.Header.Add("Accept", "application/json")
}
slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path, slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path,
"body", content, "bodyline", contentline, "body", content, "bodyline", contentline,
"headers", req.Header, "headers", req.Header,
@@ -59,3 +65,21 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return t.Transport.RoundTrip(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.
type CompatibilityTransport struct {
Transport http.RoundTripper
}
func (t *CompatibilityTransport) RoundTrip(req *http.Request) (*http.Response, error) {
if req.Header.Get("Accept") != "" {
req.Header.Del("Accept")
req.Header.Add("Accept", "application/json")
}
return t.Transport.RoundTrip(req)
}

View File

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

View File

@@ -46,9 +46,8 @@ func CcrStatus(conf *cfg.Config, leader, follower string) error {
} }
// reverse attribution // reverse attribution
f := follower follower, leader = leader, follower
follower = leader
leader = f
slog.Debug("leader/follower attribution is invalid, reversing", "leader", leader, "follower", follower) slog.Debug("leader/follower attribution is invalid, reversing", "leader", leader, "follower", follower)
} }
@@ -93,11 +92,13 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
slog.Debug("ccr remote info", "info", res) slog.Debug("ccr remote info", "info", res)
remote := "" remote := ""
var info *types.ClusterRemoteProxyInfo var info *types.ClusterRemoteProxyInfo
for name, data := range res { for name, data := range res {
remote = name remote = name
info = data.(*types.ClusterRemoteProxyInfo) info = data.(*types.ClusterRemoteProxyInfo)
break break
} }

View File

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

View File

@@ -38,13 +38,15 @@ type clusterReachable struct {
} }
func ClusterList(conf *cfg.Config) error { 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)) reachable := make(map[string]clusterReachable, len(conf.Clusters))
// check endpoints in parallel to speed things up // check endpoints in parallel to speed things up
for name, cluster := range conf.Clusters { for name, cluster := range conf.Clusters {
wg.Go(func() { wg.Go(func() {
online, err := cluster.IsReachable() online, err := cluster.IsReachable()
@@ -119,26 +121,26 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
var err 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: case ResponseHealth:
all.health = r.health all.health = res.health
case ResponseCcr: case ResponseCcr:
all.ccr = r.ccr all.ccr = res.ccr
case ResponseInfo: case ResponseInfo:
all.info = r.info all.info = res.info
case ResponseStats: case ResponseStats:
all.stats = r.stats all.stats = res.stats
case ResponseIndices: case ResponseIndices:
all.indices = r.indices all.indices = res.indices
case ResponseTasks: case ResponseTasks:
all.tasks = r.tasks all.tasks = res.tasks
case ResponseHealthReport: case ResponseHealthReport:
all.healthreport = r.healthreport all.healthreport = res.healthreport
} }
} }
@@ -153,8 +155,10 @@ func ClusterStatus(conf *cfg.Config) error {
slog.Debug("ES result", "cluster health", res.health) slog.Debug("ES result", "cluster health", res.health)
var isleader bool var (
var ccrfollowing string isleader bool
ccrfollowing string
)
if res.ccr != nil { if res.ccr != nil {
isleader = len(res.ccr.AutoFollowStats.AutoFollowedClusters) == 0 isleader = len(res.ccr.AutoFollowStats.AutoFollowedClusters) == 0
@@ -171,6 +175,7 @@ func ClusterStatus(conf *cfg.Config) error {
// look for red indices, if any // look for red indices, if any
redindices := 0 redindices := 0
for _, index := range *res.indices { for _, index := range *res.indices {
if *index.Health == "red" { if *index.Health == "red" {
redindices++ redindices++
@@ -179,6 +184,7 @@ func ClusterStatus(conf *cfg.Config) error {
// look for long running tasks // look for long running tasks
longtasks := 0 longtasks := 0
for _, task := range *res.tasks { for _, task := range *res.tasks {
if strings.Contains(*task.RunningTime, "d") { if strings.Contains(*task.RunningTime, "d") {
longtasks++ longtasks++
@@ -211,7 +217,7 @@ func ClusterStatus(conf *cfg.Config) error {
} }
if conf.Verbose { if conf.Verbose {
table = gatherClusterStats(conf, res.stats, table) table = gatherClusterStats(res.stats, table)
} }
if res.health.Status.Name != "green" { if res.health.Status.Name != "green" {
@@ -239,9 +245,11 @@ func ClusterStatus(conf *cfg.Config) error {
return nil 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 { for _, count := range clusterstats.Indices.Search.Queries {
querycount += count querycount += count

View File

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

View File

@@ -40,6 +40,7 @@ func ClusterSettingsList(conf *cfg.Config) error {
table := printer.NewTable(conf, 2, 0) table := printer.NewTable(conf, 2, 0)
table.Addheaders("setting", "value") table.Addheaders("setting", "value")
entries := [][]any{} entries := [][]any{}
settingshash := res.Persistent // == map[string]json.RawMessage settingshash := res.Persistent // == map[string]json.RawMessage
@@ -77,6 +78,7 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %w", value, err) return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %w", value, err)
} }
put.AddTransient(setting, message) put.AddTransient(setting, message)
case conf.Persistent: case conf.Persistent:
fallthrough fallthrough
@@ -85,6 +87,7 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err) return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err)
} }
put.AddPersistent(setting, message) put.AddPersistent(setting, message)
} }
} }
@@ -106,7 +109,6 @@ func ClusterSettingsSetSingle(conf *cfg.Config, setting, value string) error {
_, err = conf.DefaultCluster.ES().Cluster.PutSettings(). _, err = conf.DefaultCluster.ES().Cluster.PutSettings().
AddPersistent(setting, message). AddPersistent(setting, message).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to set %s: %w", setting, esErrorString(err)) return fmt.Errorf("failed to set %s: %w", setting, esErrorString(err))
} }

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -65,21 +65,22 @@ func DatastreamList(conf *cfg.Config) error {
table := printer.NewTable(conf, 7, size) table := printer.NewTable(conf, 7, size)
table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field") 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 := "" policy := ""
if ds.IlmPolicy != nil { if datastream.IlmPolicy != nil {
policy = *ds.IlmPolicy policy = *datastream.IlmPolicy
} }
table.Entries[idx] = []any{ table.Entries[idx] = []any{
name, name,
policy, 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 { if idx == size-1 {
@@ -88,6 +89,7 @@ func DatastreamList(conf *cfg.Config) error {
} }
table.Sort() table.Sort()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }
@@ -147,22 +149,23 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
table := printer.NewTable(conf, 11, 2) table := printer.NewTable(conf, 11, 2)
table.Addheaders("data stream property", "value") 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 := "" policy := ""
if ds.IlmPolicy != nil { if datastream.IlmPolicy != nil {
policy = *ds.IlmPolicy policy = *datastream.IlmPolicy
} }
table.Entries = [][]any{ table.Entries = [][]any{
{"name", name}, {"name", name},
{"ilm policy", policy}, {"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}, {"backing indices", stats.BackingIndices},
{"size", printer.Bytes(stats.TotalStoreSizeBytes)}, {"size", printer.Bytes(stats.TotalStoreSizeBytes)},
{"shards-failed", stats.Shards_.Failed}, {"shards-failed", stats.Shards_.Failed},
@@ -173,13 +176,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
return err 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") 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 := "" policy := ""
if ds.IlmPolicy != nil { if datastream.IlmPolicy != nil {
policy = *ds.IlmPolicy policy = *datastream.IlmPolicy
} }
table.Entries[idx] = []any{ table.Entries[idx] = []any{
@@ -190,12 +193,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
index.ManagedBy.Name, index.ManagedBy.Name,
} }
if idx < len(ds.Indices) { if idx < len(datastream.Indices) {
fmt.Println() fmt.Println()
} }
} }
table.Sort() table.Sort()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }
@@ -206,7 +210,6 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
func DatastreamCreate(conf *cfg.Config, dsname string) error { func DatastreamCreate(conf *cfg.Config, dsname string) error {
_, err := conf.DefaultCluster.ES().Indices.CreateDataStream(dsname). _, err := conf.DefaultCluster.ES().Indices.CreateDataStream(dsname).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to create datastream: %w", esErrorString(err)) return fmt.Errorf("failed to create datastream: %w", esErrorString(err))
} }
@@ -217,7 +220,6 @@ func DatastreamCreate(conf *cfg.Config, dsname string) error {
func DatastreamDelete(conf *cfg.Config, dsname string) error { func DatastreamDelete(conf *cfg.Config, dsname string) error {
_, err := conf.DefaultCluster.ES().Indices.DeleteDataStream(dsname). _, err := conf.DefaultCluster.ES().Indices.DeleteDataStream(dsname).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to delete datastream: %w", esErrorString(err)) return fmt.Errorf("failed to delete datastream: %w", esErrorString(err))
} }
@@ -227,7 +229,6 @@ func DatastreamDelete(conf *cfg.Config, dsname string) error {
func DatastreamRollover(conf *cfg.Config, ds string) error { func DatastreamRollover(conf *cfg.Config, ds string) error {
res, err := RolloverAlias(conf, ds) res, err := RolloverAlias(conf, ds)
if err != nil { if err != nil {
return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err)) return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
} }

View File

@@ -22,6 +22,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"math/rand/v2" "math/rand/v2"
"strconv"
"strings" "strings"
"codeberg.org/scip/esctl/pkg/cfg" "codeberg.org/scip/esctl/pkg/cfg"
@@ -45,7 +46,7 @@ func DocAdd(conf *cfg.Config, jsondoc string) error {
return fmt.Errorf("supplied document was not valid JSON: %w", 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). res, err := conf.DefaultCluster.ES().Create(conf.Index, now).
Document(data). Document(data).

View File

@@ -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 via https://codeberg.org/scip/tablizer/src/branch/main/lib/sort.go#L113
*/ */
func parseDuration(duration string) time.Duration { func parseDuration(duration string) time.Duration {
seconds := 0 seconds := 0
for _, match := range matchDuration.FindAllStringSubmatch(duration, -1) { for _, match := range matchDuration.FindAllStringSubmatch(duration, -1) {
@@ -111,12 +110,14 @@ func formatDuration(val time.Duration) string {
if esd.minutes == 0 { if esd.minutes == 0 {
return fmt.Sprintf("%dh", esd.hours) return fmt.Sprintf("%dh", esd.hours)
} }
return fmt.Sprintf("%dh:%dm", esd.hours, int64(esd.minutes)) return fmt.Sprintf("%dh:%dm", esd.hours, int64(esd.minutes))
default: default:
if esd.minutes == 0 && hoursLeft == 0 { if esd.minutes == 0 && hoursLeft == 0 {
return fmt.Sprintf("%dd", int64(days)) return fmt.Sprintf("%dd", int64(days))
} }
return fmt.Sprintf("%dd:%dh:%dm", return fmt.Sprintf("%dd:%dh:%dm",
int64(days), int64(days),
int64(hoursLeft), int64(hoursLeft),

View File

@@ -27,22 +27,20 @@ import (
func esErrorString(err error) error { func esErrorString(err error) error {
msg := err.Error() msg := err.Error()
switch e := err.(type) { //nolint:gocritic
switch errVal := err.(type) {
case *types.ElasticsearchError: case *types.ElasticsearchError:
var causes strings.Builder var causes strings.Builder
for _, cause := range e.ErrorCause.RootCause { for _, cause := range errVal.ErrorCause.RootCause {
// FIXME: re-activate linter here, see https://github.com/golangci/golangci-lint/issues/6662 fmt.Fprintf(&causes, "%s\n", *cause.Reason)
//nolint:staticcheck
causes.WriteString(fmt.Sprintf("%s\n", *cause.Reason))
} }
if e.ErrorCause.Reason != nil { if errVal.ErrorCause.Reason != nil {
msg = *e.ErrorCause.Reason + ": " + causes.String() msg = *errVal.ErrorCause.Reason + ": " + causes.String()
} else { } else {
msg = fmt.Sprintf("http status %d: ", e.Status) msg = fmt.Sprintf("http status %d: ", errVal.Status)
} }
} }
return errors.New(msg) return errors.New(msg)

View File

@@ -102,6 +102,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
} }
table.Sort() table.Sort()
return table.Print() return table.Print()
} }
@@ -166,6 +167,7 @@ func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
} }
indent += " " indent += " "
continue continue
} }
@@ -260,7 +262,7 @@ func ilmPhaseString(phase *types.Phase, short bool) string {
} }
if phase.Actions.SearchableSnapshot != nil { 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, ",") return strings.Join(out, ",")
@@ -286,6 +288,7 @@ func IlmExplain(conf *cfg.Config, index string) error {
table.Addheaders("ilm status field", "value") table.Addheaders("ilm status field", "value")
info := "" info := ""
err = json.Unmarshal(ilm.StepInfo["reason"], &info) err = json.Unmarshal(ilm.StepInfo["reason"], &info)
if err != nil { if err != nil {
return fmt.Errorf("failed to unmarshal step info: %w", err) 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() { if cfg.HaveHot() {
hot := types.Phase{} hot := types.Phase{}
var actions types.IlmActionsVariant = esdsl.NewIlmActions() var actions types.IlmActionsVariant = esdsl.NewIlmActions()
rollover := &types.RolloverAction{} rollover := &types.RolloverAction{}
haveroll := false haveroll := false
@@ -383,15 +388,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
hot.Actions = actions.IlmActionsCaster() hot.Actions = actions.IlmActionsCaster()
phases.PhasesCaster().Hot = &hot phases.PhasesCaster().Hot = &hot
} else { } else if policy != nil {
if policy != nil { // update
// update phases.PhasesCaster().Hot = policy.Phases.Hot
phases.PhasesCaster().Hot = policy.Phases.Hot
}
} }
if cfg.HaveWarm() { if cfg.HaveWarm() {
warm := types.Phase{} warm := types.Phase{}
var actions types.IlmActionsVariant = esdsl.NewIlmActions() var actions types.IlmActionsVariant = esdsl.NewIlmActions()
if policy != nil { if policy != nil {
@@ -417,15 +421,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
warm.Actions = actions.IlmActionsCaster() warm.Actions = actions.IlmActionsCaster()
phases.PhasesCaster().Warm = &warm phases.PhasesCaster().Warm = &warm
} else { } else if policy != nil && policy.Phases.Warm != nil {
if policy != nil && policy.Phases.Warm != nil { // update
// update phases.PhasesCaster().Warm = policy.Phases.Warm
phases.PhasesCaster().Warm = policy.Phases.Warm
}
} }
if cfg.HaveCold() { if cfg.HaveCold() {
cold := types.Phase{} cold := types.Phase{}
var actions types.IlmActionsVariant = esdsl.NewIlmActions() var actions types.IlmActionsVariant = esdsl.NewIlmActions()
if policy != nil { if policy != nil {
@@ -452,15 +455,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
cold.Actions = actions.IlmActionsCaster() cold.Actions = actions.IlmActionsCaster()
phases.PhasesCaster().Cold = &cold phases.PhasesCaster().Cold = &cold
} else { } else if policy != nil && policy.Phases.Cold != nil {
if policy != nil && policy.Phases.Cold != nil { // update
// update phases.PhasesCaster().Cold = policy.Phases.Cold
phases.PhasesCaster().Cold = policy.Phases.Cold
}
} }
if cfg.HaveFrozen() { if cfg.HaveFrozen() {
froze := types.Phase{} froze := types.Phase{}
var actions types.IlmActionsVariant = esdsl.NewIlmActions() var actions types.IlmActionsVariant = esdsl.NewIlmActions()
if policy != nil { if policy != nil {
@@ -479,16 +481,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
froze.Actions = actions.IlmActionsCaster() froze.Actions = actions.IlmActionsCaster()
phases.PhasesCaster().Frozen = &froze phases.PhasesCaster().Frozen = &froze
} else { } else if policy != nil && policy.Phases.Frozen != nil {
if policy != nil && policy.Phases.Frozen != nil { // update
// update phases.PhasesCaster().Frozen = policy.Phases.Frozen
phases.PhasesCaster().Frozen = policy.Phases.Frozen
}
} }
if cfg.HaveDelete() { if cfg.HaveDelete() {
del := types.Phase{} del := types.Phase{}
delete := types.DeleteAction{} delete := types.DeleteAction{}
var actions types.IlmActionsVariant = esdsl.NewIlmActions() var actions types.IlmActionsVariant = esdsl.NewIlmActions()
if policy != nil { if policy != nil {
@@ -507,11 +508,9 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
actions.IlmActionsCaster().Delete = &delete actions.IlmActionsCaster().Delete = &delete
del.Actions = actions.IlmActionsCaster() del.Actions = actions.IlmActionsCaster()
phases.PhasesCaster().Delete = &del phases.PhasesCaster().Delete = &del
} else { } else if policy != nil && policy.Phases.Delete != nil {
if policy != nil && policy.Phases.Delete != nil { // update
// update phases.PhasesCaster().Delete = policy.Phases.Delete
phases.PhasesCaster().Delete = policy.Phases.Delete
}
} }
put := &putlifecycle.Request{} put := &putlifecycle.Request{}

View File

@@ -138,6 +138,7 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
} }
table.Sort() table.Sort()
return table.Print() return table.Print()
} }
@@ -154,6 +155,7 @@ func IlmForecastShow(conf *cfg.Config) error {
} }
within := parseDuration(conf.Ilm.Within) within := parseDuration(conf.Ilm.Within)
var toBeFreed int64 = 0 var toBeFreed int64 = 0
for _, phase := range phaseData { for _, phase := range phaseData {
@@ -192,24 +194,26 @@ func getIlmPhaseData(conf *cfg.Config) ([]PhaseData, error) {
wg.Wait() 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 range 3 { 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: case ResponseExplain:
ilmdetails = r.explainlifecycle ilmdetails = res.explainlifecycle
case ResponseIndices: case ResponseIndices:
indicesres = r.indicesbytes indicesres = res.indicesbytes
case ResponseLifecycle: case ResponseLifecycle:
ilmpolicies = *r.lifecycle ilmpolicies = *res.lifecycle
} }
} }

View File

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

View File

@@ -52,7 +52,6 @@ func IndexAliasList(conf *cfg.Config) error {
res, err := conf.DefaultCluster.ES().Indices.GetAlias(). res, err := conf.DefaultCluster.ES().Indices.GetAlias().
Index("_all"). Index("_all").
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to list index aliases: %w", esErrorString(err)) return fmt.Errorf("failed to list index aliases: %w", esErrorString(err))
} }
@@ -110,7 +109,6 @@ func IndexAliasDelete(conf *cfg.Config, index, alias string) error {
func IndexAliasRollover(conf *cfg.Config, alias string) error { func IndexAliasRollover(conf *cfg.Config, alias string) error {
res, err := RolloverAlias(conf, alias) res, err := RolloverAlias(conf, alias)
if err != nil { if err != nil {
return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err)) return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
} }

View File

@@ -36,7 +36,6 @@ import (
func IndexTemplateList(conf *cfg.Config) error { func IndexTemplateList(conf *cfg.Config) error {
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate(). res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to get index templates: %w", esErrorString(err)) return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
} }
@@ -56,6 +55,7 @@ func IndexTemplateList(conf *cfg.Config) error {
} }
table.Sort() table.Sort()
return table.Print() return table.Print()
} }
@@ -63,7 +63,6 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate(). res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
Name(tplname). Name(tplname).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to get index template: %w", esErrorString(err)) return fmt.Errorf("failed to get index template: %w", esErrorString(err))
} }
@@ -109,10 +108,11 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
err = getIndexTemplateSettings(conf, tplname, table) err = getIndexTemplateSettings(conf, tplname, table)
if err != nil { if err != nil {
return nil return err
} }
fmt.Println() fmt.Println()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }
@@ -137,6 +137,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
} }
fmt.Println() fmt.Println()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }
@@ -224,7 +225,6 @@ func IndexTemplateCreate(conf *cfg.Config, name string, mappings []string) error
create.IndexPatterns(conf.Patterns...) create.IndexPatterns(conf.Patterns...)
_, err := create.Do(context.Background()) _, err := create.Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to create index template: %w", esErrorString(err)) return fmt.Errorf("failed to create index template: %w", esErrorString(err))
} }
@@ -241,7 +241,6 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate(). res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
Name(name). Name(name).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to get index template: %w", esErrorString(err)) return fmt.Errorf("failed to get index template: %w", esErrorString(err))
} }
@@ -335,7 +334,6 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
modify.IndexPatterns(patterns...) modify.IndexPatterns(patterns...)
_, err = modify.Do(context.Background()) _, err = modify.Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to modify index template: %w", esErrorString(err)) return fmt.Errorf("failed to modify index template: %w", esErrorString(err))
} }
@@ -366,7 +364,6 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate(). res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
Name(name). Name(name).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
return fmt.Errorf("failed to get index template: %w", esErrorString(err)) return fmt.Errorf("failed to get index template: %w", esErrorString(err))
} }
@@ -417,7 +414,6 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
} }
return nil return nil
} }
func modMappings(mappings []string) (types.TypeMappingVariant, error) { func modMappings(mappings []string) (types.TypeMappingVariant, error) {

View File

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

View File

@@ -20,6 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"log/slog" "log/slog"
"strconv"
"codeberg.org/scip/esctl/pkg/cfg" "codeberg.org/scip/esctl/pkg/cfg"
"codeberg.org/scip/esctl/pkg/printer" "codeberg.org/scip/esctl/pkg/printer"
@@ -38,12 +39,14 @@ func LicenseShow(conf *cfg.Config) error {
lic := res.License lic := res.License
var maxnodes = "infinite" var (
var maxunits = "infinite" maxnodes = "infinite"
var expire = "never" maxunits = "infinite"
expire = "never"
)
if lic.MaxNodes != nil { if lic.MaxNodes != nil {
maxnodes = fmt.Sprintf("%d", *lic.MaxNodes) maxnodes = strconv.FormatInt(*lic.MaxNodes, 10)
} }
if lic.ExpiryDate != nil { if lic.ExpiryDate != nil {
@@ -51,7 +54,7 @@ func LicenseShow(conf *cfg.Config) error {
} }
if lic.MaxResourceUnits != nil { if lic.MaxResourceUnits != nil {
maxunits = fmt.Sprintf("%d", *lic.MaxResourceUnits) maxunits = strconv.Itoa(*lic.MaxResourceUnits)
} }
table.Entries = [][]any{ table.Entries = [][]any{

View File

@@ -20,6 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"log/slog" "log/slog"
"strconv"
"strings" "strings"
"time" "time"
@@ -53,6 +54,7 @@ func NodeList(conf *cfg.Config) error {
} }
table.Sort() table.Sort()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }
@@ -187,7 +189,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
table.AddRow( table.AddRow(
agent, agent,
fmt.Sprintf("%d", *client.Id), strconv.FormatInt(*client.Id, 10),
time.UnixMilli(*client.LastRequestTimeMillis).String(), time.UnixMilli(*client.LastRequestTimeMillis).String(),
*client.RemoteAddress, *client.RemoteAddress,
uri, uri,
@@ -199,5 +201,6 @@ func NodeClients(conf *cfg.Config, nodename string) error {
} }
table.Sort() table.Sort()
return table.Print() return table.Print()
} }

View File

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

View File

@@ -34,6 +34,7 @@ func RoleNames(conf *cfg.Config) ([]string, error) {
} }
roles := make([]string, len(res)) roles := make([]string, len(res))
idx := 0 idx := 0
for name := range res { for name := range res {
roles[idx] = name roles[idx] = name
@@ -66,6 +67,7 @@ func RoleList(conf *cfg.Config) error {
} }
table.Sort() table.Sort()
return table.Print() return table.Print()
} }
@@ -132,7 +134,9 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
table := printer.NewTable(conf, 2, len(role.RemoteCluster)) table := printer.NewTable(conf, 2, len(role.RemoteCluster))
table.Addheaders("remote cluster", "privilege") table.Addheaders("remote cluster", "privilege")
idx := 0 idx := 0
for _, priv := range role.RemoteCluster { for _, priv := range role.RemoteCluster {
perms := []string{} perms := []string{}
for _, perm := range priv.Privileges { for _, perm := range priv.Privileges {
@@ -145,6 +149,7 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
} }
table.Sort() table.Sort()
return table.Print() 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 := printer.NewTable(conf, 1, len(role.Cluster))
table.Addheaders("cluster rights") table.Addheaders("cluster rights")
idx := 0 idx := 0
for _, cluster := range role.Cluster { for _, cluster := range role.Cluster {
table.Entries[idx] = []any{cluster.Name} table.Entries[idx] = []any{cluster.Name}
@@ -162,6 +168,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
} }
table.Sort() table.Sort()
return table.Print() 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 := printer.NewTable(conf, 3, len(role.RemoteIndices))
table.Addheaders("remote index names", "index permissions", "allow restricted") table.Addheaders("remote index names", "index permissions", "allow restricted")
idx := 0 idx := 0
for _, priv := range role.RemoteIndices { for _, priv := range role.RemoteIndices {
perms := []string{} perms := []string{}
for _, perm := range priv.Privileges { for _, perm := range priv.Privileges {
@@ -185,6 +194,7 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
} }
table.Sort() table.Sort()
return table.Print() 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 := printer.NewTable(conf, 3, len(role.Indices))
table.Addheaders("index names", "index permissions", "allow restricted") table.Addheaders("index names", "index permissions", "allow restricted")
idx := 0 idx := 0
for _, priv := range role.Indices { for _, priv := range role.Indices {
perms := []string{} perms := []string{}
for _, perm := range priv.Privileges { for _, perm := range priv.Privileges {
@@ -208,6 +220,7 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
} }
table.Sort() table.Sort()
return table.Print() 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 := printer.NewTable(conf, 3, len(role.Applications))
table.Addheaders("application", "privileges", "resources") table.Addheaders("application", "privileges", "resources")
idx := 0 idx := 0
for _, priv := range role.Applications { for _, priv := range role.Applications {
table.Entries[idx] = []any{ table.Entries[idx] = []any{
@@ -230,5 +244,6 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
} }
table.Sort() table.Sort()
return table.Print() return table.Print()
} }

View File

@@ -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 // iterate over records from CSV and register only those which are not deployed
for name := range records { for name := range records {
reg := Register{name: name, defined: true} reg := Register{name: name, defined: true}
_, deployed := deployed[name] _, deployed := deployed[name]
if !deployed { if !deployed {
rows = append(rows, reg) rows = append(rows, reg)
@@ -249,6 +250,7 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
} }
groups := []string{} groups := []string{}
for _, mapping := range mappings { for _, mapping := range mappings {
if slices.Contains(mapping.Roles, rolename) { if slices.Contains(mapping.Roles, rolename) {
for _, rule := range mapping.Rules.Any { for _, rule := range mapping.Rules.Any {
@@ -262,13 +264,13 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
return groups, nil 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", 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 { } else {
fmt.Printf("deployed %s matches csv definition\n", name) fmt.Printf("deployed %s matches csv definition\n", name)
} }
@@ -289,16 +291,19 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
if !record.defined { if !record.defined {
fmt.Printf("role %s is not defined\n", rolename) fmt.Printf("role %s is not defined\n", rolename)
return nil return nil
} }
role, exists := res[rolename] role, exists := res[rolename]
if !exists { if !exists {
fmt.Printf("role %s is not deployed\n", rolename) fmt.Printf("role %s is not deployed\n", rolename)
return nil return nil
} else { } else {
fmt.Printf("role %s is deployed\n", rolename) fmt.Printf("role %s is deployed\n", rolename)
} }
slog.Debug("found role", "role", role) slog.Debug("found role", "role", role)
if conf.Debug { if conf.Debug {
@@ -310,6 +315,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
if err != nil { if err != nil {
return err return err
} }
slog.Debug("group mappings", "groups", groups) slog.Debug("group mappings", "groups", groups)
// check cluster setting // check cluster setting
@@ -321,6 +327,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
// check index names+privs // check index names+privs
indices := []string{} indices := []string{}
privs := []string{} privs := []string{}
for _, index := range role.Indices { for _, index := range role.Indices {
for _, name := range index.Names { for _, name := range index.Names {
indices = append(indices, strings.ReplaceAll(name, "**", "*")) indices = append(indices, strings.ReplaceAll(name, "**", "*"))
@@ -333,6 +340,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
// check kibana application space // check kibana application space
spaces := []string{} spaces := []string{}
for _, app := range role.Applications { for _, app := range role.Applications {
for _, resource := range app.Resources { for _, resource := range app.Resources {
if strings.Contains(resource, "space:") { if strings.Contains(resource, "space:") {

View File

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

View File

@@ -111,6 +111,7 @@ func explainSearch(conf *cfg.Config, search *search.Search) error {
func explain(res *types.ExplanationDetail, indent string) { func explain(res *types.ExplanationDetail, indent string) {
fmt.Println(indent + "- " + res.Description) fmt.Println(indent + "- " + res.Description)
for _, ex := range res.Details { for _, ex := range res.Details {
fmt.Println(indent + " - " + ex.Description) fmt.Println(indent + " - " + ex.Description)
fmt.Println(indent + fmt.Sprintf(" score: %f", res.Value)) fmt.Println(indent + fmt.Sprintf(" score: %f", res.Value))
@@ -167,6 +168,7 @@ 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 // 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 { func searchPit(conf *cfg.Config, req *search.Request) error {
ctx := context.Background() ctx := context.Background()
pit, err := conf.DefaultCluster.ES().OpenPointInTime(conf.Index).KeepAlive("1m").Do(ctx) pit, err := conf.DefaultCluster.ES().OpenPointInTime(conf.Index).KeepAlive("1m").Do(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to open point-in-time request for search: %w", err) return fmt.Errorf("failed to open point-in-time request for search: %w", err)

View File

@@ -63,6 +63,7 @@ type filter struct {
// must match literally, and range filters using -r "@timestamp:2026-05-28T10:00:00 to now" // must match literally, and range filters using -r "@timestamp:2026-05-28T10:00:00 to now"
func NewFilter(query string) (*filter, error) { func NewFilter(query string) (*filter, error) {
var separator string var separator string
var criteria int // we use the constants on top for this var criteria int // we use the constants on top for this
switch { switch {
@@ -76,7 +77,7 @@ func NewFilter(query string) (*filter, error) {
part := strings.Split(query, separator) part := strings.Split(query, separator)
if len(part) != 2 { 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} 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 filters[count-1] = rng
} }
return filters, nil return filters, nil
@@ -247,7 +247,6 @@ func addSort(conf *cfg.Config, search *search.Search) *search.Search {
Index(conf.Index). Index(conf.Index).
Fields(conf.SortBy). Fields(conf.SortBy).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {
// whatever it was, do not add Sort() // whatever it was, do not add Sort()
slog.Debug("get field capabilities", "field", conf.SortBy, "error", esErrorString(err)) slog.Debug("get field capabilities", "field", conf.SortBy, "error", esErrorString(err))

View File

@@ -40,8 +40,7 @@ func colorzizeShard(conf *cfg.Config, state, name string) string {
} }
func resolvePrirep(state string) string { func resolvePrirep(state string) string {
switch state { if state == "p" {
case "p":
return "primary" return "primary"
} }
@@ -125,6 +124,7 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
} }
table.Sort() table.Sort()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }

View File

@@ -98,6 +98,7 @@ func SnapshotList(conf *cfg.Config) error {
} }
table.Sort() table.Sort()
if err := table.Print(); err != nil { if err := table.Print(); err != nil {
return err return err
} }

View File

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

View File

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

View File

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

View File

@@ -34,12 +34,14 @@ var (
titleStyle = func() lipgloss.Style { titleStyle = func() lipgloss.Style {
b := lipgloss.RoundedBorder() b := lipgloss.RoundedBorder()
b.Right = "├" b.Right = "├"
return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1) return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
}() }()
infoStyle = func() lipgloss.Style { infoStyle = func() lipgloss.Style {
b := lipgloss.RoundedBorder() b := lipgloss.RoundedBorder()
b.Left = "┤" b.Left = "┤"
return titleStyle.BorderStyle(b) 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) { 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) { switch msg := msg.(type) {
case tea.KeyMsg: 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 // Handle keyboard and mouse events in the viewport
m.viewport, cmd = m.viewport.Update(msg) m.viewport, cmd = m.viewport.Update(msg)
cmds = append(cmds, cmd) cmds[0] = cmd
return m, tea.Batch(cmds...) return m, tea.Batch(cmds...)
} }
@@ -99,6 +100,7 @@ func (m model) View() string {
if !m.ready { if !m.ready {
return "\n Initializing..." return "\n Initializing..."
} }
return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView()) return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
} }
@@ -106,23 +108,25 @@ func (m model) headerView() string {
// title := titleStyle.Render("RPN Help Overview") // title := titleStyle.Render("RPN Help Overview")
title := titleStyle.Render(m.title) title := titleStyle.Render(m.title)
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title))) line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
return lipgloss.JoinHorizontal(lipgloss.Center, title, line) return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
} }
func (m model) footerView() string { func (m model) footerView() string {
info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100)) info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info))) line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
return lipgloss.JoinHorizontal(lipgloss.Center, line, info) return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
} }
func Pager(title, message string) { func Pager(title, message string) {
p := tea.NewProgram( pager := tea.NewProgram(
model{content: message, title: title}, model{content: message, title: title},
tea.WithAltScreen(), // use the full size of the terminal in its "alternate screen buffer" 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 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) fmt.Println("could not run pager:", err)
os.Exit(1) os.Exit(1)
} }

View File

@@ -55,6 +55,7 @@ func NewTable(conf *cfg.Config, columns, rows int) *Table {
func NewTableEmpty(conf *cfg.Config) *Table { func NewTableEmpty(conf *cfg.Config) *Table {
table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()} table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
table.alignInts = conf.AlignInts table.alignInts = conf.AlignInts
return &table return &table
} }
@@ -70,14 +71,14 @@ func (table *Table) WithHeaders(headers ...string) *Table {
return table return table
} }
func (data *Table) Print() error { func (table *Table) Print() error {
switch data.Mode { switch table.Mode {
case "json": case "json":
return data.PrintJSON() return table.PrintJSON()
case "yaml": case "yaml":
return data.PrintYAML() return table.PrintYAML()
default: default:
return data.PrintTSV() return table.PrintTSV()
} }
} }
@@ -85,22 +86,8 @@ var (
ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`) 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) body, err := yaml.Marshal(raw)
if err != nil { if err != nil {
@@ -112,8 +99,8 @@ func (data *Table) PrintYAML() error {
return nil return nil
} }
func (data *Table) PrintJSON() error { func (table *Table) PrintJSON() error {
raw := data.toMap() raw := table.toMap()
body, err := json.MarshalIndent(raw, "", " ") body, err := json.MarshalIndent(raw, "", " ")
if err != nil { if err != nil {
@@ -125,34 +112,35 @@ func (data *Table) PrintJSON() error {
return nil return nil
} }
func (data *Table) PrintTSV() error { func (table *Table) PrintTSV() error {
// length's, convert cell types // length's, convert cell types
data.preprocessRows() table.preprocessRows()
// output headers // 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 { } else {
// no padding for last header // no padding for last header
fmt.Print(header) fmt.Print(header)
} }
if idx < len(data.Headers)-1 { if idx < len(table.Headers)-1 {
fmt.Print(" ") fmt.Print(" ")
} }
} }
fmt.Println() fmt.Println()
for _, entries := range data.rows { for _, entries := range table.rows {
currentWidth := 0 currentWidth := 0
for idx, entry := range entries { for idx, entry := range entries {
length := visibleLen(entry) 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 // 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) wrapped := wrapper(entry)
// and indent it // 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 // 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 // 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 // no padding for last entry
fmt.Print(entry) fmt.Print(entry)
} }
if idx < len(data.Headers)-1 { if idx < len(table.Headers)-1 {
fmt.Print(" ") fmt.Print(" ")
} }
} }
fmt.Println() fmt.Println()
} }
return nil return nil
} }
func (data *Table) Sort() { func (table *Table) Sort() {
// sanity checks // sanity checks
if len(data.Entries) == 0 { if len(table.Entries) == 0 {
return 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 { for idx, header := range headers {
switch data.Mode { switch table.Mode {
case "json", "yaml": case "json", "yaml":
data.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_") table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
default: 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 // return the length of a string but only visible chars, w/o ansi color escapes