Merge pull request #382 from bacongobbler/379-directories-in-storage-cred-location

fix(pkg/conf): skip file if directory

Author: Matthew Fisher

pkg/conf/config.go

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

pkg/conf/config_test.go

@@ -0,0 +1,56 @@
+package conf
+
+import (
+	"io/ioutil"
+	"os"
+	"os/user"
+	"testing"
+
+	"github.com/deis/builder/pkg/sys"
+)
+
+func TestGetStorageParams(t *testing.T) {
+	usr, err := user.Current()
+	if err != nil {
+		t.Logf("could not retrieve current user: %v", err)
+		t.SkipNow()
+	}
+	if usr.Uid != "0" {
+		t.Logf("current user does not have UID of zero (got %s) "+
+			"so cannot create storage cred location, skipping", usr.Uid)
+		t.SkipNow()
+	}
+
+	if err := os.MkdirAll(storageCredLocation, os.ModeDir); err != nil {
+		t.Fatalf("could not create storage cred location: %v", err)
+	}
+
+	// start by writing out a file to storageCredLocation
+	data := []byte("hello world\n")
+	if err := ioutil.WriteFile(storageCredLocation+"foo", data, 0644); err != nil {
+		t.Fatalf("could not write file to storage cred location: %v", err)
+	}
+
+	params, err := GetStorageParams(sys.NewFakeEnv())
+	if err != nil {
+		t.Errorf("recevied error while retrieving storage params: %v", err)
+	}
+
+	val, ok := params["foo"]
+	if !ok {
+		t.Error("key foo does not exist in storage params")
+	}
+	if val != string(data) {
+		t.Errorf("expected: %s got: %s", string(data), val)
+	}
+
+	// create a directory inside storage cred location, expecting it to pass
+	if err := os.Mkdir(storageCredLocation+"bar", os.ModeDir); err != nil {
+		t.Fatalf("could not create dir %s: %v", storageCredLocation+"bar", err)
+	}
+
+	_, err = GetStorageParams(sys.NewFakeEnv())
+	if err != nil {
+		t.Errorf("recevied error while retrieving storage params: %v", err)
+	}
+}