Skip to content

Fix keystore CLI embedding #1761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connorwstein merged 2 commits into from
Jan 8, 2026
Merged

Fix keystore CLI embedding #1761

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc55c21
Fix CLI embedding
connorwstein Jan 8, 2026
ca1aeba
nits
connorwstein Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions keystore/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (

func NewRootCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "./keystore <command>",
Use: "keys",
Long: `
CLI for managing keystore keys. Must specify KEYSTORE_FILE_PATH or KEYSTORE_DB_URL
and KEYSTORE_PASSWORD in order to load the keystore.
Expand All @@ -48,9 +48,9 @@ KEYSTORE_PASSWORD is the password used to encrypt the key material before storag
Short: "CLI for managing keystore keys",
SilenceUsage: true,
}
cmd.PersistentFlags().String("keystore-file-path", "", "Overrides KEYSTORE_FILE_PATH environment variable")
cmd.PersistentFlags().String("keystore-db-url", "", "Overrides KEYSTORE_DB_URL environment variable")
cmd.PersistentFlags().String("keystore-password", "", "Overrides KEYSTORE_PASSWORD environment variable. Not recommended as will leave shell traces.")
cmd.PersistentFlags().String("file-path", "", "Overrides KEYSTORE_FILE_PATH environment variable")
cmd.PersistentFlags().String("db-url", "", "Overrides KEYSTORE_DB_URL environment variable")
cmd.PersistentFlags().String("password", "", "Overrides KEYSTORE_PASSWORD environment variable. Not recommended as will leave shell traces.")

cmd.AddCommand(NewListCmd(), NewGetCmd(), NewCreateCmd(), NewDeleteCmd(), NewExportCmd(), NewImportCmd(), NewSetMetadataCmd(), NewSignCmd(), NewVerifyCmd(), NewEncryptCmd(), NewDecryptCmd())
return cmd
Expand Down Expand Up @@ -336,16 +336,18 @@ func NewDecryptCmd() *cobra.Command {
}

func loadKeystore(ctx context.Context, cmd *cobra.Command) (ks.Keystore, error) {
root := cmd.Root()
filePath, err := root.Flags().GetString("keystore-file-path")
// Use parent command which has the persistent flags.
// This works whether keystore CLI is standalone or embedded as a subcommand.
parent := cmd.Parent()
filePath, err := parent.Flags().GetString("file-path")
if err != nil {
return nil, err
}
dbURL, err := root.Flags().GetString("keystore-db-url")
dbURL, err := parent.Flags().GetString("db-url")
if err != nil {
return nil, err
}
password, err := cmd.Flags().GetString("keystore-password")
password, err := parent.Flags().GetString("password")
if err != nil {
return nil, err
}
Expand Down
Loading