diff --git a/cmd/dump.go b/cmd/dump.go index e1048bb..3277640 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -30,8 +30,7 @@ var dumpCmd = &cobra.Command{ func dump(cmd *cobra.Command, args []string) error { store := &Store{} - targetDB := "@default" - displayTarget := targetDB + targetDB := "@" + config.DefaultDB if len(args) == 1 { rawArg := args[0] dbName, err := store.parseDB(rawArg, false) @@ -46,17 +45,16 @@ func dump(cmd *cobra.Command, args []string) error { return err } targetDB = "@" + dbName - displayTarget = targetDB } mode, err := cmd.Flags().GetString("encoding") if err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } switch mode { case "auto", "base64", "text": default: - return fmt.Errorf("cannot dump '%s': unsupported encoding '%s'", displayTarget, mode) + return fmt.Errorf("cannot dump '%s': unsupported encoding '%s'", targetDB, mode) } includeSecret, err := cmd.Flags().GetBool("secret") @@ -65,15 +63,15 @@ func dump(cmd *cobra.Command, args []string) error { } globPatterns, err := cmd.Flags().GetStringSlice("glob") if err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } separators, err := parseGlobSeparators(cmd) if err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } matchers, err := compileGlobMatchers(globPatterns, separators) if err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } var matched bool @@ -112,7 +110,7 @@ func dump(cmd *cobra.Command, args []string) error { encodeBase64(&entry, v) case "text": if err := encodeText(&entry, key, v); err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } case "auto": if utf8.Valid(v) { @@ -124,13 +122,13 @@ func dump(cmd *cobra.Command, args []string) error { } payload, err := json.Marshal(entry) if err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } fmt.Fprintln(cmd.OutOrStdout(), string(payload)) matched = true return nil }); err != nil { - return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) + return fmt.Errorf("cannot dump '%s': %v", targetDB, err) } } return nil @@ -142,7 +140,7 @@ func dump(cmd *cobra.Command, args []string) error { } if len(matchers) > 0 && !matched { - return fmt.Errorf("cannot dump '%s': No matches for pattern %s", displayTarget, formatGlobPatterns(globPatterns)) + return fmt.Errorf("cannot dump '%s': No matches for pattern %s", targetDB, formatGlobPatterns(globPatterns)) } return nil } diff --git a/cmd/list.go b/cmd/list.go index 04c4af5..649fccc 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -41,7 +41,7 @@ var listCmd = &cobra.Command{ func list(cmd *cobra.Command, args []string) error { store := &Store{} - targetDB := "@default" + targetDB := "@" + config.DefaultDB if len(args) == 1 { rawArg := args[0] dbName, err := store.parseDB(rawArg, false) diff --git a/cmd/restore.go b/cmd/restore.go index 58dfe8e..4df8b3a 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -24,7 +24,7 @@ var restoreCmd = &cobra.Command{ func restore(cmd *cobra.Command, args []string) error { store := &Store{} - dbName := "default" + dbName := config.DefaultDB if len(args) == 1 { parsed, err := store.parseDB(args[0], false) if err != nil { diff --git a/go.mod b/go.mod index ec708da..68d61c1 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( ) require ( + github.com/BurntSushi/toml v1.6.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect diff --git a/go.sum b/go.sum index 71da71c..8b34406 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= +github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM= github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=