satisfy linter

Makefile

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

cmd/api.go

@@ -91,12 +91,6 @@ func ApiRepl(conf *cfg.Config) *cli.Command {
 				Aliases:     []string{"p"},
 				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 {

pkg/cfg/config.go

@@ -101,8 +101,7 @@ type Config struct {
 	MaxDocs, MaxShardSize, MaxShardDocs int  // roll over
 	DryRun                              bool // rollover: -n
 
-	Tag      string // api ls: -t
+	Tag string // api ls: -t
-	HumanCat bool   // api repl: -H
 
 	Ilm Ilm // ilm create
 

pkg/es/api.go

@@ -45,25 +45,22 @@ import (
 )
 
 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
@@ -146,11 +143,7 @@ func ApiRepl(conf *cfg.Config) error {
 			fmt.Printf("failed to call API: %s\n", esErrorString(err))
 		}
 
-		if conf.HumanCat && strings.HasPrefix(parts[1], "/_cat") {
+		pageJsonOutput(conf, raw)
-			fmt.Println(string(raw))
-		} else {
-			pageJsonOutput(conf, raw)
-		}
 	}
 
 	//nolint:nilerr
@@ -223,10 +216,8 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 		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
 	if err := conf.DefaultCluster.CheckAuth(); err != nil {