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

Merge pull request #17134 from hashicorp/jbardin/GH-17119 

the trailing slash check caused a nil dereference
This commit is contained in:
James Bardin 2018-01-17 19:07:19 -05:00 committed by GitHub
parent 1b3f5fcbfb 38f76ddc4e
commit eba73a3bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
registry/client.go
View File

@ -67,6 +67,9 @@ func NewClient(services *disco.Disco, creds auth.CredentialsSource, client *http
// Discover qeuries the host, and returns the url for the registry. // Discover qeuries the host, and returns the url for the registry.
func (c *Client) Discover(host svchost.Hostname) *url.URL { func (c *Client) Discover(host svchost.Hostname) *url.URL {
service := c.services.DiscoverServiceURL(host, serviceID) service := c.services.DiscoverServiceURL(host, serviceID)
if service == nil {
return nil
}
if !strings.HasSuffix(service.Path, "/") { if !strings.HasSuffix(service.Path, "/") {
service.Path += "/" service.Path += "/"
} }

17
registry/client_test.go
View File

@ -55,6 +55,23 @@ func TestLookupModuleVersions(t *testing.T) {
} }
} }
func TestInvalidRegistry(t *testing.T) {
server := test.Registry()
defer server.Close()
client := NewClient(test.Disco(server), nil, nil)
src := "non-existent.localhost.localdomain/test-versions/name/provider"
modsrc, err := regsrc.ParseModuleSource(src)
if err != nil {
t.Fatal(err)
}
if _, err := client.Versions(modsrc); err == nil {
t.Fatal("expected error")
}
}
func TestRegistryAuth(t *testing.T) { func TestRegistryAuth(t *testing.T) {
server := test.Registry() server := test.Registry()
defer server.Close() defer server.Close()