Merge pull request #384 from felixbuenemann/builder-skip-data-dir-symlink

fix(pkg/conf): skip ..data symlink reading creds

Author: mboersma

pkg/conf/config.go

@@ -51,7 +51,7 @@ func GetStorageParams(env sys.Env) (Parameters, error) {
 	}
 
 	for _, file := range files {
-		if file.IsDir() {
+		if file.IsDir() || file.Name() == "..data" {
 			continue
 		}
 		data, err := ioutil.ReadFile(storageCredLocation + file.Name())

pkg/conf/config_test.go

@@ -33,7 +33,7 @@ func TestGetStorageParams(t *testing.T) {
 
 	params, err := GetStorageParams(sys.NewFakeEnv())
 	if err != nil {
-		t.Errorf("recevied error while retrieving storage params: %v", err)
+		t.Errorf("received error while retrieving storage params: %v", err)
 	}
 
 	val, ok := params["foo"]
@@ -51,6 +51,16 @@ func TestGetStorageParams(t *testing.T) {
 
 	_, err = GetStorageParams(sys.NewFakeEnv())
 	if err != nil {
-		t.Errorf("recevied error while retrieving storage params: %v", err)
+		t.Errorf("received error while retrieving storage params: %v", err)
+	}
+
+	// create the special "..data" directory symlink, expecting it to pass
+	if err := os.Symlink(storageCredLocation+"bar", storageCredLocation+"..data"); err != nil {
+		t.Fatalf("could not create dir symlink ..data -> %s: %v", storageCredLocation+"bar", err)
+	}
+
+	_, err = GetStorageParams(sys.NewFakeEnv())
+	if err != nil {
+		t.Errorf("received error while retrieving storage params: %v", err)
 	}
 }