Add CCR stuff, fix search, add docs support, support index maps, refactor (#13)

cmd/ccr.go

@@ -0,0 +1,103 @@
+/*
+Copyright © 2026 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	"context"
+	"errors"
+
+	"codeberg.org/scip/esctl/pkg/cfg"
+	"codeberg.org/scip/esctl/pkg/es"
+
+	"github.com/urfave/cli/v3"
+)
+
+func Ccr(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:    "ccr",
+		Aliases: []string{"replication", "rep"},
+		Usage:   "manage cross cluster replication",
+
+		Commands: []*cli.Command{
+			CcrStatus(conf),
+			CcrShardPause(conf),
+			CcrShardResume(conf),
+			CcrFollower(conf),
+		},
+	}
+}
+
+func CcrStatus(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:    "status",
+		Aliases: []string{"st"},
+		Usage:   "cross cluster replication status (yaml config with 2 clusters required)",
+
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "exclude",
+				Usage:       "regexp of indicies to exclude",
+				Destination: &conf.Exclude,
+				Aliases:     []string{"e"},
+			},
+		},
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			leader := cmd.Args().Get(0)
+			follower := cmd.Args().Get(1)
+
+			if leader == "" || follower == "" {
+				return errors.New("no leader and follower aliases specified")
+			}
+
+			_, hasLeader := conf.Clusters[leader]
+			_, hasFollower := conf.Clusters[follower]
+
+			if !hasLeader || !hasFollower {
+				return errors.New("either leader or follower alias not configured")
+			}
+
+			if err := es.CcrStatus(conf, leader, follower); err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+}
+
+func CcrShardPause(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "pause",
+		Usage: "pause shard allocation",
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			return es.CcrShardPause(conf)
+		},
+	}
+}
+
+func CcrShardResume(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "resume",
+		Usage: "resume shard allocation",
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			return es.CcrShardResume(conf)
+		},
+	}
+}

cmd/ccr_follower.go

@@ -0,0 +1,108 @@
+/*
+Copyright © 2026 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	"context"
+	"errors"
+
+	"codeberg.org/scip/esctl/pkg/cfg"
+	"codeberg.org/scip/esctl/pkg/es"
+
+	"github.com/urfave/cli/v3"
+)
+
+func CcrFollower(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:    "follower",
+		Aliases: []string{"f"},
+		Usage:   "manage ccr follower indices",
+
+		Commands: []*cli.Command{
+			CcrFollowerShow(conf),
+			CcrFollowerAdd(conf),
+			CcrFollowerDelete(conf),
+		},
+	}
+}
+
+func CcrFollowerAdd(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:      "add",
+		Aliases:   []string{"+"},
+		Usage:     "add ccr follower index",
+		UsageText: "add [options] <index>",
+
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:        "wait",
+				Usage:       "wait for active shards",
+				Destination: &conf.Wait,
+				Aliases:     []string{"w"},
+			},
+		},
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			args := cmd.Args()
+
+			if args.Len() != 1 {
+				return errors.New("missing arguments: <index>")
+			}
+
+			return es.CcrFollowerAdd(conf, cmd.Args().Get(0))
+		},
+	}
+}
+
+func CcrFollowerDelete(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:      "delete",
+		Aliases:   []string{"-"},
+		Usage:     "delete ccr follower index",
+		UsageText: "delete <index>",
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			args := cmd.Args()
+
+			if args.Len() != 1 {
+				return errors.New("missing arguments: <index>")
+			}
+
+			// just an alias to index delete
+			return es.IndexDelete(conf, cmd.Args().Get(0))
+		},
+	}
+}
+
+func CcrFollowerShow(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:      "show",
+		Aliases:   []string{"sh"},
+		Usage:     "show ccr follower index details",
+		UsageText: "show <index>",
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			args := cmd.Args()
+
+			if args.Len() != 1 {
+				return errors.New("missing arguments: <index>")
+			}
+
+			return es.CcrFollowerShow(conf, cmd.Args().Get(0))
+		},
+	}
+}

cmd/cluster.go

@@ -18,7 +18,6 @@ package cmd
 
 import (
 	"context"
-	"errors"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/es"
@@ -26,10 +25,6 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
-const (
-	SETTINGS = `https://www.elastic.co/docs/reference/elasticsearch/configuration-reference`
-)
-
 func Cluster(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:    "cluster",
@@ -37,7 +32,6 @@ func Cluster(conf *cfg.Config) *cli.Command {
 		Usage:   "manage cluster[s]",
 
 		Commands: []*cli.Command{
-			ClusterCompare(conf),
 			ClusterStatus(conf),
 			ClusterList(conf),
 			ClusterSettings(conf),
@@ -52,11 +46,7 @@ func ClusterList(conf *cfg.Config) *cli.Command {
 		Aliases: []string{"ls"},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.ClusterList(conf); err != nil {
-				return err
-			}
-
-			return nil
+			return es.ClusterList(conf)
 		},
 	}
 }
@@ -77,138 +67,7 @@ func ClusterStatus(conf *cfg.Config) *cli.Command {
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.ClusterStatus(conf); err != nil {
-				return err
-			}
-
-			return nil
-		},
-	}
-}
-
-func ClusterCompare(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:    "compare",
-		Aliases: []string{"c"},
-		Usage:   "compare cluster[s] (yaml config with 2 clusters required)",
-
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:        "exclude",
-				Usage:       "regexp of indicies to exclude",
-				Destination: &conf.Exclude,
-				Aliases:     []string{"e"},
-			},
-		},
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			leader := cmd.Args().Get(0)
-			follower := cmd.Args().Get(1)
-
-			if leader == "" || follower == "" {
-				return errors.New("no leader and follower aliases specified")
-			}
-
-			_, hasLeader := conf.Clusters[leader]
-			_, hasFollower := conf.Clusters[follower]
-
-			if !hasLeader || !hasFollower {
-				return errors.New("either leader or follower alias not configured")
-			}
-
-			if err := es.ClusterCompare(conf, leader, follower); err != nil {
-				return err
-			}
-
-			return nil
-		},
-	}
-}
-
-func ClusterSettings(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:    "settings",
-		Usage:   "cluster settings management",
-		Aliases: []string{"config"},
-
-		Commands: []*cli.Command{
-			ClusterSettingsList(conf),
-			ClusterSettingsSet(conf),
-		},
-	}
-}
-
-func ClusterSettingsList(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:    "list",
-		Usage:   "show cluster settings",
-		Aliases: []string{"ls", "get"},
-
-		Flags: []cli.Flag{
-			&cli.BoolFlag{
-				Name:        "persistent",
-				Usage:       "only show persistent setting[s] (default)",
-				Destination: &conf.Persistent,
-				Aliases:     []string{"p"},
-			},
-			&cli.BoolFlag{
-				Name:        "transient",
-				Usage:       "only show transient setting[s]",
-				Destination: &conf.Transient,
-				Aliases:     []string{"t"},
-			},
-			&cli.BoolFlag{
-				Name:        "default",
-				Usage:       "only show default setting[s]",
-				Destination: &conf.Default,
-				Aliases:     []string{"D"},
-			},
-		},
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.ClusterSettingsList(conf); err != nil {
-				return err
-			}
-
-			return nil
-		},
-	}
-}
-
-func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:      "set",
-		Usage:     "set|update cluster settings",
-		Aliases:   []string{"set", "update"},
-		UsageText: "set [options] setting:value [setting:value ...]\n\nReference: " + SETTINGS,
-
-		Flags: []cli.Flag{
-			&cli.BoolFlag{
-				Name:        "persistent",
-				Usage:       "add persistent setting[s] (default)",
-				Destination: &conf.Persistent,
-				Aliases:     []string{"p"},
-			},
-			&cli.BoolFlag{
-				Name:        "transient",
-				Usage:       "add transient setting[s]",
-				Destination: &conf.Transient,
-				Aliases:     []string{"t"},
-			},
-		},
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			args := cmd.Args()
-
-			if args.Len() == 0 {
-				return errors.New("at least one setting must be specified (format: setting:value)")
-			}
-
-			if err := es.ClusterSettingsSet(conf, cmd.Args()); err != nil {
-				return err
-			}
-
-			return nil
+			return es.ClusterStatus(conf)
 		},
 	}
 }

cmd/cluster_settings.go

@@ -0,0 +1,119 @@
+/*
+Copyright © 2026 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	"context"
+	"errors"
+
+	"codeberg.org/scip/esctl/pkg/cfg"
+	"codeberg.org/scip/esctl/pkg/es"
+
+	"github.com/urfave/cli/v3"
+)
+
+const (
+	SETTINGS = `https://www.elastic.co/docs/reference/elasticsearch/configuration-reference`
+)
+
+func ClusterSettings(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:    "settings",
+		Usage:   "cluster settings management",
+		Aliases: []string{"config"},
+
+		Commands: []*cli.Command{
+			ClusterSettingsList(conf),
+			ClusterSettingsSet(conf),
+		},
+	}
+}
+
+func ClusterSettingsList(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:    "list",
+		Usage:   "show cluster settings",
+		Aliases: []string{"ls", "get"},
+
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:        "persistent",
+				Usage:       "only show persistent setting[s] (default)",
+				Destination: &conf.Persistent,
+				Aliases:     []string{"p"},
+			},
+			&cli.BoolFlag{
+				Name:        "transient",
+				Usage:       "only show transient setting[s]",
+				Destination: &conf.Transient,
+				Aliases:     []string{"t"},
+			},
+			&cli.BoolFlag{
+				Name:        "default",
+				Usage:       "only show default setting[s]",
+				Destination: &conf.Default,
+				Aliases:     []string{"D"},
+			},
+		},
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			if err := es.ClusterSettingsList(conf); err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+}
+
+func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:      "set",
+		Usage:     "set|update cluster settings",
+		Aliases:   []string{"set", "update"},
+		UsageText: "set [options] setting:value [setting:value ...]\n\nReference: " + SETTINGS,
+
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:        "persistent",
+				Usage:       "add persistent setting[s] (default)",
+				Destination: &conf.Persistent,
+				Aliases:     []string{"p"},
+			},
+			&cli.BoolFlag{
+				Name:        "transient",
+				Usage:       "add transient setting[s]",
+				Destination: &conf.Transient,
+				Aliases:     []string{"t"},
+			},
+		},
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			args := cmd.Args()
+
+			if args.Len() == 0 {
+				return errors.New("at least one setting must be specified (format: setting:value)")
+			}
+
+			if err := es.ClusterSettingsSet(conf, cmd.Args()); err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+}

cmd/doc.go

@@ -0,0 +1,58 @@
+/*
+Copyright © 2026 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	"context"
+	"errors"
+
+	"codeberg.org/scip/esctl/pkg/cfg"
+	"codeberg.org/scip/esctl/pkg/es"
+
+	"github.com/urfave/cli/v3"
+)
+
+func Doc(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "doc",
+		Usage: "manage documents",
+
+		Commands: []*cli.Command{
+			DocAdd(conf),
+			//Delete(conf),
+		},
+	}
+}
+
+func DocAdd(conf *cfg.Config) *cli.Command {
+	return &cli.Command{
+		Name:      "add",
+		Aliases:   []string{"+"},
+		Usage:     "add JSON document index",
+		UsageText: "add [options] <index> '<json-doc>'",
+
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			args := cmd.Args()
+
+			if args.Len() != 2 {
+				return errors.New("missing arguments: <index> <json-doc>")
+			}
+
+			return es.DocAdd(conf, cmd.Args().Get(0), cmd.Args().Get(1))
+		},
+	}
+}

cmd/index.go

@@ -69,11 +69,7 @@ func IndexList(conf *cfg.Config) *cli.Command {
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.IndexList(conf); err != nil {
-				return err
-			}
-
-			return nil
+			return es.IndexList(conf)
 		},
 	}
 }
@@ -85,11 +81,8 @@ func IndexShow(conf *cfg.Config) *cli.Command {
 		Usage:   "show details about an index",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.IndexShow(conf, cmd.Args().Get(0)); err != nil {
-				return err
-			}
+			return es.IndexShow(conf, cmd.Args().Get(0))
 
-			return nil
 		},
 
 		// FIXME: doesn't work at all
@@ -140,11 +133,14 @@ func IndexCreate(conf *cfg.Config) *cli.Command {
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.IndexCreate(conf, cmd.Args().Get(0)); err != nil {
-				return err
+			args := cmd.Args()
+			if args.Len() == 0 {
+				return fmt.Errorf("no index specified")
 			}
 
-			return nil
+			mappings := args.Slice()[1:]
+
+			return es.IndexCreate(conf, args.Get(0), mappings)
 		},
 	}
 }
@@ -156,11 +152,7 @@ func IndexDelete(conf *cfg.Config) *cli.Command {
 		Usage:   "delete an index",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.IndexDelete(conf, cmd.Args().Get(0)); err != nil {
-				return err
-			}
-
-			return nil
+			return es.IndexDelete(conf, cmd.Args().Get(0))
 		},
 	}
 }

cmd/node.go

@@ -45,11 +45,7 @@ func NodeList(conf *cfg.Config) *cli.Command {
 		Usage:   "list nodes",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.NodeList(conf); err != nil {
-				return err
-			}
-
-			return nil
+			return es.NodeList(conf)
 		},
 	}
 }
@@ -62,10 +58,7 @@ func NodeShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show [options] <node>",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			// if err := es.NodeShow(conf, cmd.Args().Get(0)); err != nil {
-			// 	return err
-			// }
-
+			// return es.NodeShow(conf, cmd.Args().Get(0))
 			return nil
 		},
 	}

cmd/root.go

@@ -76,7 +76,9 @@ func Main() int {
 			Index(conf),
 			Snapshot(conf),
 			Cluster(conf),
+			Ccr(conf),
 			Node(conf),
+			Doc(conf),
 		},
 
 		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {

cmd/search.go

@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"context"
+	"errors"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/es"
@@ -30,7 +31,7 @@ func Search(conf *cfg.Config) *cli.Command {
 		Name:      "search",
 		Aliases:   []string{"/"},
 		Usage:     "search within an index",
-		UsageText: "search [options] <query>",
+		UsageText: "search [options] <field=pattern> ...",
 
 		Flags: []cli.Flag{
 			&cli.StringFlag{
@@ -63,11 +64,12 @@ func Search(conf *cfg.Config) *cli.Command {
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.Search(conf, cmd.Args().Get(0)); err != nil {
-				return err
+			args := cmd.Args()
+			if args.Len() == 0 {
+				return errors.New("at least one query must be specified (format: field=pattern)")
 			}
 
-			return nil
+			return es.Search(conf, args.Slice())
 		},
 	}
 }

cmd/snapshot.go

@@ -54,11 +54,7 @@ func SnapshotList(conf *cfg.Config) *cli.Command {
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.SnapshotList(conf); err != nil {
-				return err
-			}
-
-			return nil
+			return es.SnapshotList(conf)
 		},
 	}
 }
@@ -71,11 +67,7 @@ func SnapshotShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show [options] <snapshot>",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			if err := es.SnapshotShow(conf, cmd.Args().Get(0)); err != nil {
-				return err
-			}
-
-			return nil
+			return es.SnapshotShow(conf, cmd.Args().Get(0))
 		},
 	}
 }