Finalise module registry refactor

Author: pysysops

Terrafile.example

@@ -1,6 +1,6 @@
 terrafile-test-registry:
   source: "terraform-digitalocean-modules/droplet/digitalocean"
-  version: "0.1.7"
+  version: "0.1.x"
 terrafile-test-https:
   source: "github.com/terraform-digitalocean-modules/terraform-digitalocean-droplet.git"
 terrafile-test-tag:

cmd/install.go

@@ -21,13 +21,9 @@
 package cmd
 
 import (
-	"errors"
-	"fmt"
-	"net/http"
 	"net/url"
 	"os"
 	"path"
-	"regexp"
 	"strings"
 	"sync"
 
@@ -86,7 +82,7 @@ func getModule(moduleName string, moduleMeta module, wg *sync.WaitGroup) {
 	case xt.IsLocalSourceAddr(moduleSource):
 		xt.CopyFile(moduleName, moduleSource, directory)
 	case xt.IsRegistrySourceAddr(moduleSource):
-		source, version := getRegistrySource(moduleName, moduleSource, moduleVersion)
+		source, version := xt.GetRegistrySource(moduleName, moduleSource, moduleVersion, nil)
 		getWithGoGetter(moduleName, source, version, directory)
 	default:
 		getWithGoGetter(moduleName, moduleSource, moduleVersion, directory)
@@ -108,54 +104,6 @@ func getModule(moduleName string, moduleMeta module, wg *sync.WaitGroup) {
 	os.RemoveAll(path.Join(directory, ".git"))
 }
 
-// Handle modules from Terraform registry
-var registryBaseURL = "https://registry.terraform.io/v1/modules"
-var githubDownloadURLRe = regexp.MustCompile(`https://[^/]+/repos/([^/]+)/([^/]+)/tarball/([^/]+)/.*`)
-
-func getRegistrySource(name string, source string, version string) (string, string) {
-	logVersion := "latest"
-	if len(version) > 0 {
-		logVersion = version
-	}
-
-	jww.INFO.Printf("[%s] Looking up %s version %s in Terraform registry", name, source, logVersion)
-
-	src := strings.Split(source, "/")
-	namespace, name, provider := src[0], src[1], src[2]
-
-	registryDownloadURL := fmt.Sprintf("%s/%s/%s/%s/%s/download",
-		registryBaseURL,
-		namespace,
-		name,
-		provider,
-		version)
-
-	client := &http.Client{}
-	req, err := http.NewRequest("GET", registryDownloadURL, nil)
-	xt.CheckIfError(name, err)
-
-	req.Header.Set("User-Agent", "XTerrafile (https://github.com/devopsmakers/xterrafile)")
-	resp, err := client.Do(req)
-	xt.CheckIfError(name, err)
-	defer resp.Body.Close()
-
-	var githubDownloadURL = ""
-	if len(resp.Header["X-Terraform-Get"]) > 0 {
-		githubDownloadURL = resp.Header["X-Terraform-Get"][0]
-	}
-	jww.INFO.Printf("[%s] %v", name, registryDownloadURL)
-
-	if githubDownloadURLRe.MatchString(githubDownloadURL) {
-		matches := githubDownloadURLRe.FindStringSubmatch(githubDownloadURL)
-		user, repo, version := matches[1], matches[2], matches[3]
-		source = fmt.Sprintf("github.com/%s/%s.git", user, repo)
-		return source, version
-	}
-	err = errors.New("Unable to find module or version download url")
-	xt.CheckIfError(name, err)
-	return "", "" // Never reaches here
-}
-
 // Handle modules from other sources to reflect:
 // https://www.terraform.io/docs/modules/sources.html
 //

main_test.go

@@ -40,8 +40,8 @@ func TestTerraformWithTerrafilePath(t *testing.T) {
 		"[terrafile-test-https] Fetching git::https://github.com/terraform-digitalocean-modules/terraform-digitalocean-droplet.git",
 		"[terrafile-test-branch] Fetching git::ssh://git@github.com/terraform-digitalocean-modules/terraform-digitalocean-droplet.git?ref=branch_test",
 		"[terrafile-test-tag] Fetching git::ssh://git@github.com/terraform-digitalocean-modules/terraform-digitalocean-droplet.git?ref=v0.1.7",
-		"[terrafile-test-registry] Looking up terraform-digitalocean-modules/droplet/digitalocean version 0.1.7 in Terraform registry",
-		"[terrafile-test-registry] Fetching git::https://github.com/terraform-digitalocean-modules/terraform-digitalocean-droplet.git?ref=v0.1.7",
+		"[terrafile-test-registry] Found module version 0.1.7 at registry.terraform.io",
+		"[terrafile-test-registry] Fetching https://api.github.com/repos/terraform-digitalocean-modules/terraform-digitalocean-droplet/tarball/v0.1.7//*?archive=tar.gz&ref=0.1.7",
 	} {
 		assert.Contains(t, testcli.Stdout(), output)
 	}

pkg/xterrafile/registry.go

@@ -41,7 +41,7 @@ func IsRegistrySourceAddr(addr string) bool {
 }
 
 // GetRegistrySource retrieves a modules download source from a Terraform registry
-func GetRegistrySource(name string, source string, version string, services *disco.Disco) string {
+func GetRegistrySource(name string, source string, version string, services *disco.Disco) (string, string) {
 
 	modSrc, err := getModSrc(source)
 	CheckIfError(name, err)
@@ -56,7 +56,7 @@ func GetRegistrySource(name string, source string, version string, services *dis
 	CheckIfError(name, err)
 	jww.INFO.Printf("[%s] Downloading from source URL %s", name, regSrc)
 
-	return regSrc
+	return regSrc, version
 }
 
 // Helper function to return a valid version

pkg/xterrafile/registry_test.go

@@ -26,8 +26,10 @@ func TestGetRegistrySource(t *testing.T) {
 	server := test.Registry()
 	defer server.Close()
 
-	module1Src := GetRegistrySource("droplet", "example.com/test-versions/name/provider", "2.1.x", test.Disco(server))
+	module1Src, module1Version := GetRegistrySource("droplet", "example.com/test-versions/name/provider", "2.1.x", test.Disco(server))
 	assert.IsType(t, "string", module1Src, "download URL should be a string")
+	assert.IsType(t, "string", module1Version, "download version should be a string")
+
 }
 
 func TestGetModSrc(t *testing.T) {