fix(pkg/cleaner): only get directories that are not in the namespace list

the other way around (namespaces not in the directories list) means
that the app has not been pushed to, or it’s a namespace unrelated to
apps (like default or deis)

Author: Aaron Schlesinger

pkg/cleaner/cleaner.go

@@ -34,23 +34,17 @@ func localDirs(gitHome string) ([]string, error) {
 	return ret, nil
 }
 
-// getDisjunction gets the items that are in namespaceList and not in dirs or vice versa
-func getDisjunction(namespaceList []api.Namespace, dirs []string) []string {
+// getDiff gets the directories that are not in namespaceList
+func getDiff(namespaceList []api.Namespace, dirs []string) []string {
 	var ret []string
-	namespacesSet := make(map[string]struct{})
-	dirsSet := make(map[string]struct{})
 
-	// create sets of the namespaces and dirs
+	// create a set of lowercase namespace names
+	namespacesSet := make(map[string]struct{})
 	for _, ns := range namespaceList {
 		lowerName := strings.ToLower(ns.Name)
 		namespacesSet[lowerName] = struct{}{}
 	}
 
-	for _, dir := range dirs {
-		lowerName := strings.ToLower(dir)
-		dirsSet[lowerName] = struct{}{}
-	}
-
 	// get dirs not in the namespaces set
 	for _, dir := range dirs {
 		lowerName := strings.ToLower(dir)
@@ -59,14 +53,6 @@ func getDisjunction(namespaceList []api.Namespace, dirs []string) []string {
 		}
 	}
 
-	// get namespaces not in the dirs set
-	for _, ns := range namespaceList {
-		lowerName := strings.ToLower(ns.Name)
-		if _, ok := dirsSet[lowerName]; !ok {
-			ret = append(ret, lowerName)
-		}
-	}
-
 	return ret
 }
 
@@ -84,17 +70,17 @@ func Run(gitHome string, nsLister k8s.NamespaceLister, repoLock sshd.RepositoryL
 			log.Debug("Cleaner error listing local git directories (%s)", err)
 		}
 
-		disjunctions := getDisjunction(nsList.Items, gitDirs)
-		for _, disj := range disjunctions {
-			if err := repoLock.Lock(disj, time.Duration(0)); err != nil {
-				log.Debug("Cleaner error locking repository %s for deletion (%s)", disj, err)
+		dirsToDelete := getDiff(nsList.Items, gitDirs)
+		for _, dirToDelete := range dirsToDelete {
+			if err := repoLock.Lock(dirToDelete, time.Duration(0)); err != nil {
+				log.Debug("Cleaner error locking repository %s for deletion (%s)", dirToDelete, err)
 				continue
 			}
-			if err := os.RemoveAll(disj); err != nil {
-				log.Debug("Cleaner error removing deleted app %s (%s)", disj, err)
+			if err := os.RemoveAll(dirToDelete); err != nil {
+				log.Debug("Cleaner error removing deleted app %s (%s)", dirToDelete, err)
 			}
-			if err := repoLock.Unlock(disj, time.Duration(0)); err != nil {
-				log.Debug("Cleaner error unlocking repository %s for deletion (%s)", disj, err)
+			if err := repoLock.Unlock(dirToDelete, time.Duration(0)); err != nil {
+				log.Debug("Cleaner error unlocking repository %s for deletion (%s)", dirToDelete, err)
 				continue
 			}
 		}

pkg/cleaner/cleaner_test.go

@@ -10,14 +10,14 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 )
 
-func TestGetDisjunction(t *testing.T) {
+func TestGetDiff(t *testing.T) {
 	nsList := []api.Namespace{
 		api.Namespace{ObjectMeta: api.ObjectMeta{Name: "app1"}},
 		api.Namespace{ObjectMeta: api.ObjectMeta{Name: "app2"}},
 	}
 	dirList := []string{"app1", "app3"}
-	disj := getDisjunction(nsList, dirList)
-	assert.Equal(t, len(disj), 2, "number of items in the disjunction")
+	diff := getDiff(nsList, dirList)
+	assert.Equal(t, len(diff), 1, "number of items in the disjunction")
 }
 
 func TestLocalDirs(t *testing.T) {