Merge pull request hashicorp#82 from hashicorp/jbardin/glob-no-match

cover the case where a subdir glob doesn't match

source.go

@@ -49,6 +49,11 @@ func SubdirGlob(dst, subDir string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+
+	if len(matches) == 0 {
+		return "", fmt.Errorf("subdir %q not found", subDir)
+	}
+
 	if len(matches) > 1 {
 		return "", fmt.Errorf("subdir %q matches multiple paths", subDir)
 	}

source_test.go

@@ -1,6 +1,9 @@
 package getter
 
 import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"testing"
 )
 
@@ -41,3 +44,55 @@ func TestSourceDirSubdir(t *testing.T) {
 		}
 	}
 }
+
+func TestSourceSubdirGlob(t *testing.T) {
+	td, err := ioutil.TempDir("", "subdir-glob")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(td)
+
+	if err := os.Mkdir(filepath.Join(td, "subdir"), 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.Mkdir(filepath.Join(td, "subdir/one"), 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.Mkdir(filepath.Join(td, "subdir/two"), 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	subdir := filepath.Join(td, "subdir")
+
+	// match the exact directory
+	res, err := SubdirGlob(td, "subdir")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if res != subdir {
+		t.Fatalf(`expected "subdir", got: %q`, subdir)
+	}
+
+	// single match from a wildcard
+	res, err = SubdirGlob(td, "*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if res != subdir {
+		t.Fatalf(`expected "subdir", got: %q`, subdir)
+	}
+
+	// multiple matches
+	res, err = SubdirGlob(td, "subdir/*")
+	if err == nil {
+		t.Fatalf("expected multiple matches, got %q", res)
+	}
+
+	// non-existent
+	res, err = SubdirGlob(td, "foo")
+	if err == nil {
+		t.Fatalf("expected no matches, got %q", res)
+	}
+}