scip/esctl
1
0
Fork 0
mirror of https://codeberg.org/scip/esctl.git synced 2026-08-24 12:54:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

further table streamlining: work with new table api everywhere

Browse Source
This commit is contained in:
Thomas von Dein
2026-08-09 21:48:03 +02:00
parent b49153bd38
commit 2841a94fe5
27 changed files with 271 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/es/api.go
View File

@@ -328,8 +328,8 @@ func ApiList(conf *cfg.Config, pattern string) error {
filter := regexp.MustCompile(pattern)
table := printer.NewTable(conf).WithSize(4, 0)
table.Addheaders("path", "http verb", "tag", "description")
table := printer.NewTable(conf).WithSize(4, 0).
WithHeaders("path", "http verb", "tag", "description")
for path, item := range assets.OpenAPI.Spec().Paths.Paths {
if pattern != "" {

4
pkg/es/ccr.go
View File

@@ -111,8 +111,8 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
mode = "leader"
}
table := printer.NewTable(conf).WithSize(2, 5)
table.Addheaders("ccr remote property", "value")
table := printer.NewTable(conf).WithSize(2, 5).
WithHeaders("ccr remote property", "value")
table.Entries = [][]any{
{"Remote Cluster", remote},

4
pkg/es/ccr_follower.go
View File

@@ -164,8 +164,8 @@ func CcrFollowerShow(conf *cfg.Config, index string) error {
follower := res.Indices[0].Shards[0]
table := printer.NewTable(conf).WithSize(2, 9)
table.Addheaders("ccr follower property", "value")
table := printer.NewTable(conf).WithSize(2, 9).
WithHeaders("ccr follower property", "value")
table.Entries = [][]any{
{"name", index},

8
pkg/es/cluster.go
View File

@@ -58,8 +58,8 @@ func ClusterList(conf *cfg.Config) error {
wg.Wait()
table := printer.NewTable(conf).WithSize(5, len(conf.Clusters))
table.Addheaders("cluster", "uri", "reachable", "current", "error")
table := printer.NewTable(conf).WithSize(5, len(conf.Clusters)).
WithHeaders("cluster", "uri", "reachable", "current", "error")
idx := 0
@@ -212,8 +212,8 @@ func ClusterStatus(conf *cfg.Config) error {
}
}
table := printer.NewTable(conf).WithSize(2, 7)
table.Addheaders(conf.DefaultCluster.Name, "status")
table := printer.NewTable(conf).WithSize(2, 7).
WithHeaders(conf.DefaultCluster.Name, "status")
table.Entries = [][]any{
{"Cluster Name", res.health.ClusterName},

4
pkg/es/cluster_settings.go
View File

@@ -38,8 +38,8 @@ func ClusterSettingsList(conf *cfg.Config) error {
return fmt.Errorf("failed to get cluster settings: %w", esErrorString(err))
}
table := printer.NewTable(conf).WithSize(2, 0)
table.Addheaders("setting", "value")
table := printer.NewTable(conf).WithSize(2, 0).
WithHeaders("setting", "value")
entries := [][]any{}

20
pkg/es/cluster_util.go
View File

@@ -71,9 +71,9 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
status[cluster] = clusterHealth
}
table := printer.NewTable(conf).WithSize(3, 6)
table := printer.NewTable(conf).WithSize(3, 6).
table.Addheaders("setting", "leader:"+leader, "follower:"+follower)
WithHeaders("setting", "leader:"+leader, "follower:"+follower)
table.Entries = [][]any{
{"Cluster Name", status[leader].ClusterName, status[follower].ClusterName},
@@ -151,8 +151,8 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
if len(failed[cluster]) > 0 {
idx := 0
table := printer.NewTable(conf).WithSize(2, len(failed[cluster]))
table.Addheaders("ilm errors on "+which, "errors")
table := printer.NewTable(conf).WithSize(2, len(failed[cluster])).
WithHeaders("ilm errors on "+which, "errors")
for name, count := range failed[cluster] {
table.Entries[idx] = []any{name, count}
@@ -225,8 +225,8 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
}
idx := 0
table := printer.NewTable(conf).WithSize(3, len(indexOnlyOnLeader))
table.Addheaders("index only on leader", "size", "docscount")
table := printer.NewTable(conf).WithSize(3, len(indexOnlyOnLeader)).
WithHeaders("index only on leader", "size", "docscount")
for name, index := range indexOnlyOnLeader {
name := printer.Colorize(conf, "red", name)
@@ -275,8 +275,8 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
}
idx := 0
table := printer.NewTable(conf).WithSize(3, len(orphaned))
table.Addheaders("orphaned index on follower", "size", "docscount")
table := printer.NewTable(conf).WithSize(3, len(orphaned)).
WithHeaders("orphaned index on follower", "size", "docscount")
for name, index := range orphaned {
name := printer.Colorize(conf, "red", name)
@@ -311,8 +311,8 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
}
idx := 0
table := printer.NewTable(conf).WithSize(3, len(red))
table.Addheaders("red index on follower", "size", "docscount")
table := printer.NewTable(conf).WithSize(3, len(red)).
WithHeaders("red index on follower", "size", "docscount")
for name, index := range red {
name := printer.Colorize(conf, "red", name)

16
pkg/es/datastream.go
View File

@@ -62,8 +62,8 @@ func DatastreamList(conf *cfg.Config) error {
}
}
table := printer.NewTable(conf).WithSize(7, size)
table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
table := printer.NewTable(conf).WithSize(7, size).
WithHeaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
for idx, datastream := range list {
name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
@@ -146,8 +146,8 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
return fmt.Errorf("failed to get data stream stats: %w", esErrorString(err))
}
table := printer.NewTable(conf).WithSize(11, 2)
table.Addheaders("data stream property", "value")
table := printer.NewTable(conf).WithSize(11, 2).
WithHeaders("data stream property", "value")
datastream := res.DataStreams[0]
@@ -176,8 +176,8 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
return err
}
table = printer.NewTable(conf).WithSize(5, len(datastream.Indices))
table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
table = printer.NewTable(conf).WithSize(5, len(datastream.Indices)).
WithHeaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
for idx, index := range datastream.Indices {
policy := ""
@@ -233,8 +233,8 @@ func DatastreamRollover(conf *cfg.Config, ds string) error {
return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
}
table := printer.NewTable(conf).WithSize(2, 5)
table.Addheaders("rollover response", "value")
table := printer.NewTable(conf).WithSize(2, 5).
WithHeaders("rollover response", "value")
table.Entries = [][]any{
{"acknowledged", res.Acknowledged},
{"rolled over", res.RolledOver},

15
pkg/es/ilm.go
View File

@@ -85,8 +85,8 @@ func IlmList(conf *cfg.Config, pattern string) error {
repr.Println(res)
}
table := printer.NewTable(conf).WithSize(5, 0)
table.Addheaders("ilm policy", "hot", "warm", "frozen", "delete")
table := printer.NewTable(conf).WithSize(5, 0).
WithHeaders("ilm policy", "hot", "warm", "frozen", "delete")
for name, ilm := range res {
table.AddRow(name,
@@ -123,8 +123,8 @@ func IlmShow(conf *cfg.Config, policy string) error {
return IlmShowTree(conf, ilm.Policy)
}
table := printer.NewTable(conf).WithSize(2, 5)
table.Addheaders("ilm policy setting", "value")
table := printer.NewTable(conf).WithSize(2, 5).
WithHeaders("ilm policy setting", "value")
table.Entries = [][]any{
{"policy", policy},
@@ -142,9 +142,6 @@ func IlmShow(conf *cfg.Config, policy string) error {
func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
indent := ""
table := printer.NewTable(conf).WithSize(4, 0)
table.Addheaders("phase", "min age", "min size", "snapshot repo")
for _, phase := range IlmPhaseOrder {
if phase == "hot" {
fmt.Printf("%s%s phase:\n%s rollover after %s\n",
@@ -280,8 +277,8 @@ func IlmExplain(conf *cfg.Config, index string) error {
ilm := explain.(*types.LifecycleExplainManaged)
table := printer.NewTable(conf).WithSize(2, 0)
table.Addheaders("ilm status field", "value")
table := printer.NewTable(conf).WithSize(2, 0).
WithHeaders("ilm status field", "value")
info := ""

4
pkg/es/ilm_forecast.go
View File

@@ -105,8 +105,8 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
headers = append(headers, "ilm policy")
}
table := printer.NewTable(conf).WithSize(len(headers), 0)
table.Addheaders(headers...)
table := printer.NewTable(conf).WithSize(len(headers), 0).
WithHeaders(headers...)
for _, phase := range phaseData {
if filter != "" && !flt.MatchString(phase.index) {

12
pkg/es/index.go
View File

@@ -104,8 +104,8 @@ func IndexList(conf *cfg.Config) error {
}
}
table := printer.NewTable(conf).WithSize(3, size)
table.Addheaders("name", "size", "docscount")
table := printer.NewTable(conf).WithSize(3, size).
WithHeaders("name", "size", "docscount")
for idx, index := range list {
name := printer.Colorize(conf, *index.Health, *index.Index)
@@ -140,8 +140,8 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
idx++
}
table := printer.NewTable(conf).WithSize(2, 7)
table.Addheaders("index property", "value")
table := printer.NewTable(conf).WithSize(2, 7).
WithHeaders("index property", "value")
ts, err := strconv.ParseInt(index.Settings.Index.CreationDate.(string), 10, 64)
if err != nil {
@@ -263,8 +263,8 @@ func IndexFields(conf *cfg.Config, index string) error {
return fmt.Errorf("failed to retrieve field capabilties: %w", esErrorString(err))
}
table := printer.NewTable(conf).WithSize(5, 0)
table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
table := printer.NewTable(conf).WithSize(5, 0).
WithHeaders("field", "type", "searchable", "aggretable", "metadata")
idx := 0

8
pkg/es/index_alias.go
View File

@@ -72,8 +72,8 @@ func IndexAliasList(conf *cfg.Config) error {
}
}
table := printer.NewTable(conf).WithSize(2, len(aliaslist))
table.Addheaders("index", "alias")
table := printer.NewTable(conf).WithSize(2, len(aliaslist)).
WithHeaders("index", "alias")
idx := 0
for index, aliases := range aliaslist {
@@ -113,8 +113,8 @@ func IndexAliasRollover(conf *cfg.Config, alias string) error {
return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
}
table := printer.NewTable(conf).WithSize(2, 5)
table.Addheaders("rollover response", "value")
table := printer.NewTable(conf).WithSize(2, 5).
WithHeaders("rollover response", "value")
table.Entries = [][]any{
{"acknowledged", res.Acknowledged},
{"rolled over", res.RolledOver},

20
pkg/es/index_template.go
View File

@@ -59,8 +59,8 @@ func IndexTemplateList(conf *cfg.Config, filter string) error {
slog.Debug("res", "index templates", res)
table := printer.NewTable(conf).WithSize(5, 0)
table.Addheaders("name", "description", "index patterns", "priority")
table := printer.NewTable(conf).WithSize(5, 0).
WithHeaders("name", "description", "index patterns", "priority")
tplList := filterIndexTemplates(conf, filter, res.IndexTemplates)
@@ -120,8 +120,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
tpl := res.IndexTemplates[0]
table := printer.NewTable(conf).WithSize(2, 6)
table.Addheaders("index template property", "value")
table := printer.NewTable(conf).WithSize(2, 6).
WithHeaders("index template property", "value")
desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
if err != nil {
@@ -148,8 +148,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
return err
}
table = printer.NewTable(conf).WithSize(2, 0)
table.Addheaders("index setting property", "value")
table = printer.NewTable(conf).WithSize(2, 0).
WithHeaders("index setting property", "value")
err = getIndexTemplateSettings(conf, tplname, table)
if err != nil {
@@ -162,8 +162,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
return err
}
table = printer.NewTable(conf).WithSize(2, 0)
table.Addheaders("index field mapping", "type")
table = printer.NewTable(conf).WithSize(2, 0).
WithHeaders("index field mapping", "type")
if tpl.IndexTemplate.Template.Mappings != nil {
for name, field := range tpl.IndexTemplate.Template.Mappings.Properties {
@@ -441,8 +441,8 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
return nil
}
table := printer.NewTable(conf).WithSize(4, 0)
table.Addheaders("rollover alias", "status", "ack", "new index")
table := printer.NewTable(conf).WithSize(4, 0).
WithHeaders("rollover alias", "status", "ack", "new index")
// apply rollover to all matching aliases, if any
for alias := range aliases {

8
pkg/es/node.go
View File

@@ -104,8 +104,8 @@ func NodeShow(conf *cfg.Config, nodename string) error {
for id, info := range res.Nodes {
stat := stats.Nodes[id]
table := printer.NewTable(conf).WithSize(2, 0)
table.Addheaders(nodename+" property", "value")
table := printer.NewTable(conf).WithSize(2, 0).
WithHeaders(nodename+" property", "value")
roles := make([]string, len(info.Roles))
for idx, role := range info.Roles {
@@ -197,8 +197,8 @@ func NodeClients(conf *cfg.Config, nodename string) error {
slog.Debug("ES result", "stat", stats)
table := printer.NewTable(conf).WithSize(5, 0)
table.Addheaders("agent", "id", "when", "from host", "url")
table := printer.NewTable(conf).WithSize(5, 0).
WithHeaders("agent", "id", "when", "from host", "url")
for _, stat := range stats.Nodes {
for _, client := range stat.Http.Clients {

24
pkg/es/role.go
View File

@@ -47,8 +47,8 @@ func RoleList(conf *cfg.Config) error {
slog.Debug("ES result", "roles", res)
table := printer.NewTable(conf).WithSize(3, len(res))
table.Addheaders("role", "index roles", "cluster roles")
table := printer.NewTable(conf).WithSize(3, len(res)).
WithHeaders("role", "index roles", "cluster roles")
idx := 0
for name, role := range res {
@@ -126,8 +126,8 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
return nil
}
table := printer.NewTable(conf).WithSize(2, len(role.RemoteCluster))
table.Addheaders("remote cluster", "privilege")
table := printer.NewTable(conf).WithSize(2, len(role.RemoteCluster)).
WithHeaders("remote cluster", "privilege")
idx := 0
@@ -152,8 +152,8 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
return nil
}
table := printer.NewTable(conf).WithSize(1, len(role.Cluster))
table.Addheaders("cluster rights")
table := printer.NewTable(conf).WithSize(1, len(role.Cluster)).
WithHeaders("cluster rights")
idx := 0
for _, cluster := range role.Cluster {
@@ -171,8 +171,8 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
return nil
}
table := printer.NewTable(conf).WithSize(3, len(role.RemoteIndices))
table.Addheaders("remote index names", "index permissions", "allow restricted")
table := printer.NewTable(conf).WithSize(3, len(role.RemoteIndices)).
WithHeaders("remote index names", "index permissions", "allow restricted")
idx := 0
@@ -197,8 +197,8 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
return nil
}
table := printer.NewTable(conf).WithSize(3, len(role.Indices))
table.Addheaders("index names", "index permissions", "allow restricted")
table := printer.NewTable(conf).WithSize(3, len(role.Indices)).
WithHeaders("index names", "index permissions", "allow restricted")
idx := 0
@@ -223,8 +223,8 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
return nil
}
table := printer.NewTable(conf).WithSize(3, len(role.Applications))
table.Addheaders("application", "privileges", "resources")
table := printer.NewTable(conf).WithSize(3, len(role.Applications)).
WithHeaders("application", "privileges", "resources")
idx := 0
for _, priv := range role.Applications {

4
pkg/es/role_diff.go
View File

@@ -216,8 +216,8 @@ func RoleDiff(conf *cfg.Config, csvfile, role string) error {
rows := diffRoles(conf, records, res)
table := printer.NewTable(conf).WithSize(3, len(rows))
table.Addheaders("role", "is deployed", "is defined")
table := printer.NewTable(conf).WithSize(3, len(rows)).
WithHeaders("role", "is deployed", "is defined")
for idx, row := range rows {
deployed := printer.Colorize(conf, "green", "deployed")

5
pkg/es/searchql.go
View File

@@ -64,14 +64,13 @@ func SearchQL(conf *cfg.Config, querystring string) error {
return nil
}
table := printer.NewTable(conf).WithSize(len(qlResult.Columns), len(qlResult.Values))
headers := make([]string, len(qlResult.Columns))
for idx, col := range qlResult.Columns {
headers[idx] = col.Name
}
table.Addheaders(headers...)
table := printer.NewTable(conf).WithSize(len(qlResult.Columns), len(qlResult.Values)).
WithHeaders(headers...)
table.Entries = qlResult.Values

8
pkg/es/shard.go
View File

@@ -100,8 +100,8 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
headers = append(headers, "node", "ip")
}
table := printer.NewTable(conf).WithSize(len(headers), len(shardlist))
table.Addheaders(headers...)
table := printer.NewTable(conf).WithSize(len(headers), len(shardlist)).
WithHeaders(headers...)
for idx, shard := range shardlist {
name := colorzizeShard(conf, *shard.State, *shard.Index)
@@ -163,8 +163,8 @@ func ShardAllocation(conf *cfg.Config, index string) error {
slog.Debug("ES result", "explain", res)
table := printer.NewTable(conf).WithSize(2, 10)
table.Addheaders("shard allocation setting", "value")
table := printer.NewTable(conf).WithSize(2, 10).
WithHeaders("shard allocation setting", "value")
table.Entries = [][]any{
{"Index", index},

8
pkg/es/snapshot.go
View File

@@ -84,8 +84,8 @@ func SnapshotList(conf *cfg.Config) error {
}
}
table := printer.NewTable(conf).WithSize(5, len(snapshots))
table.Addheaders("name", "index", "start", "orphaned", "status")
table := printer.NewTable(conf).WithSize(5, len(snapshots)).
WithHeaders("name", "index", "start", "orphaned", "status")
for idx, snap := range snapshots {
table.Entries[idx] = []any{
@@ -118,8 +118,8 @@ func SnapshotShow(conf *cfg.Config, snapshot string) error {
return errors.New("no snapshot retrieved")
}
table := printer.NewTable(conf).WithSize(2, 17)
table.Addheaders("snapshot property", "value")
table := printer.NewTable(conf).WithSize(2, 17).
WithHeaders("snapshot property", "value")
snap := res.Snapshots[0]

4
pkg/es/task.go
View File

@@ -36,8 +36,8 @@ func TaskList(conf *cfg.Config) error {
slog.Debug("res", "tasks", res)
table := printer.NewTable(conf).WithSize(6, len(res))
table.Addheaders("task id", "action", "start time", "run time", "node", "type")
table := printer.NewTable(conf).WithSize(6, len(res)).
WithHeaders("task id", "action", "start time", "run time", "node", "type")
for idx, task := range res {
var ts time.Time