Skip to content

Commit 965a6cb

Browse files
committed
Update to Go 1.17.4 and remove timeout in resources.Get
Fixes #9265
1 parent 34a9629 commit 965a6cb

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
defaults: &defaults
22
docker:
3-
- image: bepsays/ci-goreleaser:1.17.2
3+
- image: bepsays/ci-goreleaser:1.17.4
44
environment:
55
CGO_ENABLED: "0"
66

resources/resource_factories/create/create.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package create
1818
import (
1919
"bufio"
2020
"bytes"
21-
"context"
2221
"fmt"
2322
"io"
2423
"io/ioutil"
@@ -182,13 +181,6 @@ func (c *Client) FromRemote(uri string, options map[string]interface{}) (resourc
182181
addUserProvidedHeaders(headers, req)
183182
}
184183

185-
// Workaround for https://github.com/golang/go/issues/49366
186-
// This is the entire lifetime of the request.
187-
ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
188-
defer cancel()
189-
190-
req = req.WithContext(ctx)
191-
192184
res, err := c.httpClient.Do(req)
193185
if err != nil {
194186
return nil, err

0 commit comments

Comments
 (0)