mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 06:34:18 +02:00
satisfy full linter (#77)
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user