feat: add secrets config helper

Signed-off-by: gfanton <[email protected]>
gnolang · Jun 20, 2024 · ac17ef4 · ac17ef4
1 parent ef5bb4b
commit ac17ef4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/gno.land/cmd/gnoland/config_get.go b/gno.land/cmd/gnoland/config_get.go
@@ -44,7 +44,7 @@ func newConfigGetCmd(io commands.IO) *commands.Command {
 		TagNameSelector: "json",
 		TreeDisplay:     true,
 	}
-	subs := generateSubCommandHelper(helperGen, func(_ context.Context, args []string) error {
+	subs := generateSubCommandHelper(helperGen, config.Config{}, func(_ context.Context, args []string) error {
 		return execConfigGet(cfg, io, args)
 	})
 

diff --git a/gno.land/cmd/gnoland/config_help.go b/gno.land/cmd/gnoland/config_help.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/gnolang/gno/tm2/pkg/bft/config"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 )
 
@@ -20,8 +19,8 @@ type metadataHelperGenerator struct {
 	TreeDisplay bool
 }
 
-func generateSubCommandHelper(gen metadataHelperGenerator, exec commands.ExecMethod) []*commands.Command {
-	rv := reflect.ValueOf(config.Config{})
+func generateSubCommandHelper(gen metadataHelperGenerator, s any, exec commands.ExecMethod) []*commands.Command {
+	rv := reflect.ValueOf(s)
 	metas := gen.generateFields(rv, "", 0)
 
 	cmds := make([]*commands.Command, len(metas))
@@ -67,7 +66,7 @@ func (g *metadataHelperGenerator) generateFields(rv reflect.Value, parent string
 		name := field.Name
 		// Get JSON tag name
 		if g.TagNameSelector != "" {
-			name = field.Tag.Get(g.TagNameSelector)
+			name, _, _ = strings.Cut(field.Tag.Get(g.TagNameSelector), ",")
 			if name == "" || name == "-" {
 				continue
 			}

diff --git a/gno.land/cmd/gnoland/config_set.go b/gno.land/cmd/gnoland/config_set.go
@@ -42,7 +42,7 @@ func newConfigSetCmd(io commands.IO) *commands.Command {
 		TagNameSelector: "json",
 		TreeDisplay:     true,
 	}
-	cmd.AddSubCommands(generateSubCommandHelper(helperGen, func(_ context.Context, args []string) error {
+	cmd.AddSubCommands(generateSubCommandHelper(helperGen, config.Config{}, func(_ context.Context, args []string) error {
 		return execConfigEdit(cfg, io, args)
 	})...)
 

diff --git a/gno.land/cmd/gnoland/secrets_get.go b/gno.land/cmd/gnoland/secrets_get.go
@@ -41,6 +41,18 @@ func newSecretsGetCmd(io commands.IO) *commands.Command {
 		},
 	)
 
+	// Add subcommand helpers
+	helperGen := metadataHelperGenerator{
+		MetaUpdate: func(meta *commands.Metadata) {
+			meta.ShortUsage = "secrets get " + meta.Name
+		},
+		TagNameSelector: "json",
+		TreeDisplay:     false,
+	}
+	cmd.AddSubCommands(generateSubCommandHelper(helperGen, secrets{}, func(_ context.Context, args []string) error {
+		return execSecretsGet(cfg, args, io)
+	})...)
+
 	return cmd
 }