luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Move kvDetails default logic

This commit is contained in:
Joel Watson 2020-11-10 16:39:40 -06:00
parent 99698737d9
commit 8bb2a274ce
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
command/snapshot/inspect/snapshot_inspect.go
View File

@ -103,20 +103,6 @@ func (c *cmd) Run(args []string) int {
return 1 return 1
} }
// automatically set kvDetails to true if a depth or filter
// is provided. this allows the user to omit the -kvdetails
// flag if they prefer.
if c.kvDepth != 0 || c.kvFilter != "" {
c.kvDetails = true
}
// set the default depth if one wasn't specified with -kvdepth.
// this is used rather than the flag default to facilitate the
// above shortcut.
if c.kvDetails && c.kvDepth == 0 {
c.kvDepth = 2
}
// Open the file. // Open the file.
f, err := os.Open(file) f, err := os.Open(file)
if err != nil { if err != nil {
@ -284,6 +270,20 @@ func (c *cmd) enhance(file io.Reader) (SnapshotInfo, error) {
} }
func (c *cmd) kvEnhance(keyType string, val interface{}, size int, info *SnapshotInfo) { func (c *cmd) kvEnhance(keyType string, val interface{}, size int, info *SnapshotInfo) {
// automatically set kvDetails to true if a depth or filter
// is provided. this allows the user to omit the -kvdetails
// flag if they prefer.
if c.kvDepth != 0 || c.kvFilter != "" {
c.kvDetails = true
}
// set the default depth if one wasn't specified with -kvdepth.
// this is used rather than the flag default to facilitate the
// above shortcut.
if c.kvDetails && c.kvDepth == 0 {
c.kvDepth = 2
}
if c.kvDetails { if c.kvDetails {
if keyType != "KVS" { if keyType != "KVS" {
return return