move calculate difference to common function

yonahd · Aug 21, 2023 · 0aa9b9c · 0aa9b9c
1 parent 60658a5
commit 0aa9b9c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 72 deletions.
diff --git a/pkg/kor/confimgmaps.go b/pkg/kor/confimgmaps.go
@@ -83,23 +83,6 @@ func retrieveConfigMapNames(kubeClient *kubernetes.Clientset, namespace string)
 	return names, nil
 }
 
-func calculateCMDifference(usedConfigMaps []string, configMapNames []string) []string {
-	difference := []string{}
-	for _, name := range configMapNames {
-		found := false
-		for _, usedName := range usedConfigMaps {
-			if name == usedName {
-				found = true
-				break
-			}
-		}
-		if !found {
-			difference = append(difference, name)
-		}
-	}
-	return difference
-}
-
 func processNamespaceCM(kubeClient *kubernetes.Clientset, namespace string) ([]string, error) {
 	volumesCM, volumesProjectedCM, envCM, envFromCM, envFromContainerCM, err := retrieveUsedCM(kubeClient, namespace)
 	if err != nil {
@@ -118,7 +101,7 @@ func processNamespaceCM(kubeClient *kubernetes.Clientset, namespace string) ([]s
 	}
 
 	usedConfigMaps := append(append(append(append(volumesCM, volumesProjectedCM...), envCM...), envFromCM...), envFromContainerCM...)
-	diff := calculateCMDifference(usedConfigMaps, configMapNames)
+	diff := CalculateResourceDifference(usedConfigMaps, configMapNames)
 	return diff, nil
 
 }

diff --git a/pkg/kor/kor.go b/pkg/kor/kor.go
@@ -110,3 +110,20 @@ func FormatOutputAll(namespace string, allDiffs []ResourceDiff) string {
 }
 
 // TODO create formatter by resource "#", "Resource Name", "Namespace"
+
+func CalculateResourceDifference(usedResourceNames []string, allResourceNames []string) []string {
+	difference := []string{}
+	for _, name := range allResourceNames {
+		found := false
+		for _, usedName := range usedResourceNames {
+			if name == usedName {
+				found = true
+				break
+			}
+		}
+		if !found {
+			difference = append(difference, name)
+		}
+	}
+	return difference
+}
diff --git a/pkg/kor/pvc.go b/pkg/kor/pvc.go
@@ -30,22 +30,6 @@ func retreiveUsedPvcs(kubeClient *kubernetes.Clientset, namespace string) ([]str
 	return usedPvcs, err
 }
 
-func calculatePvcDifference(usedPvcs []string, pvcNames []string) []string {
-	difference := []string{}
-	for _, name := range pvcNames {
-		found := false
-		for _, usedName := range usedPvcs {
-			if name == usedName {
-				found = true
-				break
-			}
-		}
-		if !found {
-			difference = append(difference, name)
-		}
-	}
-	return difference
-}
 func processNamespacePvcs(kubeClient *kubernetes.Clientset, namespace string) ([]string, error) {
 	pvcs, err := kubeClient.CoreV1().PersistentVolumeClaims(namespace).List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
@@ -61,7 +45,7 @@ func processNamespacePvcs(kubeClient *kubernetes.Clientset, namespace string) ([
 		return nil, err
 	}
 
-	diff := calculatePvcDifference(usedPvcs, pvcNames)
+	diff := CalculateResourceDifference(usedPvcs, pvcNames)
 	return diff, nil
 }
 

diff --git a/pkg/kor/roles.go b/pkg/kor/roles.go
@@ -49,23 +49,6 @@ func retrieveRoleNames(kubeClient *kubernetes.Clientset, namespace string) ([]st
 	return names, nil
 }
 
-func calculateRoleDifference(usedRoles []string, roleNames []string) []string {
-	difference := []string{}
-	for _, name := range roleNames {
-		found := false
-		for _, usedName := range usedRoles {
-			if name == usedName {
-				found = true
-				break
-			}
-		}
-		if !found {
-			difference = append(difference, name)
-		}
-	}
-	return difference
-}
-
 func processNamespaceRoles(kubeClient *kubernetes.Clientset, namespace string) ([]string, error) {
 	usedRoles, err := retrieveUsedRoles(kubeClient, namespace)
 	if err != nil {
@@ -79,7 +62,7 @@ func processNamespaceRoles(kubeClient *kubernetes.Clientset, namespace string) (
 		return nil, err
 	}
 
-	diff := calculateRoleDifference(usedRoles, roleNames)
+	diff := CalculateResourceDifference(usedRoles, roleNames)
 	return diff, nil
 
 }

diff --git a/pkg/kor/secrets.go b/pkg/kor/secrets.go
@@ -96,23 +96,6 @@ func retrieveSecretNames(kubeClient *kubernetes.Clientset, namespace string) ([]
 	return names, nil
 }
 
-func calculateSecretDifference(usedSecrets []string, secretNames []string) []string {
-	difference := []string{}
-	for _, name := range secretNames {
-		found := false
-		for _, usedName := range usedSecrets {
-			if name == usedName {
-				found = true
-				break
-			}
-		}
-		if !found {
-			difference = append(difference, name)
-		}
-	}
-	return difference
-}
-
 func processNamespaceSecret(kubeClient *kubernetes.Clientset, namespace string) ([]string, error) {
 	envSecrets, envSecrets2, volumeSecrets, pullSecrets, tlsSecrets, err := retrieveUsedSecret(kubeClient, namespace)
 	if err != nil {
@@ -131,7 +114,7 @@ func processNamespaceSecret(kubeClient *kubernetes.Clientset, namespace string)
 	}
 
 	usedSecrets := append(append(append(append(envSecrets, envSecrets2...), volumeSecrets...), pullSecrets...), tlsSecrets...)
-	diff := calculateSecretDifference(usedSecrets, secretNames)
+	diff := CalculateResourceDifference(usedSecrets, secretNames)
 	return diff, nil
 
 }

diff --git a/pkg/kor/serviceaccounts.go b/pkg/kor/serviceaccounts.go
@@ -115,7 +115,7 @@ func processNamespaceSA(kubeClient *kubernetes.Clientset, namespace string) ([]s
 		return nil, err
 	}
 
-	diff := calculateCMDifference(usedServiceAccounts, serviceAccountNames)
+	diff := CalculateResourceDifference(usedServiceAccounts, serviceAccountNames)
 	return diff, nil
 
 }