fix(pkg/cleaner): fix localDirs and strip git suffixes

Author: Aaron Schlesinger

pkg/cleaner/cleaner.go

@@ -2,6 +2,7 @@
 package cleaner
 
 import (
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -15,22 +16,23 @@ import (
 	"k8s.io/kubernetes/pkg/labels"
 )
 
-func localDirs(gitHome string) ([]string, error) {
-	var ret []string
-	err := filepath.Walk(gitHome, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if info.IsDir() {
-			return filepath.SkipDir
-		}
-		ret = append(ret, filepath.Join(gitHome, path))
-		return nil
-	})
+const (
+	dotGitSuffix = ".git"
+)
 
+func localDirs(gitHome string) ([]string, error) {
+	fileInfos, err := ioutil.ReadDir(gitHome)
 	if err != nil {
 		return nil, err
 	}
+	var ret []string
+	for _, fileInfo := range fileInfos {
+		nm := fileInfo.Name()
+		if len(nm) <= 0 || nm == "." || !fileInfo.IsDir() {
+			continue
+		}
+		ret = append(ret, filepath.Join(gitHome, nm))
+	}
 	return ret, nil
 }
 
@@ -56,20 +58,42 @@ func getDiff(namespaceList []api.Namespace, dirs []string) []string {
 	return ret
 }
 
+func stripSuffixes(strs []string, suffix string) []string {
+	ret := make([]string, len(strs))
+	for i, str := range strs {
+		idx := strings.LastIndex(str, suffix)
+		if idx >= 0 {
+			ret[i] = str[:idx]
+		}
+	}
+	return ret
+}
+
 // Run starts the deleted app cleaner. Every pollSleepDuration, it compares the result of nsLister.List with the directories in the top level of gitHome on the local file system. On any error, it uses log.Debug to output a human readable description of what happened.
 func Run(gitHome string, nsLister k8s.NamespaceLister, repoLock sshd.RepositoryLock, pollSleepDuration time.Duration) error {
 	for {
 		nsList, err := nsLister.List(labels.Everything(), fields.Everything())
 		if err != nil {
 			log.Err("Cleaner error listing namespaces (%s)", err)
 			continue
+		} else {
+			lst := make([]string, len(nsList.Items))
+			for i, ns := range nsList.Items {
+				lst[i] = strings.ToLower(ns.Name)
+			}
+			log.Debug("Cleaner found namespaces %s", lst)
 		}
 
 		gitDirs, err := localDirs(gitHome)
 		if err != nil {
 			log.Err("Cleaner error listing local git directories (%s)", err)
+			continue
+		} else {
+			log.Debug("Cleaner found local git directories in %s: %s", gitHome, gitDirs)
 		}
 
+		gitDirs = stripSuffixes(gitDirs, dotGitSuffix)
+
 		dirsToDelete := getDiff(nsList.Items, gitDirs)
 		if len(dirsToDelete) > 0 {
 			log.Debug("Cleaner found the following git directories to delete: %s", dirsToDelete)

pkg/cleaner/cleaner_test.go

@@ -26,10 +26,46 @@ func TestLocalDirs(t *testing.T) {
 	pkgDir, err := filepath.Abs(wd + "/..")
 	assert.NoErr(t, err)
 	lDirs, err := localDirs(pkgDir)
-	for _, dir := range lDirs {
-		rel, err := filepath.Rel(pkgDir, dir)
-		assert.NoErr(t, err)
-		spl := strings.Split(rel, "/")
-		assert.Equal(t, len(spl), 1, "directory depth")
+	assert.NoErr(t, err)
+
+	expectedPackages := map[string]int{
+		pkgDir + "/cleaner":    1,
+		pkgDir + "/conf":       1,
+		pkgDir + "/controller": 1,
+		pkgDir + "/env":        1,
+		pkgDir + "/git":        1,
+		pkgDir + "/gitreceive": 1,
+		pkgDir + "/healthsrv":  1,
+		pkgDir + "/k8s":        1,
+		pkgDir + "/sshd":       1,
+	}
+
+	actualPackages := map[string]int{}
+	for _, lDir := range lDirs {
+		actualPackages[lDir]++
+	}
+	assert.Equal(t, len(actualPackages), len(expectedPackages), "number of packages")
+	for actualPackageName, actualNum := range actualPackages {
+		if actualNum != 1 {
+			t.Errorf("found %d %s packages", actualNum, actualPackageName)
+			continue
+		}
+		expectedNum, ok := expectedPackages[actualPackageName]
+		if !ok {
+			t.Errorf("found unexpected package %s", actualPackageName)
+			continue
+		}
+		if actualNum != expectedNum {
+			t.Errorf("found %d %s packages, expected %d", actualNum, actualPackageName, expectedNum)
+			continue
+		}
+	}
+}
+
+func TestStripSuffixes(t *testing.T) {
+	strs := []string{"a.git", "b.git", "c.git"}
+	newStrs := stripSuffixes(strs, dotGitSuffix)
+	for _, str := range newStrs {
+		assert.False(t, strings.HasSuffix(str, dotGitSuffix), "string %s has suffix %s", str, dotGitSuffix)
 	}
 }