Skip to content
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

Code cleanup for json and jsonpath output #243

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Code cleanup for json and jsonpath output #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c0bc05
Code cleanup for json and jsonpath output
tmiddlet2666 Oct 29, 2024
c490bc1
Bump CLI version to 1.8.0
tmiddlet2666 Oct 29, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# ======================================================================================================================

# The version of the CLI being build - this should be a valid SemVer format
VERSION ?= 1.7.3
VERSION ?= 1.8.0
MILESTONE ?=
SHELL := /bin/bash

Expand Down
59 changes: 26 additions & 33 deletions pkg/cmd/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ name is specified then all services are queried.`,
for {
var viewServicesSummary = config.ServicesSummaries{}

if strings.Contains(OutputFormat, constants.JSONPATH) || OutputFormat == constants.JSON {
if isJSONPathOrJSON() {
data, err := dataFetcher.GetViewsSummaryJSONAllServices()
if err != nil {
return err
Expand Down Expand Up @@ -621,7 +621,6 @@ func getCacheDetails(cmd *cobra.Command, args []string, displayType string) erro
cacheResult []byte
cacheDetails = config.CacheDetails{}
cachePartitionDetails = config.CachePartitionDetails{}
result string
)

if displayType == partitionDisplayType {
Expand All @@ -637,41 +636,35 @@ func getCacheDetails(cmd *cobra.Command, args []string, displayType string) erro
return fmt.Errorf(cannotFindCache, cacheName, serviceName)
}

if strings.Contains(OutputFormat, constants.JSONPATH) {
result, err = utils.GetJSONPathResults(cacheResult, OutputFormat)
if err != nil {
return err
}
cmd.Println(result)
} else if OutputFormat == constants.JSON {
cmd.Println(string(cacheResult))
if isJSONPathOrJSON() {
return processJSONOutput(cmd, cacheResult)
}

if displayType == partitionDisplayType {
err = json.Unmarshal(cacheResult, &cachePartitionDetails)
} else {
if displayType == partitionDisplayType {
err = json.Unmarshal(cacheResult, &cachePartitionDetails)
} else {
err = json.Unmarshal(cacheResult, &cacheDetails)
}
if err != nil {
return utils.GetError("unable to unmarshall cache result", err)
}
err = json.Unmarshal(cacheResult, &cacheDetails)
}
if err != nil {
return utils.GetError("unable to unmarshall cache result", err)
}

printWatchHeader(cmd)
cmd.Println(FormatCurrentCluster(connection))
printWatchHeader(cmd)
cmd.Println(FormatCurrentCluster(connection))

if displayType != partitionDisplayType {
cmd.Printf("Cache: %s\n\n", args[0])
}
if displayType != partitionDisplayType {
cmd.Printf("Cache: %s\n\n", args[0])
}

if displayType == access {
cmd.Println(FormatCacheDetailsSizeAndAccess(cacheDetails.Details))
} else if displayType == "index" {
cmd.Println(FormatCacheIndexDetails(cacheDetails.Details))
} else if displayType == storage {
cmd.Println(FormatCacheDetailsStorage(cacheDetails.Details))
} else if displayType == partitionDisplayType {
cmd.Printf("Cache: %s\n", args[0])
cmd.Println(FormatCachePartitions(cachePartitionDetails.Details, cacheSummary))
}
if displayType == access {
cmd.Println(FormatCacheDetailsSizeAndAccess(cacheDetails.Details))
} else if displayType == "index" {
cmd.Println(FormatCacheIndexDetails(cacheDetails.Details))
} else if displayType == storage {
cmd.Println(FormatCacheDetailsStorage(cacheDetails.Details))
} else if displayType == partitionDisplayType {
cmd.Printf("Cache: %s\n", args[0])
cmd.Println(FormatCachePartitions(cachePartitionDetails.Details, cacheSummary))
}

// check to see if we should exit if we are not watching
Expand Down
Loading
Loading