From a7cccc1d32d3629556ae69f60f798efee2d854fa Mon Sep 17 00:00:00 2001 From: Chris Stephens Date: Thu, 13 Dec 2018 18:11:33 -0800 Subject: [PATCH 1/2] Make the default timout 5 minutes when timeout is 0 --- third_party/terraform/utils/transport.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/third_party/terraform/utils/transport.go b/third_party/terraform/utils/transport.go index 8ba9ab41d81a..19253b3b7828 100644 --- a/third_party/terraform/utils/transport.go +++ b/third_party/terraform/utils/transport.go @@ -41,6 +41,10 @@ func sendRequestWithTimeout(config *Config, method, rawurl string, body map[stri reqHeaders.Set("User-Agent", config.userAgent) reqHeaders.Set("Content-Type", "application/json") + if timeout == 0 { + timeout = time.Duration(5) * time.Minute + } + var res *http.Response err := retryTimeDuration( func() error { From b0f52a80a8b45d14fb8df5077b42b58200bb7ea5 Mon Sep 17 00:00:00 2001 From: Chris Stephens Date: Fri, 14 Dec 2018 15:31:09 -0800 Subject: [PATCH 2/2] change sendRequest to use 5 min default --- third_party/terraform/utils/transport.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/utils/transport.go b/third_party/terraform/utils/transport.go index 19253b3b7828..14ee3e9d85f1 100644 --- a/third_party/terraform/utils/transport.go +++ b/third_party/terraform/utils/transport.go @@ -33,7 +33,7 @@ func isEmptyValue(v reflect.Value) bool { } func sendRequest(config *Config, method, rawurl string, body map[string]interface{}) (map[string]interface{}, error) { - return sendRequestWithTimeout(config, method, rawurl, body, 0) + return sendRequestWithTimeout(config, method, rawurl, body, 5) } func sendRequestWithTimeout(config *Config, method, rawurl string, body map[string]interface{}, timeout time.Duration) (map[string]interface{}, error) {