Update to Go 1.17.4 and remove timeout in resources.Get

Fixes #9265

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb153b8a8f17e0a999e802cff56d013ce682cd70..8e9be92f9a1f3d527ddfe59cecd9421c9147f363 100644 (file)
--- 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 9b8d73ad478bbdf618e1e3a8b356d1c1adb9c021..2616af83e550b0e42061aa41e328952c6866aeae 100644 (file)
--- 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