a few more vault cmds

Author: jahvon

cmd/internal/exec.go

@@ -134,7 +134,9 @@ func execFunc(ctx *context.Context, cmd *cobra.Command, verb executable.Verb, ar
 		envMap = make(map[string]string)
 	}
 
-	setAuthEnv(ctx, cmd, e)
+	if ctx.Config.CurrentVault == nil || *ctx.Config.CurrentVault == vault.LegacyVaultReservedName {
+		setAuthEnv(ctx, cmd, e)
+	}
 	textInputs := pendingFormFields(ctx, e)
 	if len(textInputs) > 0 {
 		form, err := views.NewForm(io.Theme(ctx.Config.Theme.String()), ctx.StdIn(), ctx.StdOut(), textInputs...)

cmd/internal/vault.go

@@ -1,13 +1,18 @@
 package internal
 
 import (
+	"fmt"
+	"strconv"
 	"strings"
 
+	"github.com/jahvon/tuikit/views"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/maps"
 
 	"github.com/jahvon/flow/cmd/internal/flags"
 	"github.com/jahvon/flow/internal/context"
+	"github.com/jahvon/flow/internal/filesystem"
+	"github.com/jahvon/flow/internal/io"
 	vaultIO "github.com/jahvon/flow/internal/io/vault"
 	"github.com/jahvon/flow/internal/vault"
 )
@@ -20,10 +25,10 @@ func RegisterVaultCmd(ctx *context.Context, rootCmd *cobra.Command) {
 		Args:    cobra.NoArgs,
 	}
 	registerCreateVaultCmd(ctx, vaultCmd)
-	// registerGetVaultCmd(ctx, vaultCmd)
+	registerGetVaultCmd(ctx, vaultCmd)
 	registerListVaultCmd(ctx, vaultCmd)
 	registerSwitchVaultCmd(ctx, vaultCmd)
-	// registerRemoveVaultCmd(ctx, vaultCmd)
+	registerRemoveVaultCmd(ctx, vaultCmd)
 	rootCmd.AddCommand(vaultCmd)
 }
 
@@ -76,6 +81,38 @@ func createVaultFunc(ctx *context.Context, cmd *cobra.Command, args []string) {
 	}
 }
 
+func registerGetVaultCmd(ctx *context.Context, vaultCmd *cobra.Command) {
+	getCmd := &cobra.Command{
+		Use:     "get NAME",
+		Aliases: []string{"view", "show"},
+		Short:   "Get the details of a vault.",
+		Args:    cobra.ExactArgs(1),
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			return maps.Keys(ctx.Config.Vaults), cobra.ShellCompDirectiveNoFileComp
+		},
+		Run: func(cmd *cobra.Command, args []string) { getVaultFunc(ctx, cmd, args) },
+	}
+	RegisterFlag(ctx, getCmd, *flags.OutputFormatFlag)
+	vaultCmd.AddCommand(getCmd)
+}
+
+func getVaultFunc(ctx *context.Context, cmd *cobra.Command, args []string) {
+	logger := ctx.Logger
+	outputFormat := flags.ValueFor[string](ctx, cmd, *flags.OutputFormatFlag, false)
+
+	vaultName := args[0]
+	if err := vault.ValidateReference(vaultName); err != nil {
+		logger.Fatalf("invalid vault name '%s': %v", vaultName, err)
+	}
+
+	if TUIEnabled(ctx, cmd) {
+		view := vaultIO.NewVaultView(ctx.TUIContainer, vaultName)
+		SetView(ctx, cmd, view)
+	} else {
+		vaultIO.PrintVault(logger, outputFormat, vaultName)
+	}
+}
+
 func registerListVaultCmd(ctx *context.Context, vaultCmd *cobra.Command) {
 	listCmd := &cobra.Command{
 		Use:     "list",
@@ -105,13 +142,89 @@ func listVaultsFunc(ctx *context.Context, cmd *cobra.Command, _ []string) {
 	}
 }
 
+func registerRemoveVaultCmd(ctx *context.Context, vaultCmd *cobra.Command) {
+	removeCmd := &cobra.Command{
+		Use:     "remove NAME",
+		Aliases: []string{"rm", "delete"},
+		Short:   "Remove an existing vault.",
+		Long: "Remove an existing vault by its name. The vault data will remain in it's original location, " +
+			"but the vault will be unlinked from the global configuration.\nNote: You cannot remove the current vault.",
+		Args: cobra.ExactArgs(1),
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			return maps.Keys(ctx.Config.Vaults), cobra.ShellCompDirectiveNoFileComp
+		},
+		Run: func(cmd *cobra.Command, args []string) { removeVaultFunc(ctx, cmd, args) },
+	}
+	vaultCmd.AddCommand(removeCmd)
+}
+
+func removeVaultFunc(ctx *context.Context, _ *cobra.Command, args []string) {
+	logger := ctx.Logger
+	vaultName := args[0]
+
+	form, err := views.NewForm(
+		io.Theme(ctx.Config.Theme.String()),
+		ctx.StdIn(),
+		ctx.StdOut(),
+		&views.FormField{
+			Key:   "confirm",
+			Type:  views.PromptTypeConfirm,
+			Title: fmt.Sprintf("Are you sure you want to remove the vault '%s'?", vaultName),
+		})
+	if err != nil {
+		logger.FatalErr(err)
+	}
+	if err := form.Run(ctx.Ctx); err != nil {
+		logger.FatalErr(err)
+	}
+	resp := form.FindByKey("confirm").Value()
+	if truthy, _ := strconv.ParseBool(resp); !truthy {
+		logger.Warnf("Aborting")
+		return
+	}
+
+	userConfig := ctx.Config
+	if userConfig.CurrentVault != nil && vaultName == *userConfig.CurrentVault {
+		logger.Fatalf("cannot remove the current vault")
+	}
+	if _, found := userConfig.Vaults[vaultName]; !found {
+		logger.Fatalf("vault %s was not found", vaultName)
+	}
+
+	delete(userConfig.Vaults, vaultName)
+	if err := filesystem.WriteConfig(userConfig); err != nil {
+		logger.FatalErr(err)
+	}
+
+	logger.Warnf("Vault '%s' deleted", vaultName)
+
+}
+
 func registerSwitchVaultCmd(ctx *context.Context, vaultCmd *cobra.Command) {
 	switchCmd := &cobra.Command{
 		Use:     "switch NAME",
 		Aliases: []string{"use", "set"},
 		Short:   "Switch the active vault.",
 		Args:    cobra.ExactArgs(1),
-		Run:     func(cmd *cobra.Command, args []string) { ctx.Logger.Fatalf("not implemented yet") },
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			return maps.Keys(ctx.Config.Vaults), cobra.ShellCompDirectiveNoFileComp
+		},
+		Run: func(cmd *cobra.Command, args []string) { switchVaultFunc(ctx, cmd, args) },
 	}
 	vaultCmd.AddCommand(switchCmd)
 }
+
+func switchVaultFunc(ctx *context.Context, _ *cobra.Command, args []string) {
+	logger := ctx.Logger
+	vaultName := args[0]
+	userConfig := ctx.Config
+	if _, found := userConfig.Vaults[vaultName]; !found {
+		logger.Fatalf("vault %s not found", vaultName)
+	}
+	userConfig.CurrentVault = &vaultName
+
+	if err := filesystem.WriteConfig(userConfig); err != nil {
+		logger.FatalErr(err)
+	}
+	logger.PlainTextSuccess("Vault set to " + vaultName)
+}

internal/vault/vault.go

@@ -235,6 +235,7 @@ func (v *Vault) saveData(d *data) error {
 	return nil
 }
 
+// TODO: rename this function. It's also used to validate vault names
 func ValidateReference(reference string) error {
 	if reference == "" {
 		return errors.New("reference cannot be empty")

internal/vault/vaultv2.go

@@ -14,7 +14,8 @@ import (
 )
 
 const (
-	DefaultVaultKeyEnv = "FLOW_VAULT_KEY"
+	DefaultVaultKeyEnv      = "FLOW_VAULT_KEY"
+	LegacyVaultReservedName = "legacy"
 
 	v2CacheDataDir = "vaults"
 )