SourceDirSubdir is exported

client.go

@@ -42,7 +42,7 @@ func (c *Client) Get() error {
 	// and then copy over the proper subdir.
 	var realDst string
 	dst := c.Dst
-	src, subDir := getDirSubdir(src)
+	src, subDir := SourceDirSubdir(src)
 	if subDir != "" {
 		tmpDir, err := ioutil.TempDir("", "tf")
 		if err != nil {

detect.go

@@ -41,7 +41,7 @@ func Detect(src string, pwd string, ds []Detector) (string, error) {
 	getForce, getSrc := getForcedGetter(src)
 
 	// Separate out the subdir if there is one, we don't pass that to detect
-	getSrc, subDir := getDirSubdir(getSrc)
+	getSrc, subDir := SourceDirSubdir(getSrc)
 
 	u, err := url.Parse(getSrc)
 	if err == nil && u.Scheme != "" {
@@ -60,7 +60,7 @@ func Detect(src string, pwd string, ds []Detector) (string, error) {
 
 		var detectForce string
 		detectForce, result = getForcedGetter(result)
-		result, detectSubdir := getDirSubdir(result)
+		result, detectSubdir := SourceDirSubdir(result)
 
 		// If we have a subdir from the detection, then prepend it to our
 		// requested subdir.

get.go

@@ -17,7 +17,6 @@ import (
 	"net/url"
 	"os/exec"
 	"regexp"
-	"strings"
 	"syscall"
 )
 
@@ -107,37 +106,6 @@ func getRunCommand(cmd *exec.Cmd) error {
 	return fmt.Errorf("error running %s: %s", cmd.Path, buf.String())
 }
 
-// getDirSubdir takes a source and returns a tuple of the URL without
-// the subdir and the URL with the subdir.
-func getDirSubdir(src string) (string, string) {
-	// Calcaulate an offset to avoid accidentally marking the scheme
-	// as the dir.
-	var offset int
-	if idx := strings.Index(src, "://"); idx > -1 {
-		offset = idx + 3
-	}
-
-	// First see if we even have an explicit subdir
-	idx := strings.Index(src[offset:], "//")
-	if idx == -1 {
-		return src, ""
-	}
-
-	idx += offset
-	subdir := src[idx+2:]
-	src = src[:idx]
-
-	// Next, check if we have query parameters and push them onto the
-	// URL.
-	if idx = strings.Index(subdir, "?"); idx > -1 {
-		query := subdir[idx:]
-		subdir = subdir[:idx]
-		src += query
-	}
-
-	return src, subdir
-}
-
 // getForcedGetter takes a source and returns the tuple of the forced
 // getter and the raw URL (without the force syntax).
 func getForcedGetter(src string) (string, string) {

get_http.go

@@ -70,7 +70,7 @@ func (g *HttpGetter) Get(dst string, u *url.URL) error {
 
 	// If there is a subdir component, then we download the root separately
 	// into a temporary directory, then copy over the proper subdir.
-	source, subDir := getDirSubdir(source)
+	source, subDir := SourceDirSubdir(source)
 	if subDir == "" {
 		return Get(dst, source)
 	}

get_test.go

@@ -59,37 +59,3 @@ func TestGet_fileSubdir(t *testing.T) {
 		t.Fatalf("err: %s", err)
 	}
 }
-
-func TestGetDirSubdir(t *testing.T) {
-	cases := []struct {
-		Input    string
-		Dir, Sub string
-	}{
-		{
-			"hashicorp.com",
-			"hashicorp.com", "",
-		},
-		{
-			"hashicorp.com//foo",
-			"hashicorp.com", "foo",
-		},
-		{
-			"hashicorp.com//foo?bar=baz",
-			"hashicorp.com?bar=baz", "foo",
-		},
-		{
-			"file://foo//bar",
-			"file://foo", "bar",
-		},
-	}
-
-	for i, tc := range cases {
-		adir, asub := getDirSubdir(tc.Input)
-		if adir != tc.Dir {
-			t.Fatalf("%d: bad dir: %#v", i, adir)
-		}
-		if asub != tc.Sub {
-			t.Fatalf("%d: bad sub: %#v", i, asub)
-		}
-	}
-}

source.go

@@ -0,0 +1,36 @@
+package getter
+
+import (
+	"strings"
+)
+
+// SourceDirSubdir takes a source and returns a tuple of the URL without
+// the subdir and the URL with the subdir.
+func SourceDirSubdir(src string) (string, string) {
+	// Calcaulate an offset to avoid accidentally marking the scheme
+	// as the dir.
+	var offset int
+	if idx := strings.Index(src, "://"); idx > -1 {
+		offset = idx + 3
+	}
+
+	// First see if we even have an explicit subdir
+	idx := strings.Index(src[offset:], "//")
+	if idx == -1 {
+		return src, ""
+	}
+
+	idx += offset
+	subdir := src[idx+2:]
+	src = src[:idx]
+
+	// Next, check if we have query parameters and push them onto the
+	// URL.
+	if idx = strings.Index(subdir, "?"); idx > -1 {
+		query := subdir[idx:]
+		subdir = subdir[:idx]
+		src += query
+	}
+
+	return src, subdir
+}

source_test.go

@@ -0,0 +1,39 @@
+package getter
+
+import (
+	"testing"
+)
+
+func TestSourceDirSubdir(t *testing.T) {
+	cases := []struct {
+		Input    string
+		Dir, Sub string
+	}{
+		{
+			"hashicorp.com",
+			"hashicorp.com", "",
+		},
+		{
+			"hashicorp.com//foo",
+			"hashicorp.com", "foo",
+		},
+		{
+			"hashicorp.com//foo?bar=baz",
+			"hashicorp.com?bar=baz", "foo",
+		},
+		{
+			"file://foo//bar",
+			"file://foo", "bar",
+		},
+	}
+
+	for i, tc := range cases {
+		adir, asub := SourceDirSubdir(tc.Input)
+		if adir != tc.Dir {
+			t.Fatalf("%d: bad dir: %#v", i, adir)
+		}
+		if asub != tc.Sub {
+			t.Fatalf("%d: bad sub: %#v", i, asub)
+		}
+	}
+}