support json response as cli output (#37)

* support json response as cli output * support json output for Pdbs * remove log in 'GetUnusedPdbsJson' function
yonahd · Aug 31, 2023 · 1e0a0a2 · 1e0a0a2
1 parent 0cf9198
commit 1e0a0a2
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 18 deletions.
diff --git a/cmd/kor/all.go b/cmd/kor/all.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -11,7 +13,11 @@ var allCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedAllJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedAllJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedAll(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/configmaps.go b/cmd/kor/configmaps.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,12 @@ var configmapCmd = &cobra.Command{
 	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedConfigmapsJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedConfigmapsJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
+
 		} else {
 			kor.GetUnusedConfigmaps(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/deployments.go b/cmd/kor/deployments.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,11 @@ var deployCmd = &cobra.Command{
 	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedDeploymentsJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedDeploymentsJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedDeployments(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/hpas.go b/cmd/kor/hpas.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -11,7 +13,11 @@ var hpaCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedHpasJson(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedHpasJson(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedHpas(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/ingresses.go b/cmd/kor/ingresses.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,11 @@ var ingressCmd = &cobra.Command{
 	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedIngressesJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedIngressesJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedIngresses(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/pdbs.go b/cmd/kor/pdbs.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -11,7 +13,11 @@ var pdbCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedPdbsJson(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedPdbsJson(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedPdbs(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/pvc.go b/cmd/kor/pvc.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -11,7 +13,11 @@ var pvcCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedPvcsJson(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedPvcsJson(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedPvcs(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/roles.go b/cmd/kor/roles.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -11,7 +13,11 @@ var roleCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedRolesJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedRolesJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedRoles(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/secrets.go b/cmd/kor/secrets.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,11 @@ var secretCmd = &cobra.Command{
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedSecretsJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedSecretsJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedSecrets(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/serviceaccounts.go b/cmd/kor/serviceaccounts.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,11 @@ var serviceAccountCmd = &cobra.Command{
 	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedServiceAccountsJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedServiceAccountsJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedServiceAccounts(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/services.go b/cmd/kor/services.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,11 @@ var serviceCmd = &cobra.Command{
 	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedServicesJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedServicesJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedServices(namespace, kubeconfig)
 		}

diff --git a/cmd/kor/statefulsets.go b/cmd/kor/statefulsets.go
@@ -1,6 +1,8 @@
 package kor
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/yonahd/kor/pkg/kor"
 )
@@ -12,7 +14,11 @@ var stsCmd = &cobra.Command{
 	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if outputFormat == "json" {
-			kor.GetUnusedStatefulsetsJSON(namespace, kubeconfig)
+			if jsonResponse, err := kor.GetUnusedStatefulsetsJSON(namespace, kubeconfig); err != nil {
+				fmt.Println(err)
+			} else {
+				fmt.Println(jsonResponse)
+			}
 		} else {
 			kor.GetUnusedStatefulsets(namespace, kubeconfig)
 		}

diff --git a/pkg/kor/hpas.go b/pkg/kor/hpas.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -124,6 +123,5 @@ func GetUnusedHpasJson(namespace string, kubeconfig string) (string, error) {
 		return "", err
 	}
 
-	log.Println(string(jsonResponse))
 	return string(jsonResponse), nil
 }
diff --git a/pkg/kor/pdbs.go b/pkg/kor/pdbs.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -89,6 +88,5 @@ func GetUnusedPdbsJson(namespace string, kubeconfig string) (string, error) {
 		return "", err
 	}
 
-	log.Println(string(jsonResponse))
 	return string(jsonResponse), nil
 }
diff --git a/pkg/kor/pvc.go b/pkg/kor/pvc.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -98,6 +97,5 @@ func GetUnusedPvcsJson(namespace string, kubeconfig string) (string, error) {
 		return "", err
 	}
 
-	log.Println(string(jsonResponse))
 	return string(jsonResponse), nil
 }