Merge pull request hashicorp#16214 from hashicorp/jbardin/registry-url

remove extra slash from registry urls

Author: jbardin

config/module/get.go

@@ -79,7 +79,7 @@ func getStorage(s getter.Storage, key string, src string, mode GetMode) (string,
 }
 
 const (
-	registryAPI   = "https://registry.terraform.io/v1/modules/"
+	registryAPI   = "https://registry.terraform.io/v1/modules"
 	xTerraformGet = "X-Terraform-Get"
 )
 

config/module/get_test.go

@@ -102,7 +102,7 @@ func TestDetectRegistry(t *testing.T) {
 	defer server.Close()
 
 	detector := registryDetector{
-		api:    server.URL + "/v1/modules/",
+		api:    server.URL + "/v1/modules",
 		client: server.Client(),
 	}
 
@@ -181,7 +181,7 @@ func TestDetectors(t *testing.T) {
 	}
 
 	regDetector := &registryDetector{
-		api:    server.URL + "/v1/modules/",
+		api:    server.URL + "/v1/modules",
 		client: server.Client(),
 	}
 
@@ -280,7 +280,7 @@ func TestRegistryGitHubArchive(t *testing.T) {
 	defer server.Close()
 
 	regDetector := &registryDetector{
-		api:    server.URL + "/v1/modules/",
+		api:    server.URL + "/v1/modules",
 		client: server.Client(),
 	}
 
@@ -312,6 +312,18 @@ func TestRegistryGitHubArchive(t *testing.T) {
 		t.Fatalf("err: %s", err)
 	}
 
+	// stop the registry server, and make sure that we don't need to call out again
+	server.Close()
+	tree = NewTree("", testConfig(t, "registry-tar-subdir"))
+
+	if err := tree.Load(storage, GetModeGet); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if !tree.Loaded() {
+		t.Fatal("should be loaded")
+	}
+
 	actual := strings.TrimSpace(tree.String())
 	expected := strings.TrimSpace(treeLoadSubdirStr)
 	if actual != expected {