mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 01:34:17 +02:00
satisfy full linter (#77)
This commit is contained in:
110
.golangci.yml
Normal file
110
.golangci.yml
Normal 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
|
||||
|
||||
4
Makefile
4
Makefile
@@ -68,10 +68,10 @@ test: clean buildlocal
|
||||
testlint: test lint
|
||||
|
||||
lint:
|
||||
golangci-lint run
|
||||
golangci-lint run --enable-only errcheck,govet,ineffassign,staticcheck,unused
|
||||
|
||||
lint-full:
|
||||
golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
|
||||
golangci-lint run --show-stats=false
|
||||
|
||||
testfuzzy: clean
|
||||
go test -fuzz ./... $(ARGS)
|
||||
|
||||
@@ -177,7 +177,6 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, stale bool) *cli.Command {
|
||||
if stale {
|
||||
name = "allocate-stale-primary"
|
||||
usage = "allocate a stale primary shard to a node"
|
||||
|
||||
}
|
||||
|
||||
return &cli.Command{
|
||||
|
||||
@@ -48,8 +48,10 @@ func complete(cmd *cli.Command, what int) {
|
||||
return
|
||||
}
|
||||
|
||||
var list []string
|
||||
var err error
|
||||
var (
|
||||
list []string
|
||||
err error
|
||||
)
|
||||
|
||||
switch what {
|
||||
case Cindex:
|
||||
|
||||
@@ -71,7 +71,7 @@ func IlmForecastList(conf *cfg.Config) *cli.Command {
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Name: "within",
|
||||
Usage: "<duration> withing which to forecast",
|
||||
Usage: "<duration> within which to forecast",
|
||||
Destination: &conf.Ilm.Within,
|
||||
Aliases: []string{"w"},
|
||||
},
|
||||
@@ -121,7 +121,7 @@ func IlmForecastShow(conf *cfg.Config) *cli.Command {
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Name: "within",
|
||||
Usage: "duration withing which to forecast",
|
||||
Usage: "duration within which to forecast",
|
||||
Destination: &conf.Ilm.Within,
|
||||
Aliases: []string{"w"},
|
||||
},
|
||||
|
||||
@@ -19,7 +19,6 @@ package cmd
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"codeberg.org/scip/esctl/pkg/cfg"
|
||||
"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 {
|
||||
args := cmd.Args()
|
||||
if args.Len() == 0 {
|
||||
return fmt.Errorf("no index specified")
|
||||
return errors.New("no index specified")
|
||||
}
|
||||
|
||||
mappings := args.Slice()[1:]
|
||||
|
||||
@@ -38,7 +38,8 @@ func IndexAlias(conf *cfg.Config) *cli.Command {
|
||||
IndexAliasDelete(conf),
|
||||
IndexAliasRollover(conf),
|
||||
// FIXME: implement IndexAliasAdd
|
||||
//IndexAliasAdd(conf), // see https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases
|
||||
// see https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases
|
||||
// IndexAliasAdd(conf),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ package cmd
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"slices"
|
||||
|
||||
"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 {
|
||||
args := cmd.Args()
|
||||
if args.Len() == 0 {
|
||||
return fmt.Errorf("no name specified")
|
||||
return errors.New("no name specified")
|
||||
}
|
||||
|
||||
if conf.Mode != "" {
|
||||
|
||||
100
cmd/root.go
100
cmd/root.go
@@ -31,9 +31,60 @@ import (
|
||||
"github.com/urfave/cli/v3"
|
||||
)
|
||||
|
||||
const (
|
||||
versionFmt = `esctl version: %s
|
||||
build: %s
|
||||
branch: %s
|
||||
commit: %s
|
||||
go version: %s
|
||||
API Version: %s`
|
||||
|
||||
jsonPathUsage = `jsonPath usage:
|
||||
|
||||
name.last >> "Anderson"
|
||||
age >> 37
|
||||
children >> ["Sara","Alex","Jack"]
|
||||
children.# >> 3
|
||||
children.1 >> "Alex"
|
||||
child*.2 >> "Jack"
|
||||
c?ildren.0 >> "Sara"
|
||||
fav\.movie >> "Deer Hunter"
|
||||
friends.#.first >> ["Dale","Roger","Jane"]
|
||||
friends.1.last >> "Craig"
|
||||
|
||||
You can also query an array for the first match by using #(...), or
|
||||
find all matches with #(...)#. Queries support the ==, !=, <, <=, >,
|
||||
>= comparison operators and the simple pattern matching % (like) and
|
||||
!% (not like) operators. Eg:
|
||||
|
||||
friends.#(last=="Murphy").first >> "Dale"
|
||||
friends.#(last=="Murphy")#.first >> ["Dale","Jane"]
|
||||
friends.#(age>45)#.last >> ["Craig","Murphy"]
|
||||
friends.#(first%"D*").last >> "Murphy"
|
||||
friends.#(first!%"D*").last >> "Craig"
|
||||
friends.#(nets.#(=="fb"))#.first >> ["Dale","Roger"]
|
||||
|
||||
To extract more than one field, use:
|
||||
|
||||
{"ns":source.namespace_name,"time":source.@timestamp} >>
|
||||
|
||||
{
|
||||
"ns": "3f80316965c64405-275a75782e984bcc8d82",
|
||||
"time": "2026-06-10T04:23:38.914080361+00:00"
|
||||
}
|
||||
{
|
||||
"ns": "3f80316965c64405-f0e1dcef668e45bb9afd",
|
||||
"time": "2026-06-10T09:39:00.554892542+00:00"
|
||||
}
|
||||
|
||||
|
||||
Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`
|
||||
)
|
||||
|
||||
func Finish(err error) int {
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "Error: ", err.Error())
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
@@ -127,6 +178,7 @@ func Main() int {
|
||||
return nil, err
|
||||
} else {
|
||||
fmt.Println(cmd.UsageText)
|
||||
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
@@ -161,53 +213,13 @@ func Main() int {
|
||||
}
|
||||
|
||||
func HelpJsonPath(conf *cfg.Config) *cli.Command {
|
||||
msg := `jsonPath usage:
|
||||
|
||||
name.last >> "Anderson"
|
||||
age >> 37
|
||||
children >> ["Sara","Alex","Jack"]
|
||||
children.# >> 3
|
||||
children.1 >> "Alex"
|
||||
child*.2 >> "Jack"
|
||||
c?ildren.0 >> "Sara"
|
||||
fav\.movie >> "Deer Hunter"
|
||||
friends.#.first >> ["Dale","Roger","Jane"]
|
||||
friends.1.last >> "Craig"
|
||||
|
||||
You can also query an array for the first match by using #(...), or
|
||||
find all matches with #(...)#. Queries support the ==, !=, <, <=, >,
|
||||
>= comparison operators and the simple pattern matching % (like) and
|
||||
!% (not like) operators. Eg:
|
||||
|
||||
friends.#(last=="Murphy").first >> "Dale"
|
||||
friends.#(last=="Murphy")#.first >> ["Dale","Jane"]
|
||||
friends.#(age>45)#.last >> ["Craig","Murphy"]
|
||||
friends.#(first%"D*").last >> "Murphy"
|
||||
friends.#(first!%"D*").last >> "Craig"
|
||||
friends.#(nets.#(=="fb"))#.first >> ["Dale","Roger"]
|
||||
|
||||
To extract more than one field, use:
|
||||
|
||||
{"ns":source.namespace_name,"time":source.@timestamp} >>
|
||||
|
||||
{
|
||||
"ns": "3f80316965c64405-275a75782e984bcc8d82",
|
||||
"time": "2026-06-10T04:23:38.914080361+00:00"
|
||||
}
|
||||
{
|
||||
"ns": "3f80316965c64405-f0e1dcef668e45bb9afd",
|
||||
"time": "2026-06-10T09:39:00.554892542+00:00"
|
||||
}
|
||||
|
||||
|
||||
Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`
|
||||
|
||||
return &cli.Command{
|
||||
Name: "help-jsonpath",
|
||||
Usage: "show jsonpath help",
|
||||
|
||||
Action: func(ctx context.Context, cmd *cli.Command) error {
|
||||
_, err := fmt.Println(msg)
|
||||
_, err := fmt.Println(jsonPathUsage)
|
||||
|
||||
return err
|
||||
},
|
||||
}
|
||||
@@ -219,8 +231,9 @@ func Version(conf *cfg.Config) *cli.Command {
|
||||
Usage: "show esctl version information",
|
||||
|
||||
Action: func(ctx context.Context, cmd *cli.Command) error {
|
||||
_, err := fmt.Printf("esctl version: %s\n build: %s\n branch: %s\n commit: %s\n go version: %s\n API Version: %s\n",
|
||||
_, err := fmt.Printf(versionFmt,
|
||||
cfg.Version, cfg.BUILD, cfg.BRANCH, cfg.COMMIT, cfg.GOVERSION, cfg.APIVERSION)
|
||||
|
||||
return err
|
||||
},
|
||||
}
|
||||
@@ -327,7 +340,6 @@ func HelpUsage(conf *cfg.Config) *cli.Command {
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// copy of cmd.Walk() with the exception to skip hidden commands and its siblings
|
||||
|
||||
@@ -29,6 +29,7 @@ func addReference(ref string) string {
|
||||
for line := range strings.SplitSeq(ref, "\n") {
|
||||
indentedRef = append(indentedRef, " "+line)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s\nREFERENCE:\n%s\n",
|
||||
cli.SubcommandHelpTemplate,
|
||||
strings.Join(indentedRef, "\n"))
|
||||
|
||||
@@ -55,37 +55,6 @@ func (cluster *Cluster) SetClient(client *elasticsearch.TypedClient) {
|
||||
cluster.client = client
|
||||
}
|
||||
|
||||
func (cluster *Cluster) getTransport() elastictransport.Option {
|
||||
transport := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||
}
|
||||
|
||||
if cluster.DebugHTTP {
|
||||
return elastictransport.WithTransport(
|
||||
&DebugTransport{Transport: transport},
|
||||
)
|
||||
}
|
||||
|
||||
return elastictransport.WithTransport(transport)
|
||||
}
|
||||
|
||||
func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
|
||||
// These headers are not needed with ES 9, but with ES 8, we set
|
||||
// them here so every API call uses it. The only exception being
|
||||
// the api repl, which does it on its own.
|
||||
headers := http.Header{}
|
||||
headers.Add("content-type", "application/json")
|
||||
headers.Add("Accept", "application/json")
|
||||
|
||||
return []elasticsearch.Option{
|
||||
elasticsearch.WithAddresses(cluster.Uri),
|
||||
elasticsearch.WithTransportOptions(
|
||||
cluster.getTransport(),
|
||||
elastictransport.WithHeader(headers),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
// return the go-elasticsearch client object but before doing that,
|
||||
// check if we need to tune auth
|
||||
func (cluster *Cluster) ES() *elasticsearch.TypedClient {
|
||||
@@ -114,7 +83,8 @@ func (cluster *Cluster) CheckAuth() error {
|
||||
} else {
|
||||
// k, try interactively
|
||||
fmt.Fprintf(os.Stderr, "Enter password for elasticsearch user %s@%s: ", cluster.User, cluster.Name)
|
||||
pass, err := term.ReadPassword(int(syscall.Stdin))
|
||||
|
||||
pass, err := term.ReadPassword(syscall.Stdin)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -125,6 +95,7 @@ func (cluster *Cluster) CheckAuth() error {
|
||||
}
|
||||
|
||||
cluster.Pass = string(pass)
|
||||
|
||||
fmt.Println()
|
||||
}
|
||||
|
||||
@@ -132,7 +103,6 @@ func (cluster *Cluster) CheckAuth() error {
|
||||
opts = append(opts, elasticsearch.WithBasicAuth(cluster.User, cluster.Pass))
|
||||
|
||||
es, err := elasticsearch.NewTyped(opts...)
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
|
||||
}
|
||||
@@ -205,6 +175,37 @@ func (cluster *Cluster) IsReachable() (bool, error) {
|
||||
return true, conn.Close()
|
||||
}
|
||||
|
||||
func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
|
||||
// These headers are not needed with ES 9, but with ES 8, we set
|
||||
// them here so every API call uses it. The only exception being
|
||||
// the api repl, which does it on its own.
|
||||
headers := http.Header{}
|
||||
headers.Add("Content-Type", "application/json")
|
||||
headers.Add("Accept", "application/json")
|
||||
|
||||
return []elasticsearch.Option{
|
||||
elasticsearch.WithAddresses(cluster.Uri),
|
||||
elasticsearch.WithTransportOptions(
|
||||
cluster.getTransport(),
|
||||
elastictransport.WithHeader(headers),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
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 (conf *Config) SetupES() error {
|
||||
for name, cluster := range conf.Clusters {
|
||||
cluster.Name = name
|
||||
@@ -220,7 +221,6 @@ func (conf *Config) SetupES() error {
|
||||
}
|
||||
|
||||
es, err := elasticsearch.NewTyped(opts...)
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
|
||||
}
|
||||
|
||||
@@ -151,45 +151,6 @@ func (conf *Config) Init() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (conf *Config) determineDefaultCluster() error {
|
||||
if conf.CurrentCluster != "" {
|
||||
// -C specified, set current cluster explicitly, no matter what the config says
|
||||
current, exists := conf.Clusters[conf.CurrentCluster]
|
||||
if !exists {
|
||||
return fmt.Errorf("no cluster with alias %s configured", conf.CurrentCluster)
|
||||
} else {
|
||||
conf.DefaultCluster = current
|
||||
|
||||
// disable all others
|
||||
for _, cluster := range conf.Clusters {
|
||||
cluster.Default = false
|
||||
}
|
||||
|
||||
conf.DefaultCluster.Default = true
|
||||
}
|
||||
} else {
|
||||
// we need to determine ourselfes
|
||||
if len(conf.Clusters) == 1 {
|
||||
// ok, just one cluster configured, use this, of course
|
||||
for name, cluster := range conf.Clusters {
|
||||
conf.DefaultCluster = cluster
|
||||
conf.CurrentCluster = name
|
||||
conf.DefaultCluster.Default = true
|
||||
}
|
||||
} else {
|
||||
// multiple ones exists, look if one is set as default
|
||||
for name, cluster := range conf.Clusters {
|
||||
if cluster.Default {
|
||||
conf.DefaultCluster = cluster
|
||||
conf.CurrentCluster = name
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// we are using reflect to clone a config obj w/o the ES stuff for
|
||||
// shorter repr.Println() output (the ES structure is just too large)
|
||||
func (conf *Config) Clone() Config {
|
||||
@@ -198,14 +159,14 @@ func (conf *Config) Clone() Config {
|
||||
ref := reflect.ValueOf(*conf)
|
||||
typeOfS := ref.Type()
|
||||
|
||||
for i := 0; i < ref.NumField(); i++ {
|
||||
field := typeOfS.Field(i).Name
|
||||
for idx := range ref.NumField() {
|
||||
field := typeOfS.Field(idx).Name
|
||||
|
||||
if field == "Clusters" || field == "DefaultCluster" || !ref.Field(i).CanInterface() {
|
||||
if field == "Clusters" || field == "DefaultCluster" || !ref.Field(idx).CanInterface() {
|
||||
continue
|
||||
}
|
||||
|
||||
reflect.ValueOf(&clone).Elem().FieldByName(field).Set(reflect.ValueOf(ref.Field(i).Interface()))
|
||||
reflect.ValueOf(&clone).Elem().FieldByName(field).Set(reflect.ValueOf(ref.Field(idx).Interface()))
|
||||
}
|
||||
|
||||
return clone
|
||||
@@ -266,6 +227,7 @@ func (conf *Config) LoadConfig() error {
|
||||
for _, cluster := range conf.Clusters {
|
||||
if cluster.Default {
|
||||
conf.DefaultCluster = cluster
|
||||
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -278,9 +240,47 @@ func (conf *Config) LoadConfig() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (conf *Config) determineDefaultCluster() error {
|
||||
if conf.CurrentCluster != "" {
|
||||
// -C specified, set current cluster explicitly, no matter what the config says
|
||||
current, exists := conf.Clusters[conf.CurrentCluster]
|
||||
if !exists {
|
||||
return fmt.Errorf("no cluster with alias %s configured", conf.CurrentCluster)
|
||||
} else {
|
||||
conf.DefaultCluster = current
|
||||
|
||||
// disable all others
|
||||
for _, cluster := range conf.Clusters {
|
||||
cluster.Default = false
|
||||
}
|
||||
|
||||
conf.DefaultCluster.Default = true
|
||||
}
|
||||
} else {
|
||||
// we need to determine ourselfes
|
||||
if len(conf.Clusters) == 1 {
|
||||
// ok, just one cluster configured, use this, of course
|
||||
for name, cluster := range conf.Clusters {
|
||||
conf.DefaultCluster = cluster
|
||||
conf.CurrentCluster = name
|
||||
conf.DefaultCluster.Default = true
|
||||
}
|
||||
} else {
|
||||
// multiple ones exists, look if one is set as default
|
||||
for name, cluster := range conf.Clusters {
|
||||
if cluster.Default {
|
||||
conf.DefaultCluster = cluster
|
||||
conf.CurrentCluster = name
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func fileExists(filename string) bool {
|
||||
info, err := os.Stat(filename)
|
||||
|
||||
if err != nil {
|
||||
// return false on any error
|
||||
return false
|
||||
|
||||
@@ -25,6 +25,7 @@ import (
|
||||
|
||||
func isJQinstalled() bool {
|
||||
cmd := exec.CommandContext(context.Background(), "jq", "-h")
|
||||
|
||||
out, err := cmd.Output()
|
||||
if err != nil {
|
||||
return false
|
||||
|
||||
@@ -43,6 +43,7 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||
}
|
||||
|
||||
var pretty bytes.Buffer
|
||||
|
||||
err = json.Indent(&pretty, buf.Bytes(), "", "\t")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("json parse error: %w", err)
|
||||
|
||||
@@ -26,6 +26,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -92,7 +93,6 @@ func ApiRepl(conf *cfg.Config) error {
|
||||
EOFPrompt: "exit",
|
||||
HistorySearchFold: true,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
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)
|
||||
if len(parts) < 2 {
|
||||
fmt.Println("error: you need to input a verb, uri [and post data]")
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if !slices.Contains(verbs, strings.ToLower(parts[0])) {
|
||||
fmt.Println("error: verb must be one of " + strings.Join(verbs, ","))
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -144,6 +146,7 @@ func ApiRepl(conf *cfg.Config) error {
|
||||
pageJsonOutput(conf, raw)
|
||||
}
|
||||
|
||||
//nolint:nilerr
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -175,7 +178,6 @@ func pageJsonOutput(conf *cfg.Config, raw []byte) {
|
||||
pager.Stderr = os.Stderr
|
||||
|
||||
err := pager.Run()
|
||||
|
||||
if err != nil {
|
||||
fmt.Printf("failed to execute pager '%s': %s", conf.Pager, err)
|
||||
}
|
||||
@@ -197,16 +199,16 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
|
||||
verb = strings.ToUpper(verb)
|
||||
|
||||
// we're using port-forwards anyway
|
||||
tr := &http.Transport{
|
||||
noVerifyTransport := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||
}
|
||||
|
||||
client := &http.Client{Transport: tr}
|
||||
client := &http.Client{Transport: noVerifyTransport}
|
||||
|
||||
if conf.DebugHTTP {
|
||||
client = &http.Client{
|
||||
Transport: &cfg.DebugTransport{
|
||||
Transport: tr}}
|
||||
Transport: noVerifyTransport}}
|
||||
}
|
||||
|
||||
req, err := http.NewRequest(verb, conf.DefaultCluster.Uri+path, bytes.NewBuffer([]byte(data)))
|
||||
@@ -215,7 +217,7 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
|
||||
}
|
||||
|
||||
req.Header.Add("Content-Type", "application/json")
|
||||
req.Header.Add("accept", "application/json")
|
||||
req.Header.Add("Accept", "application/json")
|
||||
|
||||
// make sure we have got all we need
|
||||
if err := conf.DefaultCluster.CheckAuth(); err != nil {
|
||||
@@ -233,6 +235,11 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() {
|
||||
if err := resp.Body.Close(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}()
|
||||
|
||||
// Read and print response
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
@@ -249,6 +256,7 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
|
||||
cmd.Stdin = bytes.NewReader(raw)
|
||||
|
||||
var out bytes.Buffer
|
||||
|
||||
cmd.Stdout = &out
|
||||
|
||||
err := cmd.Run()
|
||||
@@ -258,7 +266,9 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
|
||||
|
||||
return out.String(), nil
|
||||
}
|
||||
|
||||
var pretty bytes.Buffer
|
||||
|
||||
err := json.Indent(&pretty, raw, "", "\t")
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("json parse error: %w", err)
|
||||
@@ -270,10 +280,10 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
|
||||
// interactively read arbitrary JSON data from STDIN, which is
|
||||
// virtually a repl inside the primary repl
|
||||
func readJSON(input string) (string, error) {
|
||||
data := ""
|
||||
data := strings.Builder{}
|
||||
|
||||
if input != "" {
|
||||
data = input
|
||||
data.WriteString(input)
|
||||
} else {
|
||||
scanner := bufio.NewScanner(os.Stdin)
|
||||
for scanner.Scan() {
|
||||
@@ -283,23 +293,23 @@ func readJSON(input string) (string, error) {
|
||||
break
|
||||
}
|
||||
|
||||
data += line
|
||||
data.WriteString(line)
|
||||
}
|
||||
}
|
||||
|
||||
if data == "" {
|
||||
return data, nil
|
||||
if data.Len() == 0 {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
// validate
|
||||
check := map[string]any{}
|
||||
err := json.Unmarshal([]byte(data), &check)
|
||||
|
||||
err := json.Unmarshal([]byte(data.String()), &check)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("error: input data is not proper JSON: %w", err)
|
||||
|
||||
}
|
||||
|
||||
return data, nil
|
||||
return data.String(), nil
|
||||
}
|
||||
|
||||
func ApiList(conf *cfg.Config, pattern string) error {
|
||||
@@ -338,6 +348,7 @@ func ApiList(conf *cfg.Config, pattern string) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -345,10 +356,13 @@ func ApiList(conf *cfg.Config, pattern string) error {
|
||||
func ApiPathNames() []string {
|
||||
assets.LoadAssetOpenApi()
|
||||
|
||||
paths := []string{}
|
||||
paths := make([]string, len(assets.OpenAPI.Spec().Paths.Paths))
|
||||
|
||||
idx := 0
|
||||
|
||||
for path := range assets.OpenAPI.Spec().Paths.Paths {
|
||||
paths = append(paths, path)
|
||||
paths[idx] = path
|
||||
idx++
|
||||
}
|
||||
|
||||
return paths
|
||||
@@ -356,6 +370,7 @@ func ApiPathNames() []string {
|
||||
|
||||
func ApiShow(conf *cfg.Config, showpath, verb string) error {
|
||||
assets.LoadAssetOpenApi()
|
||||
|
||||
out := printer.Builder{}
|
||||
|
||||
op, err := matchOperation(showpath, verb)
|
||||
@@ -372,18 +387,20 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
|
||||
sample := getApiExample(op)
|
||||
description := markdown.Render(cleanMarkup.ReplaceAllString(op.Op.Description, ""), width, cfg.DefaultMargin)
|
||||
|
||||
var bold = lipgloss.NewStyle().
|
||||
Bold(true)
|
||||
var paragraph = lipgloss.NewStyle().
|
||||
MarginBottom(1).
|
||||
MarginLeft(cfg.DefaultMargin)
|
||||
var boldparagraph = lipgloss.NewStyle().
|
||||
MarginBottom(1).
|
||||
MarginLeft(cfg.DefaultMargin).
|
||||
Bold(true)
|
||||
var indentparagraph = lipgloss.NewStyle().
|
||||
MarginBottom(1).
|
||||
MarginLeft(2)
|
||||
var (
|
||||
bold = lipgloss.NewStyle().
|
||||
Bold(true)
|
||||
paragraph = lipgloss.NewStyle().
|
||||
MarginBottom(1).
|
||||
MarginLeft(cfg.DefaultMargin)
|
||||
boldparagraph = lipgloss.NewStyle().
|
||||
MarginBottom(1).
|
||||
MarginLeft(cfg.DefaultMargin).
|
||||
Bold(true)
|
||||
indentparagraph = lipgloss.NewStyle().
|
||||
MarginBottom(1).
|
||||
MarginLeft(2)
|
||||
)
|
||||
|
||||
out.WriteStringLine(bold.Render("ID: " + op.Op.ID))
|
||||
out.WriteStringLine(paragraph.Render(fmt.Sprintf("%s %s", op.Verb, showpath)))
|
||||
@@ -399,10 +416,11 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
|
||||
|
||||
if len(params.Path) > 0 {
|
||||
out.WriteStringLine(bold.Render("Path Parameters"))
|
||||
|
||||
for _, param := range params.Path {
|
||||
out.WriteStringLine(boldparagraph.Render(param.Param))
|
||||
|
||||
if param.Description != "" {
|
||||
//out.WriteStringLine(indentparagraph.Render(param.Description))
|
||||
out.WriteStringLine(param.Description)
|
||||
}
|
||||
}
|
||||
@@ -410,8 +428,10 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
|
||||
|
||||
if len(params.Query) > 0 {
|
||||
out.WriteStringLine(bold.Render("Query Parameters"))
|
||||
|
||||
for _, param := range params.Query {
|
||||
out.WriteStringLine(boldparagraph.Render(param.Param))
|
||||
|
||||
if param.Description != "" {
|
||||
out.WriteStringLine(indentparagraph.Render(param.Description))
|
||||
}
|
||||
@@ -493,10 +513,8 @@ func getApiExample(op *Op) string {
|
||||
if hassource {
|
||||
sample = strings.TrimSpace(source.(string))
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -509,11 +527,13 @@ func getApiExample(op *Op) string {
|
||||
func matchOperation(showpath, verb string) (*Op, error) {
|
||||
ops := []*Op{}
|
||||
op := &Op{}
|
||||
|
||||
var found bool
|
||||
|
||||
for path, item := range assets.OpenAPI.Spec().Paths.Paths {
|
||||
if path == showpath {
|
||||
ops = findOperation(item.PathItemProps)
|
||||
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -530,6 +550,7 @@ func matchOperation(showpath, verb string) (*Op, error) {
|
||||
if strings.ToLower(item.Verb) == verb {
|
||||
op = item
|
||||
found = true
|
||||
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,9 +46,8 @@ func CcrStatus(conf *cfg.Config, leader, follower string) error {
|
||||
}
|
||||
|
||||
// reverse attribution
|
||||
f := follower
|
||||
follower = leader
|
||||
leader = f
|
||||
follower, leader = leader, 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)
|
||||
|
||||
remote := ""
|
||||
|
||||
var info *types.ClusterRemoteProxyInfo
|
||||
|
||||
for name, data := range res {
|
||||
remote = name
|
||||
info = data.(*types.ClusterRemoteProxyInfo)
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ package es
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
|
||||
@@ -35,11 +36,12 @@ func getRemoteName(conf *cfg.Config) (string, error) {
|
||||
remote := ""
|
||||
for name := range res {
|
||||
remote = name
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
if remote == "" {
|
||||
return "", fmt.Errorf("cluster doesn't have a follower")
|
||||
return "", errors.New("cluster doesn't have a follower")
|
||||
}
|
||||
|
||||
return remote, nil
|
||||
@@ -61,26 +63,31 @@ func CcrFollowerRenew(conf *cfg.Config, index string) error {
|
||||
if err := wrapError(IndexClose, conf, index); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("closed %s", index)
|
||||
|
||||
if err := wrapError(CcrFollowerPause, conf, index); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("paused %s", index)
|
||||
|
||||
if err := wrapError(CcrFollowerUnfollow, conf, index); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("unfollowed %s", index)
|
||||
|
||||
if err := wrapError(IndexDelete, conf, index); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("deleted %s", index)
|
||||
|
||||
if err := CcrFollowerAdd(conf, index); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("added follower %s", index)
|
||||
|
||||
return nil
|
||||
@@ -89,7 +96,6 @@ func CcrFollowerRenew(conf *cfg.Config, index string) error {
|
||||
func CcrFollowerResume(conf *cfg.Config, index string) error {
|
||||
_, err := conf.DefaultCluster.ES().Ccr.ResumeFollow(index).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to resume ccr following: %w", esErrorString(err))
|
||||
}
|
||||
@@ -100,7 +106,6 @@ func CcrFollowerResume(conf *cfg.Config, index string) error {
|
||||
func CcrFollowerPause(conf *cfg.Config, index string) error {
|
||||
_, err := conf.DefaultCluster.ES().Ccr.PauseFollow(index).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to pause ccr following: %w", esErrorString(err))
|
||||
}
|
||||
@@ -111,7 +116,6 @@ func CcrFollowerPause(conf *cfg.Config, index string) error {
|
||||
func CcrFollowerUnfollow(conf *cfg.Config, index string) error {
|
||||
_, err := conf.DefaultCluster.ES().Ccr.ForgetFollower(index).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to unfollow index: %w", esErrorString(err))
|
||||
}
|
||||
@@ -134,7 +138,6 @@ func CcrFollowerAdd(conf *cfg.Config, index string) error {
|
||||
}
|
||||
|
||||
_, err = create.Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create follower index: %w", esErrorString(err))
|
||||
}
|
||||
|
||||
@@ -38,13 +38,15 @@ type clusterReachable struct {
|
||||
}
|
||||
|
||||
func ClusterList(conf *cfg.Config) error {
|
||||
var mu sync.Mutex
|
||||
var wg sync.WaitGroup
|
||||
var (
|
||||
mu sync.Mutex
|
||||
wg sync.WaitGroup
|
||||
)
|
||||
|
||||
reachable := make(map[string]clusterReachable, len(conf.Clusters))
|
||||
|
||||
// check endpoints in parallel to speed things up
|
||||
for name, cluster := range conf.Clusters {
|
||||
|
||||
wg.Go(func() {
|
||||
online, err := cluster.IsReachable()
|
||||
|
||||
@@ -119,26 +121,26 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
|
||||
|
||||
var err error
|
||||
|
||||
for i := 0; i < gocount; i++ {
|
||||
r := <-responses
|
||||
for range gocount {
|
||||
res := <-responses
|
||||
|
||||
err = errors.Join(err, r.error)
|
||||
err = errors.Join(err, res.error)
|
||||
|
||||
switch r.which {
|
||||
switch res.which {
|
||||
case ResponseHealth:
|
||||
all.health = r.health
|
||||
all.health = res.health
|
||||
case ResponseCcr:
|
||||
all.ccr = r.ccr
|
||||
all.ccr = res.ccr
|
||||
case ResponseInfo:
|
||||
all.info = r.info
|
||||
all.info = res.info
|
||||
case ResponseStats:
|
||||
all.stats = r.stats
|
||||
all.stats = res.stats
|
||||
case ResponseIndices:
|
||||
all.indices = r.indices
|
||||
all.indices = res.indices
|
||||
case ResponseTasks:
|
||||
all.tasks = r.tasks
|
||||
all.tasks = res.tasks
|
||||
case ResponseHealthReport:
|
||||
all.healthreport = r.healthreport
|
||||
all.healthreport = res.healthreport
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,8 +155,10 @@ func ClusterStatus(conf *cfg.Config) error {
|
||||
|
||||
slog.Debug("ES result", "cluster health", res.health)
|
||||
|
||||
var isleader bool
|
||||
var ccrfollowing string
|
||||
var (
|
||||
isleader bool
|
||||
ccrfollowing string
|
||||
)
|
||||
|
||||
if res.ccr != nil {
|
||||
isleader = len(res.ccr.AutoFollowStats.AutoFollowedClusters) == 0
|
||||
@@ -171,6 +175,7 @@ func ClusterStatus(conf *cfg.Config) error {
|
||||
|
||||
// look for red indices, if any
|
||||
redindices := 0
|
||||
|
||||
for _, index := range *res.indices {
|
||||
if *index.Health == "red" {
|
||||
redindices++
|
||||
@@ -179,6 +184,7 @@ func ClusterStatus(conf *cfg.Config) error {
|
||||
|
||||
// look for long running tasks
|
||||
longtasks := 0
|
||||
|
||||
for _, task := range *res.tasks {
|
||||
if strings.Contains(*task.RunningTime, "d") {
|
||||
longtasks++
|
||||
@@ -211,7 +217,7 @@ func ClusterStatus(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
if conf.Verbose {
|
||||
table = gatherClusterStats(conf, res.stats, table)
|
||||
table = gatherClusterStats(res.stats, table)
|
||||
}
|
||||
|
||||
if res.health.Status.Name != "green" {
|
||||
@@ -239,9 +245,11 @@ func ClusterStatus(conf *cfg.Config) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func gatherClusterStats(conf *cfg.Config, clusterstats *clusterstats.Response, table *printer.Table) *printer.Table {
|
||||
var querycount int64
|
||||
var vmversion string
|
||||
func gatherClusterStats(clusterstats *clusterstats.Response, table *printer.Table) *printer.Table {
|
||||
var (
|
||||
querycount int64
|
||||
vmversion string
|
||||
)
|
||||
|
||||
for _, count := range clusterstats.Indices.Search.Queries {
|
||||
querycount += count
|
||||
|
||||
@@ -118,6 +118,7 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, index string, stale bool) e
|
||||
if stale {
|
||||
which = "stale"
|
||||
}
|
||||
|
||||
return fmt.Errorf("failed to allocate %s primary shard: %w", which, err)
|
||||
}
|
||||
|
||||
|
||||
@@ -40,6 +40,7 @@ func ClusterSettingsList(conf *cfg.Config) error {
|
||||
|
||||
table := printer.NewTable(conf, 2, 0)
|
||||
table.Addheaders("setting", "value")
|
||||
|
||||
entries := [][]any{}
|
||||
|
||||
settingshash := res.Persistent // == map[string]json.RawMessage
|
||||
@@ -77,6 +78,7 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %w", value, err)
|
||||
}
|
||||
|
||||
put.AddTransient(setting, message)
|
||||
case conf.Persistent:
|
||||
fallthrough
|
||||
@@ -85,6 +87,7 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err)
|
||||
}
|
||||
|
||||
put.AddPersistent(setting, message)
|
||||
}
|
||||
}
|
||||
@@ -106,7 +109,6 @@ func ClusterSettingsSetSingle(conf *cfg.Config, setting, value string) error {
|
||||
_, err = conf.DefaultCluster.ES().Cluster.PutSettings().
|
||||
AddPersistent(setting, message).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to set %s: %w", setting, esErrorString(err))
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -37,6 +37,7 @@ func checkClusterIsLeader(conf *cfg.Config, leader string) bool {
|
||||
Do(context.Background())
|
||||
if err != nil {
|
||||
fmt.Printf("failed to get ccr stats from %s: %s", leader, esErrorString(err))
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -47,6 +48,7 @@ func checkClusterIsLeader(conf *cfg.Config, leader string) bool {
|
||||
|
||||
if stats.AutoFollowStats.AutoFollowedClusters[0].ClusterName != "" {
|
||||
fmt.Println("leader/follower attribution is invalid, reverse cluster attribution and retry")
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -58,14 +60,15 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
|
||||
status := map[string]*health.Response{}
|
||||
|
||||
for _, cluster := range []string{leader, follower} {
|
||||
st, err := conf.Clusters[leader].ES().Cluster.Health().
|
||||
clusterHealth, err := conf.Clusters[leader].ES().Cluster.Health().
|
||||
Do(context.Background())
|
||||
if err != nil {
|
||||
fmt.Printf("failed to get health from %s: %s", cluster, esErrorString(err))
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
status[cluster] = st
|
||||
status[cluster] = clusterHealth
|
||||
}
|
||||
|
||||
table := printer.NewTable(conf, 3, 6)
|
||||
@@ -98,6 +101,7 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
fmt.Println(err)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -120,6 +124,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
|
||||
Do(context.Background())
|
||||
if err != nil {
|
||||
fmt.Printf("failed to get ilm status from %s: %s", cluster, esErrorString(err))
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -158,6 +163,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
fmt.Println(err)
|
||||
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -174,6 +180,7 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
|
||||
}
|
||||
|
||||
indexOnlyOnLeader := map[string]*types.IndicesRecord{}
|
||||
|
||||
for name, index := range indices[leader] {
|
||||
if exclude.MatchString(name) {
|
||||
continue
|
||||
@@ -195,9 +202,11 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
|
||||
}
|
||||
|
||||
isWritable := false
|
||||
|
||||
for _, alias := range res[name].Aliases {
|
||||
if *alias.IsWriteIndex {
|
||||
isWritable = true
|
||||
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -227,8 +236,10 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
fmt.Println(err)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -275,8 +286,10 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
fmt.Println(err)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -309,8 +322,10 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
fmt.Println(err)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
@@ -65,21 +65,22 @@ func DatastreamList(conf *cfg.Config) error {
|
||||
table := printer.NewTable(conf, 7, size)
|
||||
table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
|
||||
|
||||
for idx, ds := range list {
|
||||
name := printer.Colorize(conf, ds.Status.String(), ds.Name)
|
||||
for idx, datastream := range list {
|
||||
name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
|
||||
|
||||
policy := ""
|
||||
if ds.IlmPolicy != nil {
|
||||
policy = *ds.IlmPolicy
|
||||
if datastream.IlmPolicy != nil {
|
||||
policy = *datastream.IlmPolicy
|
||||
}
|
||||
|
||||
table.Entries[idx] = []any{
|
||||
name,
|
||||
policy,
|
||||
ds.Hidden,
|
||||
*ds.System,
|
||||
*ds.Replicated,
|
||||
ds.Generation,
|
||||
ds.TimestampField.Name,
|
||||
datastream.Hidden,
|
||||
*datastream.System,
|
||||
*datastream.Replicated,
|
||||
datastream.Generation,
|
||||
datastream.TimestampField.Name,
|
||||
}
|
||||
|
||||
if idx == size-1 {
|
||||
@@ -88,6 +89,7 @@ func DatastreamList(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -147,22 +149,23 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
||||
table := printer.NewTable(conf, 11, 2)
|
||||
table.Addheaders("data stream property", "value")
|
||||
|
||||
ds := res.DataStreams[0]
|
||||
datastream := res.DataStreams[0]
|
||||
|
||||
name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
|
||||
|
||||
name := printer.Colorize(conf, ds.Status.String(), ds.Name)
|
||||
policy := ""
|
||||
if ds.IlmPolicy != nil {
|
||||
policy = *ds.IlmPolicy
|
||||
if datastream.IlmPolicy != nil {
|
||||
policy = *datastream.IlmPolicy
|
||||
}
|
||||
|
||||
table.Entries = [][]any{
|
||||
{"name", name},
|
||||
{"ilm policy", policy},
|
||||
{"hidden", ds.Hidden},
|
||||
{"system", *ds.System},
|
||||
{"replicated", *ds.Replicated},
|
||||
{"generation", ds.Generation},
|
||||
{"timestamp field", ds.TimestampField.Name},
|
||||
{"hidden", datastream.Hidden},
|
||||
{"system", *datastream.System},
|
||||
{"replicated", *datastream.Replicated},
|
||||
{"generation", datastream.Generation},
|
||||
{"timestamp field", datastream.TimestampField.Name},
|
||||
{"backing indices", stats.BackingIndices},
|
||||
{"size", printer.Bytes(stats.TotalStoreSizeBytes)},
|
||||
{"shards-failed", stats.Shards_.Failed},
|
||||
@@ -173,13 +176,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
table = printer.NewTable(conf, 5, len(ds.Indices))
|
||||
table = printer.NewTable(conf, 5, len(datastream.Indices))
|
||||
table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
|
||||
|
||||
for idx, index := range ds.Indices {
|
||||
for idx, index := range datastream.Indices {
|
||||
policy := ""
|
||||
if ds.IlmPolicy != nil {
|
||||
policy = *ds.IlmPolicy
|
||||
if datastream.IlmPolicy != nil {
|
||||
policy = *datastream.IlmPolicy
|
||||
}
|
||||
|
||||
table.Entries[idx] = []any{
|
||||
@@ -190,12 +193,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
||||
index.ManagedBy.Name,
|
||||
}
|
||||
|
||||
if idx < len(ds.Indices) {
|
||||
if idx < len(datastream.Indices) {
|
||||
fmt.Println()
|
||||
}
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -206,7 +210,6 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
||||
func DatastreamCreate(conf *cfg.Config, dsname string) error {
|
||||
_, err := conf.DefaultCluster.ES().Indices.CreateDataStream(dsname).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create datastream: %w", esErrorString(err))
|
||||
}
|
||||
@@ -217,7 +220,6 @@ func DatastreamCreate(conf *cfg.Config, dsname string) error {
|
||||
func DatastreamDelete(conf *cfg.Config, dsname string) error {
|
||||
_, err := conf.DefaultCluster.ES().Indices.DeleteDataStream(dsname).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to delete datastream: %w", esErrorString(err))
|
||||
}
|
||||
@@ -227,7 +229,6 @@ func DatastreamDelete(conf *cfg.Config, dsname string) error {
|
||||
|
||||
func DatastreamRollover(conf *cfg.Config, ds string) error {
|
||||
res, err := RolloverAlias(conf, ds)
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"math/rand/v2"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"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)
|
||||
}
|
||||
|
||||
now := fmt.Sprintf("%d", rand.Int64())
|
||||
now := strconv.FormatInt(rand.Int64(), 10)
|
||||
|
||||
res, err := conf.DefaultCluster.ES().Create(conf.Index, now).
|
||||
Document(data).
|
||||
|
||||
@@ -45,7 +45,6 @@ Convert a duration into an integer. Valid time units are "s", "m", "h" and
|
||||
via https://codeberg.org/scip/tablizer/src/branch/main/lib/sort.go#L113
|
||||
*/
|
||||
func parseDuration(duration string) time.Duration {
|
||||
|
||||
seconds := 0
|
||||
|
||||
for _, match := range matchDuration.FindAllStringSubmatch(duration, -1) {
|
||||
@@ -111,12 +110,14 @@ func formatDuration(val time.Duration) string {
|
||||
if esd.minutes == 0 {
|
||||
return fmt.Sprintf("%dh", esd.hours)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%dh:%dm", esd.hours, int64(esd.minutes))
|
||||
|
||||
default:
|
||||
if esd.minutes == 0 && hoursLeft == 0 {
|
||||
return fmt.Sprintf("%dd", int64(days))
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%dd:%dh:%dm",
|
||||
int64(days),
|
||||
int64(hoursLeft),
|
||||
|
||||
@@ -27,22 +27,20 @@ import (
|
||||
func esErrorString(err error) error {
|
||||
msg := err.Error()
|
||||
|
||||
switch e := err.(type) {
|
||||
//nolint:gocritic
|
||||
switch errVal := err.(type) {
|
||||
case *types.ElasticsearchError:
|
||||
var causes strings.Builder
|
||||
|
||||
for _, cause := range e.ErrorCause.RootCause {
|
||||
// FIXME: re-activate linter here, see https://github.com/golangci/golangci-lint/issues/6662
|
||||
//nolint:staticcheck
|
||||
causes.WriteString(fmt.Sprintf("%s\n", *cause.Reason))
|
||||
for _, cause := range errVal.ErrorCause.RootCause {
|
||||
fmt.Fprintf(&causes, "%s\n", *cause.Reason)
|
||||
}
|
||||
|
||||
if e.ErrorCause.Reason != nil {
|
||||
msg = *e.ErrorCause.Reason + ": " + causes.String()
|
||||
if errVal.ErrorCause.Reason != nil {
|
||||
msg = *errVal.ErrorCause.Reason + ": " + causes.String()
|
||||
} else {
|
||||
msg = fmt.Sprintf("http status %d: ", e.Status)
|
||||
msg = fmt.Sprintf("http status %d: ", errVal.Status)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return errors.New(msg)
|
||||
|
||||
@@ -102,6 +102,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -166,6 +167,7 @@ func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
|
||||
}
|
||||
|
||||
indent += " "
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -260,7 +262,7 @@ func ilmPhaseString(phase *types.Phase, short bool) string {
|
||||
}
|
||||
|
||||
if phase.Actions.SearchableSnapshot != nil {
|
||||
out = append(out, fmt.Sprintf("searchable-snapshot:%s", phase.Actions.SearchableSnapshot.SnapshotRepository))
|
||||
out = append(out, "searchable-snapshot:"+phase.Actions.SearchableSnapshot.SnapshotRepository)
|
||||
}
|
||||
|
||||
return strings.Join(out, ",")
|
||||
@@ -286,6 +288,7 @@ func IlmExplain(conf *cfg.Config, index string) error {
|
||||
table.Addheaders("ilm status field", "value")
|
||||
|
||||
info := ""
|
||||
|
||||
err = json.Unmarshal(ilm.StepInfo["reason"], &info)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to unmarshal step info: %w", err)
|
||||
@@ -345,7 +348,9 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
|
||||
if cfg.HaveHot() {
|
||||
hot := types.Phase{}
|
||||
|
||||
var actions types.IlmActionsVariant = esdsl.NewIlmActions()
|
||||
|
||||
rollover := &types.RolloverAction{}
|
||||
haveroll := false
|
||||
|
||||
@@ -383,15 +388,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
|
||||
hot.Actions = actions.IlmActionsCaster()
|
||||
phases.PhasesCaster().Hot = &hot
|
||||
} else {
|
||||
if policy != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Hot = policy.Phases.Hot
|
||||
}
|
||||
} else if policy != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Hot = policy.Phases.Hot
|
||||
}
|
||||
|
||||
if cfg.HaveWarm() {
|
||||
warm := types.Phase{}
|
||||
|
||||
var actions types.IlmActionsVariant = esdsl.NewIlmActions()
|
||||
|
||||
if policy != nil {
|
||||
@@ -417,15 +421,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
|
||||
warm.Actions = actions.IlmActionsCaster()
|
||||
phases.PhasesCaster().Warm = &warm
|
||||
} else {
|
||||
if policy != nil && policy.Phases.Warm != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Warm = policy.Phases.Warm
|
||||
}
|
||||
} else if policy != nil && policy.Phases.Warm != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Warm = policy.Phases.Warm
|
||||
}
|
||||
|
||||
if cfg.HaveCold() {
|
||||
cold := types.Phase{}
|
||||
|
||||
var actions types.IlmActionsVariant = esdsl.NewIlmActions()
|
||||
|
||||
if policy != nil {
|
||||
@@ -452,15 +455,14 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
|
||||
cold.Actions = actions.IlmActionsCaster()
|
||||
phases.PhasesCaster().Cold = &cold
|
||||
} else {
|
||||
if policy != nil && policy.Phases.Cold != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Cold = policy.Phases.Cold
|
||||
}
|
||||
} else if policy != nil && policy.Phases.Cold != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Cold = policy.Phases.Cold
|
||||
}
|
||||
|
||||
if cfg.HaveFrozen() {
|
||||
froze := types.Phase{}
|
||||
|
||||
var actions types.IlmActionsVariant = esdsl.NewIlmActions()
|
||||
|
||||
if policy != nil {
|
||||
@@ -479,16 +481,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
|
||||
froze.Actions = actions.IlmActionsCaster()
|
||||
phases.PhasesCaster().Frozen = &froze
|
||||
} else {
|
||||
if policy != nil && policy.Phases.Frozen != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Frozen = policy.Phases.Frozen
|
||||
}
|
||||
} else if policy != nil && policy.Phases.Frozen != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Frozen = policy.Phases.Frozen
|
||||
}
|
||||
|
||||
if cfg.HaveDelete() {
|
||||
del := types.Phase{}
|
||||
delete := types.DeleteAction{}
|
||||
|
||||
var actions types.IlmActionsVariant = esdsl.NewIlmActions()
|
||||
|
||||
if policy != nil {
|
||||
@@ -507,11 +508,9 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
actions.IlmActionsCaster().Delete = &delete
|
||||
del.Actions = actions.IlmActionsCaster()
|
||||
phases.PhasesCaster().Delete = &del
|
||||
} else {
|
||||
if policy != nil && policy.Phases.Delete != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Delete = policy.Phases.Delete
|
||||
}
|
||||
} else if policy != nil && policy.Phases.Delete != nil {
|
||||
// update
|
||||
phases.PhasesCaster().Delete = policy.Phases.Delete
|
||||
}
|
||||
|
||||
put := &putlifecycle.Request{}
|
||||
|
||||
@@ -138,6 +138,7 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -154,6 +155,7 @@ func IlmForecastShow(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
within := parseDuration(conf.Ilm.Within)
|
||||
|
||||
var toBeFreed int64 = 0
|
||||
|
||||
for _, phase := range phaseData {
|
||||
@@ -192,24 +194,26 @@ func getIlmPhaseData(conf *cfg.Config) ([]PhaseData, error) {
|
||||
|
||||
wg.Wait()
|
||||
|
||||
var ilmdetails *explainlifecycle.Response
|
||||
var indicesres *indices.Response
|
||||
var ilmpolicies getlifecycle.Response
|
||||
var (
|
||||
ilmdetails *explainlifecycle.Response
|
||||
indicesres *indices.Response
|
||||
ilmpolicies getlifecycle.Response
|
||||
)
|
||||
|
||||
for range 3 {
|
||||
r := <-responses
|
||||
res := <-responses
|
||||
|
||||
if r.error != nil {
|
||||
return nil, r.error
|
||||
if res.error != nil {
|
||||
return nil, res.error
|
||||
}
|
||||
|
||||
switch r.which {
|
||||
switch res.which {
|
||||
case ResponseExplain:
|
||||
ilmdetails = r.explainlifecycle
|
||||
ilmdetails = res.explainlifecycle
|
||||
case ResponseIndices:
|
||||
indicesres = r.indicesbytes
|
||||
indicesres = res.indicesbytes
|
||||
case ResponseLifecycle:
|
||||
ilmpolicies = *r.lifecycle
|
||||
ilmpolicies = *res.lifecycle
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,6 @@ import (
|
||||
func IndexNames(conf *cfg.Config) ([]string, error) {
|
||||
res, err := conf.DefaultCluster.ES().Cat.Indices().
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get indicies: %w", esErrorString(err))
|
||||
}
|
||||
@@ -126,6 +125,7 @@ func IndexList(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -140,6 +140,7 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
|
||||
|
||||
for name, index := range res {
|
||||
fields := make([]string, len(index.Mappings.Properties))
|
||||
|
||||
idx := 0
|
||||
for field := range index.Mappings.Properties {
|
||||
fields[idx] = field
|
||||
@@ -195,6 +196,7 @@ func IndexCreate(conf *cfg.Config, index string, mappings []string) error {
|
||||
if conf.Shards > 0 {
|
||||
settings.NumberOfShards(strconv.Itoa(conf.Shards))
|
||||
}
|
||||
|
||||
if conf.Replicas > 0 {
|
||||
settings.NumberOfReplicas(strconv.Itoa(conf.Replicas))
|
||||
}
|
||||
@@ -232,7 +234,6 @@ func IndexCreate(conf *cfg.Config, index string, mappings []string) error {
|
||||
|
||||
_, err := create.Settings(settings).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create index: %w", esErrorString(err))
|
||||
}
|
||||
@@ -253,7 +254,6 @@ func IndexDelete(conf *cfg.Config, index string) error {
|
||||
func IndexClose(conf *cfg.Config, index string) error {
|
||||
_, err := conf.DefaultCluster.ES().Indices.Close(index).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to close index: %w", esErrorString(err))
|
||||
}
|
||||
@@ -274,6 +274,7 @@ func IndexFields(conf *cfg.Config, index string) error {
|
||||
table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
|
||||
|
||||
idx := 0
|
||||
|
||||
for name, field := range res.Fields {
|
||||
for fieldtype, caps := range field {
|
||||
// fields only have 1 type, so this one is it
|
||||
|
||||
@@ -52,7 +52,6 @@ func IndexAliasList(conf *cfg.Config) error {
|
||||
res, err := conf.DefaultCluster.ES().Indices.GetAlias().
|
||||
Index("_all").
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to list index aliases: %w", esErrorString(err))
|
||||
}
|
||||
@@ -110,7 +109,6 @@ func IndexAliasDelete(conf *cfg.Config, index, alias string) error {
|
||||
|
||||
func IndexAliasRollover(conf *cfg.Config, alias string) error {
|
||||
res, err := RolloverAlias(conf, alias)
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@ import (
|
||||
func IndexTemplateList(conf *cfg.Config) error {
|
||||
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
|
||||
}
|
||||
@@ -56,6 +55,7 @@ func IndexTemplateList(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -63,7 +63,6 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
||||
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
|
||||
Name(tplname).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get index template: %w", esErrorString(err))
|
||||
}
|
||||
@@ -109,10 +108,11 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
||||
|
||||
err = getIndexTemplateSettings(conf, tplname, table)
|
||||
if err != nil {
|
||||
return nil
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Println()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -137,6 +137,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
||||
}
|
||||
|
||||
fmt.Println()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -224,7 +225,6 @@ func IndexTemplateCreate(conf *cfg.Config, name string, mappings []string) error
|
||||
create.IndexPatterns(conf.Patterns...)
|
||||
|
||||
_, err := create.Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create index template: %w", esErrorString(err))
|
||||
}
|
||||
@@ -241,7 +241,6 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
|
||||
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
|
||||
Name(name).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get index template: %w", esErrorString(err))
|
||||
}
|
||||
@@ -335,7 +334,6 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
|
||||
modify.IndexPatterns(patterns...)
|
||||
|
||||
_, err = modify.Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to modify index template: %w", esErrorString(err))
|
||||
}
|
||||
@@ -366,7 +364,6 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
|
||||
res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
|
||||
Name(name).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get index template: %w", esErrorString(err))
|
||||
}
|
||||
@@ -417,7 +414,6 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
func modMappings(mappings []string) (types.TypeMappingVariant, error) {
|
||||
|
||||
@@ -43,6 +43,7 @@ func getIndexTemplateSettings(conf *cfg.Config, tplname string, table *printer.T
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Println(output)
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strconv"
|
||||
|
||||
"codeberg.org/scip/esctl/pkg/cfg"
|
||||
"codeberg.org/scip/esctl/pkg/printer"
|
||||
@@ -38,12 +39,14 @@ func LicenseShow(conf *cfg.Config) error {
|
||||
|
||||
lic := res.License
|
||||
|
||||
var maxnodes = "infinite"
|
||||
var maxunits = "infinite"
|
||||
var expire = "never"
|
||||
var (
|
||||
maxnodes = "infinite"
|
||||
maxunits = "infinite"
|
||||
expire = "never"
|
||||
)
|
||||
|
||||
if lic.MaxNodes != nil {
|
||||
maxnodes = fmt.Sprintf("%d", *lic.MaxNodes)
|
||||
maxnodes = strconv.FormatInt(*lic.MaxNodes, 10)
|
||||
}
|
||||
|
||||
if lic.ExpiryDate != nil {
|
||||
@@ -51,7 +54,7 @@ func LicenseShow(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
if lic.MaxResourceUnits != nil {
|
||||
maxunits = fmt.Sprintf("%d", *lic.MaxResourceUnits)
|
||||
maxunits = strconv.Itoa(*lic.MaxResourceUnits)
|
||||
}
|
||||
|
||||
table.Entries = [][]any{
|
||||
|
||||
@@ -20,6 +20,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -53,6 +54,7 @@ func NodeList(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -187,7 +189,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
|
||||
|
||||
table.AddRow(
|
||||
agent,
|
||||
fmt.Sprintf("%d", *client.Id),
|
||||
strconv.FormatInt(*client.Id, 10),
|
||||
time.UnixMilli(*client.LastRequestTimeMillis).String(),
|
||||
*client.RemoteAddress,
|
||||
uri,
|
||||
@@ -199,5 +201,6 @@ func NodeClients(conf *cfg.Config, nodename string) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -69,7 +69,8 @@ func getApiData(
|
||||
which string) {
|
||||
defer wg.Done()
|
||||
|
||||
ar := apiResponse{}
|
||||
apiRes := apiResponse{}
|
||||
|
||||
var arerr error
|
||||
|
||||
switch which {
|
||||
@@ -77,47 +78,47 @@ func getApiData(
|
||||
res, err := es.Cluster.Health().
|
||||
Do(context.Background())
|
||||
|
||||
ar.health = res
|
||||
ar.which = ResponseHealth
|
||||
apiRes.health = res
|
||||
apiRes.which = ResponseHealth
|
||||
arerr = err
|
||||
|
||||
case "healthreport":
|
||||
report, err := getHealthReport(conf)
|
||||
|
||||
ar.healthreport = report
|
||||
ar.which = ResponseHealthReport
|
||||
apiRes.healthreport = report
|
||||
apiRes.which = ResponseHealthReport
|
||||
arerr = err
|
||||
|
||||
case "info":
|
||||
res, err := es.Info().
|
||||
Do(context.Background())
|
||||
|
||||
ar.info = res
|
||||
ar.which = ResponseInfo
|
||||
apiRes.info = res
|
||||
apiRes.which = ResponseInfo
|
||||
arerr = err
|
||||
|
||||
case "ccr":
|
||||
res, err := es.Ccr.Stats().
|
||||
Do(context.Background())
|
||||
|
||||
ar.ccr = res
|
||||
ar.which = ResponseCcr
|
||||
apiRes.ccr = res
|
||||
apiRes.which = ResponseCcr
|
||||
arerr = err
|
||||
|
||||
case "stats":
|
||||
res, err := es.Cluster.Stats().
|
||||
Do(context.Background())
|
||||
|
||||
ar.stats = res
|
||||
ar.which = ResponseStats
|
||||
apiRes.stats = res
|
||||
apiRes.which = ResponseStats
|
||||
arerr = err
|
||||
|
||||
case "indices":
|
||||
res, err := es.Cat.Indices().
|
||||
Do(context.Background())
|
||||
|
||||
ar.indices = &res
|
||||
ar.which = ResponseIndices
|
||||
apiRes.indices = &res
|
||||
apiRes.which = ResponseIndices
|
||||
arerr = err
|
||||
|
||||
case "indicesbytes":
|
||||
@@ -126,16 +127,16 @@ func getApiData(
|
||||
Bytes(bytes.Bytes{Name: "b"}).
|
||||
Do(context.Background())
|
||||
|
||||
ar.indicesbytes = &res
|
||||
ar.which = ResponseIndices
|
||||
apiRes.indicesbytes = &res
|
||||
apiRes.which = ResponseIndices
|
||||
arerr = err
|
||||
|
||||
case "tasks":
|
||||
res, err := es.Cat.Tasks().
|
||||
Do(context.Background())
|
||||
|
||||
ar.tasks = &res
|
||||
ar.which = ResponseTasks
|
||||
apiRes.tasks = &res
|
||||
apiRes.which = ResponseTasks
|
||||
arerr = err
|
||||
|
||||
case "explain":
|
||||
@@ -143,8 +144,8 @@ func getApiData(
|
||||
ExplainLifecycle("_all").
|
||||
Do(context.Background())
|
||||
|
||||
ar.explainlifecycle = res
|
||||
ar.which = ResponseExplain
|
||||
apiRes.explainlifecycle = res
|
||||
apiRes.which = ResponseExplain
|
||||
arerr = err
|
||||
|
||||
case "policies":
|
||||
@@ -152,14 +153,14 @@ func getApiData(
|
||||
GetLifecycle().
|
||||
Do(context.Background())
|
||||
|
||||
ar.lifecycle = &res
|
||||
ar.which = ResponseLifecycle
|
||||
apiRes.lifecycle = &res
|
||||
apiRes.which = ResponseLifecycle
|
||||
arerr = err
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ func RoleNames(conf *cfg.Config) ([]string, error) {
|
||||
}
|
||||
|
||||
roles := make([]string, len(res))
|
||||
|
||||
idx := 0
|
||||
for name := range res {
|
||||
roles[idx] = name
|
||||
@@ -66,6 +67,7 @@ func RoleList(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
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.Addheaders("remote cluster", "privilege")
|
||||
|
||||
idx := 0
|
||||
|
||||
for _, priv := range role.RemoteCluster {
|
||||
perms := []string{}
|
||||
for _, perm := range priv.Privileges {
|
||||
@@ -145,6 +149,7 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -155,6 +160,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
|
||||
|
||||
table := printer.NewTable(conf, 1, len(role.Cluster))
|
||||
table.Addheaders("cluster rights")
|
||||
|
||||
idx := 0
|
||||
for _, cluster := range role.Cluster {
|
||||
table.Entries[idx] = []any{cluster.Name}
|
||||
@@ -162,6 +168,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -172,7 +179,9 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
|
||||
|
||||
table := printer.NewTable(conf, 3, len(role.RemoteIndices))
|
||||
table.Addheaders("remote index names", "index permissions", "allow restricted")
|
||||
|
||||
idx := 0
|
||||
|
||||
for _, priv := range role.RemoteIndices {
|
||||
perms := []string{}
|
||||
for _, perm := range priv.Privileges {
|
||||
@@ -185,6 +194,7 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -195,7 +205,9 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
|
||||
|
||||
table := printer.NewTable(conf, 3, len(role.Indices))
|
||||
table.Addheaders("index names", "index permissions", "allow restricted")
|
||||
|
||||
idx := 0
|
||||
|
||||
for _, priv := range role.Indices {
|
||||
perms := []string{}
|
||||
for _, perm := range priv.Privileges {
|
||||
@@ -208,6 +220,7 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -218,6 +231,7 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
|
||||
|
||||
table := printer.NewTable(conf, 3, len(role.Applications))
|
||||
table.Addheaders("application", "privileges", "resources")
|
||||
|
||||
idx := 0
|
||||
for _, priv := range role.Applications {
|
||||
table.Entries[idx] = []any{
|
||||
@@ -230,5 +244,6 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
return table.Print()
|
||||
}
|
||||
|
||||
@@ -179,6 +179,7 @@ func diffRoles(conf *cfg.Config, records map[string]Record, res getrole.Response
|
||||
// iterate over records from CSV and register only those which are not deployed
|
||||
for name := range records {
|
||||
reg := Register{name: name, defined: true}
|
||||
|
||||
_, deployed := deployed[name]
|
||||
if !deployed {
|
||||
rows = append(rows, reg)
|
||||
@@ -249,6 +250,7 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
|
||||
}
|
||||
|
||||
groups := []string{}
|
||||
|
||||
for _, mapping := range mappings {
|
||||
if slices.Contains(mapping.Roles, rolename) {
|
||||
for _, rule := range mapping.Rules.Any {
|
||||
@@ -262,13 +264,13 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
|
||||
return groups, nil
|
||||
}
|
||||
|
||||
func compareSlices(name string, a, b []string) {
|
||||
slices.Sort(a)
|
||||
slices.Sort(b)
|
||||
func compareSlices(name string, left, right []string) {
|
||||
slices.Sort(left)
|
||||
slices.Sort(right)
|
||||
|
||||
if slices.Compare(a, b) != 0 {
|
||||
if slices.Compare(left, right) != 0 {
|
||||
fmt.Printf("%s differs:\ndeployed: %s\n csv: %s\n",
|
||||
name, strings.Join(a, ","), strings.Join(b, ","))
|
||||
name, strings.Join(left, ","), strings.Join(right, ","))
|
||||
} else {
|
||||
fmt.Printf("deployed %s matches csv definition\n", name)
|
||||
}
|
||||
@@ -289,16 +291,19 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
|
||||
|
||||
if !record.defined {
|
||||
fmt.Printf("role %s is not defined\n", rolename)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
role, exists := res[rolename]
|
||||
if !exists {
|
||||
fmt.Printf("role %s is not deployed\n", rolename)
|
||||
|
||||
return nil
|
||||
} else {
|
||||
fmt.Printf("role %s is deployed\n", rolename)
|
||||
}
|
||||
|
||||
slog.Debug("found role", "role", role)
|
||||
|
||||
if conf.Debug {
|
||||
@@ -310,6 +315,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
slog.Debug("group mappings", "groups", groups)
|
||||
|
||||
// check cluster setting
|
||||
@@ -321,6 +327,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
|
||||
// check index names+privs
|
||||
indices := []string{}
|
||||
privs := []string{}
|
||||
|
||||
for _, index := range role.Indices {
|
||||
for _, name := range index.Names {
|
||||
indices = append(indices, strings.ReplaceAll(name, "**", "*"))
|
||||
@@ -333,6 +340,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
|
||||
|
||||
// check kibana application space
|
||||
spaces := []string{}
|
||||
|
||||
for _, app := range role.Applications {
|
||||
for _, resource := range app.Resources {
|
||||
if strings.Contains(resource, "space:") {
|
||||
|
||||
@@ -31,14 +31,17 @@ func RolloverConditions(conf *cfg.Config) types.RolloverConditionsVariant {
|
||||
if conf.MaxAge != "" {
|
||||
cond.MaxAge(esdsl.NewDuration().String(conf.MaxAge))
|
||||
}
|
||||
|
||||
if conf.MaxDocs > 0 {
|
||||
cond.MaxDocs(int64(conf.MaxDocs))
|
||||
}
|
||||
|
||||
if conf.MaxShardSize > 0 {
|
||||
bs := esdsl.NewByteSize()
|
||||
bs.Int64(int64(conf.MaxShardSize))
|
||||
cond.MaxPrimaryShardSize(bs)
|
||||
}
|
||||
|
||||
if conf.MaxShardDocs > 0 {
|
||||
cond.MaxPrimaryShardDocs(int64(conf.MaxShardDocs))
|
||||
}
|
||||
|
||||
@@ -111,6 +111,7 @@ func explainSearch(conf *cfg.Config, search *search.Search) error {
|
||||
|
||||
func explain(res *types.ExplanationDetail, indent string) {
|
||||
fmt.Println(indent + "- " + res.Description)
|
||||
|
||||
for _, ex := range res.Details {
|
||||
fmt.Println(indent + " - " + ex.Description)
|
||||
fmt.Println(indent + fmt.Sprintf(" score: %f", res.Value))
|
||||
@@ -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
|
||||
func searchPit(conf *cfg.Config, req *search.Request) error {
|
||||
ctx := context.Background()
|
||||
|
||||
pit, err := conf.DefaultCluster.ES().OpenPointInTime(conf.Index).KeepAlive("1m").Do(ctx)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open point-in-time request for search: %w", err)
|
||||
|
||||
@@ -63,6 +63,7 @@ type filter struct {
|
||||
// must match literally, and range filters using -r "@timestamp:2026-05-28T10:00:00 to now"
|
||||
func NewFilter(query string) (*filter, error) {
|
||||
var separator string
|
||||
|
||||
var criteria int // we use the constants on top for this
|
||||
|
||||
switch {
|
||||
@@ -76,7 +77,7 @@ func NewFilter(query string) (*filter, error) {
|
||||
|
||||
part := strings.Split(query, separator)
|
||||
if len(part) != 2 {
|
||||
return nil, fmt.Errorf("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
|
||||
return nil, errors.New("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
|
||||
}
|
||||
|
||||
flt := &filter{term: part[0], filter: part[1], criteria: criteria}
|
||||
@@ -234,7 +235,6 @@ func addFilters(conf *cfg.Config) ([]types.QueryVariant, error) {
|
||||
}
|
||||
|
||||
filters[count-1] = rng
|
||||
|
||||
}
|
||||
|
||||
return filters, nil
|
||||
@@ -247,7 +247,6 @@ func addSort(conf *cfg.Config, search *search.Search) *search.Search {
|
||||
Index(conf.Index).
|
||||
Fields(conf.SortBy).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
// whatever it was, do not add Sort()
|
||||
slog.Debug("get field capabilities", "field", conf.SortBy, "error", esErrorString(err))
|
||||
|
||||
@@ -40,8 +40,7 @@ func colorzizeShard(conf *cfg.Config, state, name string) string {
|
||||
}
|
||||
|
||||
func resolvePrirep(state string) string {
|
||||
switch state {
|
||||
case "p":
|
||||
if state == "p" {
|
||||
return "primary"
|
||||
}
|
||||
|
||||
@@ -125,6 +124,7 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -98,6 +98,7 @@ func SnapshotList(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
table.Sort()
|
||||
|
||||
if err := table.Print(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -30,7 +30,6 @@ import (
|
||||
func TaskList(conf *cfg.Config) error {
|
||||
res, err := conf.DefaultCluster.ES().Cat.Tasks().
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
|
||||
}
|
||||
@@ -39,6 +38,7 @@ func TaskList(conf *cfg.Config) error {
|
||||
|
||||
table := printer.NewTable(conf, 8, len(res))
|
||||
table.Addheaders("task id", "action", "start time", "run time", "node", "type")
|
||||
|
||||
for idx, task := range res {
|
||||
var ts time.Time
|
||||
|
||||
@@ -66,7 +66,6 @@ func TaskCancel(conf *cfg.Config, taskid string) error {
|
||||
_, err := conf.DefaultCluster.ES().Tasks.Cancel().
|
||||
TaskId(taskid).
|
||||
Do(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to cancel task: %w", esErrorString(err))
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import (
|
||||
)
|
||||
|
||||
func any2string(in any) string {
|
||||
//nolint:gocritic
|
||||
switch val := in.(type) {
|
||||
case string:
|
||||
return val
|
||||
@@ -45,10 +46,10 @@ func any2string(in any) string {
|
||||
return val.Format("2006-01-02 15:04:05")
|
||||
case []byte:
|
||||
return string(val)
|
||||
case types.DateTime, types.Percentage:
|
||||
return val.(string)
|
||||
case nil:
|
||||
return "null"
|
||||
case types.Percentage, types.DateTime:
|
||||
return val.(string)
|
||||
}
|
||||
|
||||
return ""
|
||||
@@ -78,6 +79,7 @@ func (data *Table) preprocessRows() {
|
||||
// determine max width per column
|
||||
for _, entries := range data.rows {
|
||||
currentWidth := 0
|
||||
|
||||
for idx, entry := range entries {
|
||||
length := visibleLen(entry)
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ func PrintDocs(conf *cfg.Config, hits []types.Hit) {
|
||||
for _, hit := range hits {
|
||||
PrintDoc(conf, hit)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func PrintDoc(conf *cfg.Config, hit types.Hit) {
|
||||
|
||||
@@ -34,12 +34,14 @@ var (
|
||||
titleStyle = func() lipgloss.Style {
|
||||
b := lipgloss.RoundedBorder()
|
||||
b.Right = "├"
|
||||
|
||||
return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
|
||||
}()
|
||||
|
||||
infoStyle = func() lipgloss.Style {
|
||||
b := lipgloss.RoundedBorder()
|
||||
b.Left = "┤"
|
||||
|
||||
return titleStyle.BorderStyle(b)
|
||||
}()
|
||||
)
|
||||
@@ -56,10 +58,9 @@ func (m model) Init() tea.Cmd {
|
||||
}
|
||||
|
||||
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
var (
|
||||
cmd tea.Cmd
|
||||
cmds []tea.Cmd
|
||||
)
|
||||
var cmd tea.Cmd
|
||||
|
||||
cmds := make([]tea.Cmd, 1)
|
||||
|
||||
switch msg := msg.(type) {
|
||||
case tea.KeyMsg:
|
||||
@@ -90,7 +91,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
|
||||
// Handle keyboard and mouse events in the viewport
|
||||
m.viewport, cmd = m.viewport.Update(msg)
|
||||
cmds = append(cmds, cmd)
|
||||
cmds[0] = cmd
|
||||
|
||||
return m, tea.Batch(cmds...)
|
||||
}
|
||||
@@ -99,6 +100,7 @@ func (m model) View() string {
|
||||
if !m.ready {
|
||||
return "\n Initializing..."
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
|
||||
}
|
||||
|
||||
@@ -106,23 +108,25 @@ func (m model) headerView() string {
|
||||
// title := titleStyle.Render("RPN Help Overview")
|
||||
title := titleStyle.Render(m.title)
|
||||
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
|
||||
|
||||
return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
|
||||
}
|
||||
|
||||
func (m model) footerView() string {
|
||||
info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
|
||||
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
|
||||
|
||||
return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
|
||||
}
|
||||
|
||||
func Pager(title, message string) {
|
||||
p := tea.NewProgram(
|
||||
pager := tea.NewProgram(
|
||||
model{content: message, title: title},
|
||||
tea.WithAltScreen(), // use the full size of the terminal in its "alternate screen buffer"
|
||||
tea.WithMouseCellMotion(), // turn on mouse support so we can track the mouse wheel
|
||||
)
|
||||
|
||||
if _, err := p.Run(); err != nil {
|
||||
if _, err := pager.Run(); err != nil {
|
||||
fmt.Println("could not run pager:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -55,6 +55,7 @@ func NewTable(conf *cfg.Config, columns, rows int) *Table {
|
||||
func NewTableEmpty(conf *cfg.Config) *Table {
|
||||
table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
|
||||
table.alignInts = conf.AlignInts
|
||||
|
||||
return &table
|
||||
}
|
||||
|
||||
@@ -70,14 +71,14 @@ func (table *Table) WithHeaders(headers ...string) *Table {
|
||||
return table
|
||||
}
|
||||
|
||||
func (data *Table) Print() error {
|
||||
switch data.Mode {
|
||||
func (table *Table) Print() error {
|
||||
switch table.Mode {
|
||||
case "json":
|
||||
return data.PrintJSON()
|
||||
return table.PrintJSON()
|
||||
case "yaml":
|
||||
return data.PrintYAML()
|
||||
return table.PrintYAML()
|
||||
default:
|
||||
return data.PrintTSV()
|
||||
return table.PrintTSV()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,22 +86,8 @@ var (
|
||||
ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`)
|
||||
)
|
||||
|
||||
// needed for json and yaml output
|
||||
func (data *Table) toMap() []map[string]any {
|
||||
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()
|
||||
func (table *Table) PrintYAML() error {
|
||||
raw := table.toMap()
|
||||
|
||||
body, err := yaml.Marshal(raw)
|
||||
if err != nil {
|
||||
@@ -112,8 +99,8 @@ func (data *Table) PrintYAML() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (data *Table) PrintJSON() error {
|
||||
raw := data.toMap()
|
||||
func (table *Table) PrintJSON() error {
|
||||
raw := table.toMap()
|
||||
|
||||
body, err := json.MarshalIndent(raw, "", " ")
|
||||
if err != nil {
|
||||
@@ -125,34 +112,35 @@ func (data *Table) PrintJSON() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (data *Table) PrintTSV() error {
|
||||
func (table *Table) PrintTSV() error {
|
||||
// length's, convert cell types
|
||||
data.preprocessRows()
|
||||
table.preprocessRows()
|
||||
|
||||
// output headers
|
||||
for idx, header := range data.Headers {
|
||||
if idx+1 != len(data.Headers) {
|
||||
fmt.Print(header, strings.Repeat(" ", data.lenHeaders[idx]-visibleLen(header)))
|
||||
for idx, header := range table.Headers {
|
||||
if idx+1 != len(table.Headers) {
|
||||
fmt.Print(header, strings.Repeat(" ", table.lenHeaders[idx]-visibleLen(header)))
|
||||
} else {
|
||||
// no padding for last header
|
||||
fmt.Print(header)
|
||||
}
|
||||
|
||||
if idx < len(data.Headers)-1 {
|
||||
if idx < len(table.Headers)-1 {
|
||||
fmt.Print(" ")
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println()
|
||||
|
||||
for _, entries := range data.rows {
|
||||
for _, entries := range table.rows {
|
||||
currentWidth := 0
|
||||
|
||||
for idx, entry := range entries {
|
||||
length := visibleLen(entry)
|
||||
|
||||
if length+currentWidth > data.maxwidth && data.maxwidth-currentWidth > 1 {
|
||||
if length+currentWidth > table.maxwidth && table.maxwidth-currentWidth > 1 {
|
||||
// text is too wide to be put into one line, wrap it
|
||||
wrapper := wordwrap.Wrapper(data.maxwidth-currentWidth, false)
|
||||
wrapper := wordwrap.Wrapper(table.maxwidth-currentWidth, false)
|
||||
wrapped := wrapper(entry)
|
||||
|
||||
// and indent it
|
||||
@@ -165,55 +153,71 @@ func (data *Table) PrintTSV() error {
|
||||
}
|
||||
}
|
||||
|
||||
currentWidth += data.lenHeaders[idx]
|
||||
currentWidth += table.lenHeaders[idx]
|
||||
|
||||
if isInt(entry) && data.alignInts {
|
||||
switch {
|
||||
case isInt(entry) && table.alignInts:
|
||||
// align right
|
||||
fmt.Print(strings.Repeat(" ", data.lenHeaders[idx]-length), entry)
|
||||
} else if length < data.lenHeaders[idx] && idx+1 != len(entries) {
|
||||
fmt.Print(strings.Repeat(" ", table.lenHeaders[idx]-length), entry)
|
||||
case length < table.lenHeaders[idx] && idx+1 != len(entries):
|
||||
// pad right, if required
|
||||
fmt.Print(entry, strings.Repeat(" ", data.lenHeaders[idx]-length))
|
||||
} else {
|
||||
fmt.Print(entry, strings.Repeat(" ", table.lenHeaders[idx]-length))
|
||||
default:
|
||||
// no padding for last entry
|
||||
fmt.Print(entry)
|
||||
}
|
||||
|
||||
if idx < len(data.Headers)-1 {
|
||||
if idx < len(table.Headers)-1 {
|
||||
fmt.Print(" ")
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (data *Table) Sort() {
|
||||
func (table *Table) Sort() {
|
||||
// sanity checks
|
||||
if len(data.Entries) == 0 {
|
||||
if len(table.Entries) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
data.preprocessRows()
|
||||
table.preprocessRows()
|
||||
|
||||
sort.Slice(data.rows, func(i, j int) bool {
|
||||
return data.rows[i][0] < data.rows[j][0]
|
||||
sort.Slice(table.rows, func(i, j int) bool {
|
||||
return table.rows[i][0] < table.rows[j][0]
|
||||
})
|
||||
}
|
||||
|
||||
func (data *Table) Addheaders(headers ...string) {
|
||||
func (table *Table) Addheaders(headers ...string) {
|
||||
for idx, header := range headers {
|
||||
switch data.Mode {
|
||||
switch table.Mode {
|
||||
case "json", "yaml":
|
||||
data.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
||||
table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
||||
default:
|
||||
data.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
||||
table.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (data *Table) AddRow(fields ...any) {
|
||||
data.Entries = append(data.Entries, fields)
|
||||
func (table *Table) AddRow(fields ...any) {
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user