diff --git a/cmd/dump.go b/cmd/dump.go index a75a6b9..91f4a6c 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -55,7 +55,7 @@ func dump(cmd *cobra.Command, args []string) error { return fmt.Errorf("unsupported encoding %q", mode) } - includeSecret, err := cmd.Flags().GetBool("include-secret") + includeSecret, err := cmd.Flags().GetBool("secret") if err != nil { return err } @@ -121,7 +121,7 @@ func dump(cmd *cobra.Command, args []string) error { func init() { dumpCmd.Flags().StringP("encoding", "e", "auto", "value encoding: auto, base64, or text") - dumpCmd.Flags().Bool("include-secret", false, "Include entries marked as secret") + dumpCmd.Flags().Bool("secret", false, "Include entries marked as secret") rootCmd.AddCommand(dumpCmd) } diff --git a/cmd/get.go b/cmd/get.go index 0cb1338..ad480fc 100644 --- a/cmd/get.go +++ b/cmd/get.go @@ -60,7 +60,7 @@ func get(cmd *cobra.Command, args []string) error { return err } - includeSecret, err := cmd.Flags().GetBool("include-secret") + includeSecret, err := cmd.Flags().GetBool("secret") if err != nil { return err } @@ -79,6 +79,6 @@ func get(cmd *cobra.Command, args []string) error { func init() { getCmd.Flags().BoolP("include-binary", "b", false, "include binary data in text output") - getCmd.Flags().Bool("include-secret", false, "display values marked as secret") + getCmd.Flags().Bool("secret", false, "display values marked as secret") rootCmd.AddCommand(getCmd) } diff --git a/cmd/list.go b/cmd/list.go index 084e29e..d30f1d4 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -63,38 +63,38 @@ func list(cmd *cobra.Command, args []string) error { return err } - includeSecret, err := cmd.Flags().GetBool("include-secret") + showSecrets, err := cmd.Flags().GetBool("secret") if err != nil { return err } - keysOnly, err := cmd.Flags().GetBool("only-keys") + noKeys, err := cmd.Flags().GetBool("no-keys") if err != nil { return err } - valuesOnly, err := cmd.Flags().GetBool("only-values") + noValues, err := cmd.Flags().GetBool("no-values") if err != nil { return err } - if keysOnly && valuesOnly { - return fmt.Errorf("--only-keys and --only-values are mutually exclusive") - } - showExpiry, err := cmd.Flags().GetBool("show-expiry") + showTTL, err := cmd.Flags().GetBool("ttl") if err != nil { return err } - binary, err := cmd.Flags().GetBool("include-binary") + binary, err := cmd.Flags().GetBool("binary") if err != nil { return err } - includeKey := !valuesOnly - includeValue := !keysOnly + includeKey := !noKeys + includeValue := !noValues + if !includeKey && !includeValue && !showTTL { + return fmt.Errorf("no columns selected; disable --no-keys/--no-values or pass --ttl") + } prefetchVals := includeValue - columnKinds := selectColumns(includeKey, includeValue, showExpiry) + columnKinds := selectColumns(includeKey, includeValue, showTTL) if len(columnKinds) == 0 { - return fmt.Errorf("no columns selected; enable keys or values") + return fmt.Errorf("no columns selected; enable key, value, or ttl output") } delimiterBytes := []byte(delimiter) @@ -107,7 +107,9 @@ func list(cmd *cobra.Command, args []string) error { writer := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, 2, ' ', 0) defer writer.Flush() - placeholder := []byte("