Compare commits

..

3 Commits

Author SHA1 Message Date
4f230b5f02 satisfy linter 2026-07-09 13:38:18 +02:00
b7ac5733f1 fix #85 2026-07-09 13:11:35 +02:00
4557fcca7b fix #84 2026-07-09 13:11:20 +02:00
4 changed files with 22 additions and 38 deletions

View File

@@ -67,10 +67,10 @@ test: clean buildlocal
testlint: test lint testlint: test lint
lint-basic: lint:
golangci-lint run --enable-only errcheck,govet,ineffassign,staticcheck,unused golangci-lint run --enable-only errcheck,govet,ineffassign,staticcheck,unused
lint: lint-full:
golangci-lint run --show-stats=false golangci-lint run --show-stats=false
testfuzzy: clean testfuzzy: clean

View File

@@ -91,12 +91,6 @@ func ApiRepl(conf *cfg.Config) *cli.Command {
Aliases: []string{"p"}, Aliases: []string{"p"},
Sources: cli.EnvVars("PAGER", "ES_JSON_PAGER"), Sources: cli.EnvVars("PAGER", "ES_JSON_PAGER"),
}, },
&cli.BoolFlag{
Name: "human-readable-cat",
Usage: "enable human readable /_cat output",
Destination: &conf.HumanCat,
Aliases: []string{"H"},
},
}, },
Action: func(ctx context.Context, cmd *cli.Command) error { Action: func(ctx context.Context, cmd *cli.Command) error {

View File

@@ -102,7 +102,6 @@ type Config struct {
DryRun bool // rollover: -n DryRun bool // rollover: -n
Tag string // api ls: -t Tag string // api ls: -t
HumanCat bool // api repl: -H
Ilm Ilm // ilm create Ilm Ilm // ilm create

View File

@@ -45,25 +45,22 @@ import (
) )
const ( const (
intro = `# Input format: verb path [data]" intro = `Input format: verb path [data]"
#
# Example: Example:
#
# post /yourindex/_ccr/pause_follow post /yourindex/_ccr/pause_follow
# put /yourindex/_settings {"number_of_replicas": 1} put /yourindex/_settings {"number_of_replicas": 1}
#
# You can also put multiline JSON after the path like: You can also put multiline JSON after the path like:
#
# put /yourindex/_settings put /yourindex/_settings
# { {
# "number_of_replicas": 1 "number_of_replicas": 1
# } }
#
# If you do NOT supply a JSON in the first line, you need to hit ENTER If you do NOT supply a JSON in the first line, you need to hit ENTER
# twice to complete. twice to complete.`
#
# Supply the flag --human-readable-cat, -H to view /_cat API calls in
# human readable form.`
) )
// holds an API operation via go-openapi/spec // holds an API operation via go-openapi/spec
@@ -146,12 +143,8 @@ func ApiRepl(conf *cfg.Config) error {
fmt.Printf("failed to call API: %s\n", esErrorString(err)) fmt.Printf("failed to call API: %s\n", esErrorString(err))
} }
if conf.HumanCat && strings.HasPrefix(parts[1], "/_cat") {
fmt.Println(string(raw))
} else {
pageJsonOutput(conf, raw) pageJsonOutput(conf, raw)
} }
}
//nolint:nilerr //nolint:nilerr
return nil return nil
@@ -223,10 +216,8 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
return nil, err return nil, err
} }
if !conf.HumanCat && strings.HasPrefix(path, "/_cat") {
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 {