mirror of
https://github.com/opentofu/opentofu.git
synced 2024-12-25 08:21:07 -06:00
Make sure to close the response body
And fix a few linter warnings while we're at it…
This commit is contained in:
parent
ec998a21bc
commit
2c0c3771a9
@ -78,6 +78,7 @@ type Storage struct {
|
||||
registry *registry.Client
|
||||
}
|
||||
|
||||
// NewStorage returns a new initialized Storage object.
|
||||
func NewStorage(dir string, services *disco.Disco, creds auth.CredentialsSource) *Storage {
|
||||
regClient := registry.NewClient(services, creds, nil)
|
||||
|
||||
|
@ -43,6 +43,7 @@ type Client struct {
|
||||
creds auth.CredentialsSource
|
||||
}
|
||||
|
||||
// NewClient returns a new initialized registry client.
|
||||
func NewClient(services *disco.Disco, creds auth.CredentialsSource, client *http.Client) *Client {
|
||||
if services == nil {
|
||||
services = disco.NewDisco()
|
||||
|
@ -42,6 +42,7 @@ type Disco struct {
|
||||
Transport http.RoundTripper
|
||||
}
|
||||
|
||||
// NewDisco returns a new initialized Disco object.
|
||||
func NewDisco() *Disco {
|
||||
return &Disco{}
|
||||
}
|
||||
@ -117,7 +118,7 @@ func (d *Disco) DiscoverServiceURL(host svchost.Hostname, serviceID string) *url
|
||||
func (d *Disco) discover(host svchost.Hostname) Host {
|
||||
discoURL := &url.URL{
|
||||
Scheme: "https",
|
||||
Host: string(host),
|
||||
Host: host.String(),
|
||||
Path: discoPath,
|
||||
}
|
||||
|
||||
@ -166,6 +167,8 @@ func (d *Disco) discover(host svchost.Hostname) Host {
|
||||
log.Printf("[WARN] Failed to request discovery document: %s", err)
|
||||
return ret // empty
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != 200 {
|
||||
log.Printf("[WARN] Failed to request discovery document: %s", resp.Status)
|
||||
return ret // empty
|
||||
|
Loading…
Reference in New Issue
Block a user