From 6cda98e3cf7e0963567051db74c1981527f5e335 Mon Sep 17 00:00:00 2001
From: doronkg <doronkg@gmail.com>
Date: Tue, 19 Mar 2024 20:39:49 +0200
Subject: [PATCH] Fixed GetUnusedAll() JSON concatenation

---
 pkg/kor/all.go | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/pkg/kor/all.go b/pkg/kor/all.go
index 4fe87209..e32e19b8 100644
--- a/pkg/kor/all.go
+++ b/pkg/kor/all.go
@@ -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
+	}
 }