diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2021-12-09 12:49:17 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2021-12-09 13:33:30 +0100 |
| commit | 965a6cbff9c346297b1ec7487c4d33a51d465f21 (patch) | |
| tree | 0778adaab26fcb4c60bda03d22a63ad6bbde8a80 | |
| parent | 34a96290fa8f91a4171c6e94f92b2c10360954f1 (diff) | |
| download | hugo-965a6cbff9c346297b1ec7487c4d33a51d465f21.tar.gz hugo-965a6cbff9c346297b1ec7487c4d33a51d465f21.zip | |
Update to Go 1.17.4 and remove timeout in resources.Get
Fixes #9265
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | resources/resource_factories/create/create.go | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index cb153b8a8..8e9be92f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults docker: - - image: bepsays/ci-goreleaser:1.17.2 + - image: bepsays/ci-goreleaser:1.17.4 environment: CGO_ENABLED: "0" diff --git a/resources/resource_factories/create/create.go b/resources/resource_factories/create/create.go index 9b8d73ad4..2616af83e 100644 --- a/resources/resource_factories/create/create.go +++ b/resources/resource_factories/create/create.go @@ -18,7 +18,6 @@ package create import ( "bufio" "bytes" - "context" "fmt" "io" "io/ioutil" @@ -182,13 +181,6 @@ func (c *Client) FromRemote(uri string, options map[string]interface{}) (resourc addUserProvidedHeaders(headers, req) } - // Workaround for https://github.com/golang/go/issues/49366 - // This is the entire lifetime of the request. - ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second) - defer cancel() - - req = req.WithContext(ctx) - res, err := c.httpClient.Do(req) if err != nil { return nil, err |