resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

remove extra slash from registry urls
This commit is contained in:
James Bardin 2017-09-28 17:52:34 -04:00 committed by GitHub
parent f45aae9b70 1fbb2d611a
commit 60d8b6c4d7
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/module/get.go
View File

@ -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"
)

18
config/module/get_test.go
View File

@ -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 {