mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 13:04:20 +02:00
replace & with new()
This commit is contained in:
@@ -194,18 +194,18 @@ func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
|
||||
}
|
||||
|
||||
func (cluster *Cluster) getTransport() elastictransport.Option {
|
||||
transport := &http.Transport{
|
||||
transport := new(http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||
}
|
||||
})
|
||||
|
||||
if cluster.DebugHTTP {
|
||||
return elastictransport.WithTransport(
|
||||
&DebugTransport{Transport: transport},
|
||||
new(DebugTransport{Transport: transport}),
|
||||
)
|
||||
}
|
||||
|
||||
return elastictransport.WithTransport(
|
||||
&CompatibilityTransport{Transport: transport},
|
||||
new(CompatibilityTransport{Transport: transport}),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ type Config struct {
|
||||
}
|
||||
|
||||
func NewConfig() *Config {
|
||||
return &Config{Clusters: map[string]*Cluster{}}
|
||||
return new(Config{Clusters: map[string]*Cluster{}})
|
||||
}
|
||||
|
||||
func getDefaultPath() string {
|
||||
@@ -216,7 +216,7 @@ func (conf *Config) LoadConfig() error {
|
||||
return fmt.Errorf("failed to read config file: %w", err)
|
||||
}
|
||||
|
||||
newconf := &Config{}
|
||||
newconf := new(Config{})
|
||||
|
||||
err = yaml.Unmarshal(data, newconf)
|
||||
if err != nil {
|
||||
|
||||
@@ -159,7 +159,7 @@ func ApiRepl(conf *cfg.Config) error {
|
||||
}
|
||||
|
||||
func pageJsonOutput(conf *cfg.Config, raw []byte) {
|
||||
tmpconf := &cfg.Config{HaveJQ: conf.HaveJQ}
|
||||
tmpconf := new(cfg.Config{HaveJQ: conf.HaveJQ})
|
||||
|
||||
if conf.Pager != "" {
|
||||
tmpconf.HaveJQ = false
|
||||
@@ -207,16 +207,16 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
|
||||
verb = strings.ToUpper(verb)
|
||||
|
||||
// we're using port-forwards anyway
|
||||
noVerifyTransport := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||
}
|
||||
noVerifyTransport := new(http.Transport{
|
||||
TLSClientConfig: new(tls.Config{InsecureSkipVerify: true}),
|
||||
})
|
||||
|
||||
client := &http.Client{Transport: noVerifyTransport}
|
||||
client := new(http.Client{Transport: noVerifyTransport})
|
||||
|
||||
if conf.DebugHTTP {
|
||||
client = &http.Client{
|
||||
Transport: &cfg.DebugTransport{
|
||||
Transport: noVerifyTransport}}
|
||||
client = new(http.Client{
|
||||
Transport: new(cfg.DebugTransport{
|
||||
Transport: noVerifyTransport})})
|
||||
}
|
||||
|
||||
req, err := http.NewRequest(verb, conf.DefaultCluster.Uri+path, bytes.NewBuffer([]byte(data)))
|
||||
@@ -528,7 +528,7 @@ func getApiExample(op *Op) string {
|
||||
// otherwise showpath+verb have to match precisely.
|
||||
func matchOperation(showpath, verb string) (*Op, error) {
|
||||
ops := []*Op{}
|
||||
op := &Op{}
|
||||
op := new(Op{})
|
||||
|
||||
var found bool
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ func getHealthReport(conf *cfg.Config) (*HealthReport, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
report := HealthReport{}
|
||||
report := new(HealthReport{})
|
||||
|
||||
// FIXME: use this once jsonv2 is no more experimental
|
||||
//
|
||||
@@ -67,5 +67,5 @@ func getHealthReport(conf *cfg.Config) (*HealthReport, error) {
|
||||
return nil, fmt.Errorf("failed to unmarshal healthreport response: %w", err)
|
||||
}
|
||||
|
||||
return &report, nil
|
||||
return report, nil
|
||||
}
|
||||
|
||||
@@ -101,9 +101,7 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
|
||||
es := conf.DefaultCluster.ES()
|
||||
|
||||
responses := make(chan apiResponse, gocount)
|
||||
wg := &sync.WaitGroup{}
|
||||
|
||||
wg.Add(gocount)
|
||||
wg := new(sync.WaitGroup{})
|
||||
|
||||
wg.Go(func() {
|
||||
getApiData(conf, es, responses, "health")
|
||||
@@ -135,7 +133,7 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
|
||||
|
||||
wg.Wait()
|
||||
|
||||
all := apiResponse{}
|
||||
all := new(apiResponse{})
|
||||
|
||||
var err error
|
||||
|
||||
@@ -162,7 +160,7 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
|
||||
}
|
||||
}
|
||||
|
||||
return &all, err
|
||||
return all, err
|
||||
}
|
||||
|
||||
func ClusterStatus(conf *cfg.Config) error {
|
||||
|
||||
@@ -29,12 +29,12 @@ func ClusterRerouteMove(conf *cfg.Config, index string) error {
|
||||
move := conf.DefaultCluster.ES().Cluster.Reroute()
|
||||
|
||||
commands := esdsl.NewCommand()
|
||||
moveCommand := &types.CommandMoveAction{
|
||||
moveCommand := new(types.CommandMoveAction{
|
||||
Shard: conf.Shards,
|
||||
FromNode: conf.FromNode,
|
||||
ToNode: conf.ToNode,
|
||||
Index: index,
|
||||
}
|
||||
})
|
||||
|
||||
commands.CommandCaster().Move = moveCommand
|
||||
|
||||
@@ -52,11 +52,11 @@ func ClusterRerouteAllocateReplica(conf *cfg.Config, index string) error {
|
||||
move := conf.DefaultCluster.ES().Cluster.Reroute()
|
||||
|
||||
commands := esdsl.NewCommand()
|
||||
allocCommand := &types.CommandAllocateReplicaAction{
|
||||
allocCommand := new(types.CommandAllocateReplicaAction{
|
||||
Shard: conf.Shards,
|
||||
Node: conf.ToNode,
|
||||
Index: index,
|
||||
}
|
||||
})
|
||||
|
||||
commands.CommandCaster().AllocateReplica = allocCommand
|
||||
|
||||
@@ -74,12 +74,12 @@ func ClusterRerouteCancel(conf *cfg.Config, index string) error {
|
||||
move := conf.DefaultCluster.ES().Cluster.Reroute()
|
||||
|
||||
commands := esdsl.NewCommand()
|
||||
cancelCommand := &types.CommandCancelAction{
|
||||
cancelCommand := new(types.CommandCancelAction{
|
||||
Shard: conf.Shards,
|
||||
Node: conf.ToNode,
|
||||
Index: index,
|
||||
AllowPrimary: &conf.AllowPrimary,
|
||||
}
|
||||
})
|
||||
|
||||
commands.CommandCaster().Cancel = cancelCommand
|
||||
|
||||
@@ -97,12 +97,12 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, index string, stale bool) e
|
||||
move := conf.DefaultCluster.ES().Cluster.Reroute()
|
||||
|
||||
commands := esdsl.NewCommand()
|
||||
allocCommand := &types.CommandAllocatePrimaryAction{
|
||||
allocCommand := new(types.CommandAllocatePrimaryAction{
|
||||
Shard: conf.Shards,
|
||||
Node: conf.ToNode,
|
||||
Index: index,
|
||||
AcceptDataLoss: conf.AcceptDataLoss,
|
||||
}
|
||||
})
|
||||
|
||||
if stale {
|
||||
commands.CommandCaster().AllocateStalePrimary = allocCommand
|
||||
|
||||
@@ -101,7 +101,7 @@ func DocDelete(conf *cfg.Config, queries []string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
req := &deletebyquery.Request{}
|
||||
req := new(deletebyquery.Request{})
|
||||
|
||||
if len(queries) == 0 && conf.All {
|
||||
req.Query = esdsl.NewMatchAllQuery().QueryCaster()
|
||||
|
||||
@@ -347,7 +347,7 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
|
||||
var actions types.IlmActionsVariant = esdsl.NewIlmActions()
|
||||
|
||||
rollover := &types.RolloverAction{}
|
||||
rollover := new(types.RolloverAction{})
|
||||
haveroll := false
|
||||
|
||||
if policy != nil {
|
||||
@@ -509,8 +509,8 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
|
||||
phases.PhasesCaster().Delete = policy.Phases.Delete
|
||||
}
|
||||
|
||||
put := &putlifecycle.Request{}
|
||||
newpolicy := &types.IlmPolicy{}
|
||||
put := new(putlifecycle.Request{})
|
||||
newpolicy := new(types.IlmPolicy{})
|
||||
newpolicy.IlmPolicyCaster().Phases = *phases.PhasesCaster()
|
||||
put.Policy = newpolicy
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ func virtualAge(phase *PhaseData) time.Duration {
|
||||
// Retrieve all index, ilm-explain and ilm-policies in parallel
|
||||
func getIlmPhaseData(conf *cfg.Config) ([]PhaseData, error) {
|
||||
responses := make(chan apiResponse, 3)
|
||||
wg := &sync.WaitGroup{}
|
||||
wg := new(sync.WaitGroup{})
|
||||
|
||||
wg.Go(func() {
|
||||
getApiData(conf, conf.DefaultCluster.ES(), responses, "indicesbytes")
|
||||
@@ -338,7 +338,7 @@ func findNextPhase(policy types.IlmPolicy, currentPhase string) *NextPhase {
|
||||
// phase list to determine which comes next
|
||||
phases, start := registerPhases(policy, currentPhase)
|
||||
|
||||
nextPhase := &NextPhase{}
|
||||
nextPhase := new(NextPhase{})
|
||||
|
||||
// finally determine which phase comes next
|
||||
// exception: hot, where we look for rollover rules
|
||||
|
||||
@@ -127,7 +127,7 @@ func getCsvRecord(conf *cfg.Config, csvfile, rolename string) (*Record, error) {
|
||||
}()
|
||||
|
||||
scanner := bufio.NewScanner(fd)
|
||||
record := Record{role: rolename}
|
||||
record := new(Record{role: rolename})
|
||||
|
||||
for scanner.Scan() {
|
||||
line := strings.TrimSpace(scanner.Text())
|
||||
@@ -150,7 +150,7 @@ func getCsvRecord(conf *cfg.Config, csvfile, rolename string) (*Record, error) {
|
||||
}
|
||||
}
|
||||
|
||||
return &record, nil
|
||||
return record, nil
|
||||
}
|
||||
|
||||
func diffRoles(conf *cfg.Config, records map[string]Record, res getrole.Response) []Register {
|
||||
|
||||
@@ -56,7 +56,7 @@ func Search(conf *cfg.Config, queries []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
req := &search.Request{Query: queryCaster}
|
||||
req := new(search.Request{Query: queryCaster})
|
||||
|
||||
searchEs.Request(req)
|
||||
|
||||
@@ -128,7 +128,7 @@ func validateSearch(conf *cfg.Config, queries []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
req := &validatequery.Request{Query: queryCaster}
|
||||
req := new(validatequery.Request{Query: queryCaster})
|
||||
|
||||
validate.Request(req)
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ func NewFilter(query string) (*filter, error) {
|
||||
return nil, errors.New("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
|
||||
}
|
||||
|
||||
flt := &filter{term: part[0], filter: part[1], criteria: criteria}
|
||||
flt := new(filter{term: part[0], filter: part[1], criteria: criteria})
|
||||
|
||||
if strings.Contains(part[0], ",") {
|
||||
// a MultiMatchQuery, match across multiple fields at once
|
||||
|
||||
@@ -66,13 +66,13 @@ func SnapshotList(conf *cfg.Config) error {
|
||||
snapshots := []*Snapshot{} // original snapshot names
|
||||
|
||||
for _, snapshot := range sres {
|
||||
snap := &Snapshot{
|
||||
snap := new(Snapshot{
|
||||
Name: *snapshot.Id,
|
||||
Status: *snapshot.Status,
|
||||
Start: fmt.Sprintf("%s", snapshot.StartTime),
|
||||
Forindex: indexFromSnapshot(*snapshot.Id),
|
||||
Orphaned: "no",
|
||||
}
|
||||
})
|
||||
|
||||
_, exists := indicies[snap.Forindex]
|
||||
if !exists {
|
||||
|
||||
@@ -29,13 +29,13 @@ import (
|
||||
const LevelNotice = slog.Level(2)
|
||||
|
||||
func Init(conf *cfg.Config) {
|
||||
logLevel := &slog.LevelVar{}
|
||||
logLevel := new(slog.LevelVar{})
|
||||
|
||||
opts := &yadu.Options{
|
||||
opts := new(yadu.Options{
|
||||
Level: logLevel,
|
||||
AddSource: true,
|
||||
NoColor: !isatty.IsTerminal(os.Stdout.Fd()),
|
||||
}
|
||||
})
|
||||
|
||||
buildInfo, _ := debug.ReadBuildInfo()
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ func (b *ByteSize) String() string {
|
||||
}
|
||||
|
||||
func Bytes(size int64) *ByteSize {
|
||||
return &ByteSize{size: uint64(size)}
|
||||
return new(ByteSize{size: uint64(size)})
|
||||
}
|
||||
|
||||
func ByteString(size int64) string {
|
||||
|
||||
@@ -43,7 +43,7 @@ type Table struct {
|
||||
}
|
||||
|
||||
func NewTable(conf *cfg.Config, columns, rows int) *Table {
|
||||
table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
|
||||
table := new(Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()})
|
||||
|
||||
table.Headers = make([]string, columns)
|
||||
table.RawHeaders = make([]string, columns)
|
||||
@@ -51,14 +51,14 @@ func NewTable(conf *cfg.Config, columns, rows int) *Table {
|
||||
table.lenHeaders = make([]int, columns)
|
||||
table.alignInts = conf.AlignInts
|
||||
|
||||
return &table
|
||||
return table
|
||||
}
|
||||
|
||||
func NewTableEmpty(conf *cfg.Config) *Table {
|
||||
table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
|
||||
table := new(Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()})
|
||||
table.alignInts = conf.AlignInts
|
||||
|
||||
return &table
|
||||
return table
|
||||
}
|
||||
|
||||
func (table *Table) WithHeaders(headers ...string) *Table {
|
||||
|
||||
Reference in New Issue
Block a user