refactor(config): all uses of @default over to configuration

This commit is contained in:
Lewis Wynne 2025-12-18 12:54:06 +00:00
parent 6f39d532ce
commit 03a4ad1c00
5 changed files with 15 additions and 14 deletions

View file

@ -30,8 +30,7 @@ var dumpCmd = &cobra.Command{
func dump(cmd *cobra.Command, args []string) error { func dump(cmd *cobra.Command, args []string) error {
store := &Store{} store := &Store{}
targetDB := "@default" targetDB := "@" + config.DefaultDB
displayTarget := targetDB
if len(args) == 1 { if len(args) == 1 {
rawArg := args[0] rawArg := args[0]
dbName, err := store.parseDB(rawArg, false) dbName, err := store.parseDB(rawArg, false)
@ -46,17 +45,16 @@ func dump(cmd *cobra.Command, args []string) error {
return err return err
} }
targetDB = "@" + dbName targetDB = "@" + dbName
displayTarget = targetDB
} }
mode, err := cmd.Flags().GetString("encoding") mode, err := cmd.Flags().GetString("encoding")
if err != nil { if err != nil {
return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) return fmt.Errorf("cannot dump '%s': %v", targetDB, err)
} }
switch mode { switch mode {
case "auto", "base64", "text": case "auto", "base64", "text":
default: 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") includeSecret, err := cmd.Flags().GetBool("secret")
@ -65,15 +63,15 @@ func dump(cmd *cobra.Command, args []string) error {
} }
globPatterns, err := cmd.Flags().GetStringSlice("glob") globPatterns, err := cmd.Flags().GetStringSlice("glob")
if err != nil { 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) separators, err := parseGlobSeparators(cmd)
if err != nil { 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) matchers, err := compileGlobMatchers(globPatterns, separators)
if err != nil { if err != nil {
return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) return fmt.Errorf("cannot dump '%s': %v", targetDB, err)
} }
var matched bool var matched bool
@ -112,7 +110,7 @@ func dump(cmd *cobra.Command, args []string) error {
encodeBase64(&entry, v) encodeBase64(&entry, v)
case "text": case "text":
if err := encodeText(&entry, key, v); err != nil { 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": case "auto":
if utf8.Valid(v) { if utf8.Valid(v) {
@ -124,13 +122,13 @@ func dump(cmd *cobra.Command, args []string) error {
} }
payload, err := json.Marshal(entry) payload, err := json.Marshal(entry)
if err != nil { 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)) fmt.Fprintln(cmd.OutOrStdout(), string(payload))
matched = true matched = true
return nil return nil
}); err != nil { }); err != nil {
return fmt.Errorf("cannot dump '%s': %v", displayTarget, err) return fmt.Errorf("cannot dump '%s': %v", targetDB, err)
} }
} }
return nil return nil
@ -142,7 +140,7 @@ func dump(cmd *cobra.Command, args []string) error {
} }
if len(matchers) > 0 && !matched { 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 return nil
} }

View file

@ -41,7 +41,7 @@ var listCmd = &cobra.Command{
func list(cmd *cobra.Command, args []string) error { func list(cmd *cobra.Command, args []string) error {
store := &Store{} store := &Store{}
targetDB := "@default" targetDB := "@" + config.DefaultDB
if len(args) == 1 { if len(args) == 1 {
rawArg := args[0] rawArg := args[0]
dbName, err := store.parseDB(rawArg, false) dbName, err := store.parseDB(rawArg, false)

View file

@ -24,7 +24,7 @@ var restoreCmd = &cobra.Command{
func restore(cmd *cobra.Command, args []string) error { func restore(cmd *cobra.Command, args []string) error {
store := &Store{} store := &Store{}
dbName := "default" dbName := config.DefaultDB
if len(args) == 1 { if len(args) == 1 {
parsed, err := store.parseDB(args[0], false) parsed, err := store.parseDB(args[0], false)
if err != nil { if err != nil {

1
go.mod
View file

@ -14,6 +14,7 @@ require (
) )
require ( require (
github.com/BurntSushi/toml v1.6.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect

2
go.sum
View file

@ -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 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=
github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU= 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= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=