fix(delete): Refactor input handling & output display on resource deletion

pkg/kor/clusterroles.go

@@ -191,18 +191,18 @@ func GetUnusedClusterRoles(filterOpts *filters.Options, clientset kubernetes.Int
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to process cluster role : %v\n", err)
 	}
+	if opts.DeleteFlag {
+		if diff, err = DeleteResource2(diff, clientset, "", "ClusterRole", opts.NoInteractive); err != nil {
+			fmt.Fprintf(os.Stderr, "Failed to delete clusterRole %s : %v\n", diff, err)
+		}
+	}
 	switch opts.GroupBy {
 	case "namespace":
 		resources[""] = make(map[string][]ResourceInfo)
 		resources[""]["ClusterRole"] = diff
 	case "resource":
 		appendResources(resources, "ClusterRole", "", diff)
 	}
-	if opts.DeleteFlag {
-		if diff, err = DeleteResource2(diff, clientset, "", "ClusterRole", opts.NoInteractive); err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to delete clusterRole %s : %v\n", diff, err)
-		}
-	}
 
 	var outputBuffer bytes.Buffer
 	var jsonResponse []byte

pkg/kor/configmaps.go

@@ -166,18 +166,18 @@ func GetUnusedConfigmaps(filterOpts *filters.Options, clientset kubernetes.Inter
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "ConfigMap", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete ConfigMap %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["ConfigMap"] = diff
 		case "resource":
 			appendResources(resources, "ConfigMap", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "ConfigMap", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete ConfigMap %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/daemonsets.go

@@ -67,18 +67,18 @@ func GetUnusedDaemonSets(filterOpts *filters.Options, clientset kubernetes.Inter
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "DaemonSet", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete DaemonSet %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["DaemonSet"] = diff
 		case "resource":
 			appendResources(resources, "DaemonSet", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "DaemonSet", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete DaemonSet %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/delete.go

@@ -334,7 +334,7 @@ func DeleteResource2(diff []ResourceInfo, clientset kubernetes.Interface, namesp
 		if !noInteractive {
 			fmt.Printf("Do you want to delete %s %s in namespace %s? (Y/N): ", resourceType, resource.Name, namespace)
 			var confirmation string
-			_, err := fmt.Scanf("%s", &confirmation)
+			_, err := fmt.Scanf("%s\n", &confirmation)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Failed to read input: %v\n", err)
 				continue
@@ -345,7 +345,7 @@ func DeleteResource2(diff []ResourceInfo, clientset kubernetes.Interface, namesp
 
 				fmt.Printf("Do you want flag the resource %s %s in namespace %s as In Use? (Y/N): ", resourceType, resource.Name, namespace)
 				var inUse string
-				_, err := fmt.Scanf("%s", &inUse)
+				_, err := fmt.Scanf("%s\n", &inUse)
 				if err != nil {
 					fmt.Fprintf(os.Stderr, "Failed to read input: %v\n", err)
 					continue

pkg/kor/deployments.go

@@ -49,18 +49,18 @@ func GetUnusedDeployments(filterOpts *filters.Options, clientset kubernetes.Inte
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "Deployment", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete Deployment %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Deployment"] = diff
 		case "resource":
 			appendResources(resources, "Deployment", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "Deployment", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete Deployment %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/hpas.go

@@ -88,18 +88,18 @@ func GetUnusedHpas(filterOpts *filters.Options, clientset kubernetes.Interface,
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "HPA", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete HPA %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Hpa"] = diff
 		case "resource":
 			appendResources(resources, "Hpa", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "HPA", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete HPA %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/ingresses.go

@@ -124,18 +124,18 @@ func GetUnusedIngresses(filterOpts *filters.Options, clientset kubernetes.Interf
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "Ingress", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete Ingress %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Ingress"] = diff
 		case "resource":
 			appendResources(resources, "Ingress", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "Ingress", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete Ingress %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/jobs.go

@@ -73,18 +73,18 @@ func GetUnusedJobs(filterOpts *filters.Options, clientset kubernetes.Interface,
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "Job", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete Job %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Job"] = diff
 		case "resource":
 			appendResources(resources, "Job", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "Job", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete Job %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/networkpolicies.go

@@ -62,20 +62,18 @@ func GetUnusedNetworkPolicies(filterOpts *filters.Options, clientset kubernetes.
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
-
+		if opts.DeleteFlag {
+			if diff, err := DeleteResource2(diff, clientset, namespace, "NetworkPolicy", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete NetworkPolicy %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["NetworkPolicy"] = diff
 		case "resource":
 			appendResources(resources, "NetworkPolicy", namespace, diff)
 		}
-
-		if opts.DeleteFlag {
-			if diff, err := DeleteResource2(diff, clientset, namespace, "NetworkPolicy", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete NetworkPolicy %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/pdbs.go

@@ -89,18 +89,18 @@ func GetUnusedPdbs(filterOpts *filters.Options, clientset kubernetes.Interface,
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "PDB", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete PDB %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Pdb"] = diff
 		case "resource":
 			appendResources(resources, "Pdb", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "PDB", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete PDB %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/pods.go

@@ -51,18 +51,18 @@ func GetUnusedPods(filterOpts *filters.Options, clientset kubernetes.Interface,
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "Pod", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete Pod %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Pod"] = diff
 		case "resource":
 			appendResources(resources, "Pod", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "Pod", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete Pod %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/pv.go

@@ -50,18 +50,18 @@ func GetUnusedPvs(filterOpts *filters.Options, clientset kubernetes.Interface, o
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to process pvs: %v\n", err)
 	}
+	if opts.DeleteFlag {
+		if diff, err = DeleteResource2(diff, clientset, "", "PV", opts.NoInteractive); err != nil {
+			fmt.Fprintf(os.Stderr, "Failed to delete PV %s: %v\n", diff, err)
+		}
+	}
 	switch opts.GroupBy {
 	case "namespace":
 		resources[""] = make(map[string][]ResourceInfo)
 		resources[""]["Pv"] = diff
 	case "resource":
 		appendResources(resources, "Pv", "", diff)
 	}
-	if opts.DeleteFlag {
-		if diff, err = DeleteResource2(diff, clientset, "", "PV", opts.NoInteractive); err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to delete PV %s: %v\n", diff, err)
-		}
-	}
 
 	var outputBuffer bytes.Buffer
 	var jsonResponse []byte

pkg/kor/pvc.go

@@ -80,18 +80,18 @@ func GetUnusedPvcs(filterOpts *filters.Options, clientset kubernetes.Interface,
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "PVC", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete PVC %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Pvc"] = diff
 		case "resource":
 			appendResources(resources, "Pvc", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "PVC", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete PVC %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/replicaset.go

@@ -44,18 +44,18 @@ func GetUnusedReplicaSets(filterOpts *filters.Options, clientset kubernetes.Inte
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "ReplicaSet", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete ReplicaSet %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["ReplicaSet"] = diff
 		case "resource":
 			appendResources(resources, "ReplicaSet", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "ReplicaSet", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete ReplicaSet %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/roles.go

@@ -113,18 +113,18 @@ func GetUnusedRoles(filterOpts *filters.Options, clientset kubernetes.Interface,
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "Role", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete Role %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Role"] = diff
 		case "resource":
 			appendResources(resources, "Role", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "Role", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete Role %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer

pkg/kor/secrets.go

@@ -203,18 +203,18 @@ func GetUnusedSecrets(filterOpts *filters.Options, clientset kubernetes.Interfac
 			fmt.Fprintf(os.Stderr, "Failed to process namespace %s: %v\n", namespace, err)
 			continue
 		}
+		if opts.DeleteFlag {
+			if diff, err = DeleteResource2(diff, clientset, namespace, "Secret", opts.NoInteractive); err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to delete Secret %s in namespace %s: %v\n", diff, namespace, err)
+			}
+		}
 		switch opts.GroupBy {
 		case "namespace":
 			resources[namespace] = make(map[string][]ResourceInfo)
 			resources[namespace]["Secret"] = diff
 		case "resource":
 			appendResources(resources, "Secret", namespace, diff)
 		}
-		if opts.DeleteFlag {
-			if diff, err = DeleteResource2(diff, clientset, namespace, "Secret", opts.NoInteractive); err != nil {
-				fmt.Fprintf(os.Stderr, "Failed to delete Secret %s in namespace %s: %v\n", diff, namespace, err)
-			}
-		}
 	}
 
 	var outputBuffer bytes.Buffer