From d776a86303bc8d8f64b97a91b54433047bd3cfd4 Mon Sep 17 00:00:00 2001
From: Petr Krutov <pmkrutov@basistech.ru>
Date: Mon, 27 Jun 2022 11:11:17 +0300
Subject: [PATCH] Dev

---
 CHANGELOG.md         |  2 ++
 decort/controller.go | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06aeaff..88fa8aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 - changing boot\_disk\_size in kvmvm
 - downsizing CPU and RAM in kvmvm
 - pfw recreation if public\_port\_end unspecified
+- uninformative error message when retrying on 500
+- hardcoded 3 minute timeout
 
 ### New datasources
 - disk\_list
diff --git a/decort/controller.go b/decort/controller.go
index 25e27ea..19a5ac1 100644
--- a/decort/controller.go
+++ b/decort/controller.go
@@ -27,7 +27,6 @@ package decort
 import (
 	"bytes"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -140,12 +139,9 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		transCfg := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}} //nolint:gosec
 		ret_config.cc_client = &http.Client{
 			Transport: transCfg,
-			Timeout:   Timeout180s,
 		}
 	} else {
-		ret_config.cc_client = &http.Client{
-			Timeout: Timeout180s, // time.Second * 30,
-		}
+		ret_config.cc_client = &http.Client{}
 	}
 
 	switch ret_config.auth_mode_code {
@@ -379,13 +375,15 @@ func (config *ControllerCfg) decortAPICall(method string, api_name string, url_v
 		req.Header.Set("Authorization", fmt.Sprintf("bearer %s", config.jwt))
 	}
 
+	var resp *http.Response
+	var body []byte
 	for i := 0; i < 5; i++ {
-		resp, err := config.cc_client.Do(req)
+		resp, err = config.cc_client.Do(req)
 		if err != nil {
 			return "", err
 		}
 
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err = ioutil.ReadAll(resp.Body)
 		if err != nil {
 			return "", err
 		}
@@ -405,5 +403,6 @@ func (config *ControllerCfg) decortAPICall(method string, api_name string, url_v
 		}
 	}
 
-	return "", errors.New("number of retries exceeded")
+	return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
+		resp.StatusCode, req.URL, params_str, body)
 }