Skip to content

Commit

Permalink
Fixed GetUnusedAll() JSON concatenation (#227)
Browse files Browse the repository at this point in the history
  • Loading branch information
doronkg authored Mar 20, 2024
1 parent 4a79f02 commit cdff99c
Showing 1 changed file with 29 additions and 2 deletions.
31 changes: 29 additions & 2 deletions pkg/kor/all.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,34 @@ func GetUnusedAll(filterOpts *filters.Options, clientset kubernetes.Interface, a
fmt.Printf("err: %v\n", err)
}

unusedAll := unusedAllNamespaced + unusedAllNonNamespaced
unusedAll := make(map[string]interface{})

return unusedAll, nil
if outputFormat != "json" {
unusedAll := unusedAllNamespaced + unusedAllNonNamespaced

return unusedAll, nil
} else {
var namespacedResourceMap, nonNamespacedResourceMap map[string]interface{}

if err := json.Unmarshal([]byte(unusedAllNamespaced), &namespacedResourceMap); err != nil {
return "", err
}
if err := json.Unmarshal([]byte(unusedAllNonNamespaced), &nonNamespacedResourceMap); err != nil {
return "", err
}

for k, v := range namespacedResourceMap {
unusedAll[k] = v
}
for k, v := range nonNamespacedResourceMap {
unusedAll[k] = v
}

jsonResponse, err := json.MarshalIndent(unusedAll, "", " ")
if err != nil {
return "", err
}

return string(jsonResponse), nil
}
}

0 comments on commit cdff99c

Please sign in to comment.