fix(client): Client won't crash on no response + no error code.

Author: spbsoluble

v2/api/client.go

@@ -202,13 +202,13 @@ func (c *Client) sendRequest(request *request) (*http.Response, error) {
 	resp, respErr := c.httpClient.Do(req)
 
 	// check if context deadline exceeded
-	if respErr != nil && strings.Contains(respErr.Error(), "context deadline exceeded") || (resp != nil && http.StatusRequestTimeout == resp.StatusCode) {
-		// retry until max retries reached
+	switch {
+	case respErr != nil && (strings.Contains(respErr.Error(), "context deadline exceeded")):
 		sleepDuration := time.Duration(1) * time.Second
 		for i := 0; i < MAX_CONTEXT_DEADLINE_RETRIES; i++ {
 			// sleep for exponential backoff
 			if i > 0 {
-				sleepDuration = sleepDuration * 2
+				sleepDuration *= 2
 				if sleepDuration > time.Duration(MAX_WAIT_SECONDS)*time.Second {
 					sleepDuration = time.Duration(MAX_WAIT_SECONDS) * time.Second
 				}
@@ -226,13 +226,11 @@ func (c *Client) sendRequest(request *request) (*http.Response, error) {
 				resp = resp2
 				break
 			}
-			respErr = respErr2
 		}
-		if resp == nil {
-			return nil, fmt.Errorf("no response from Keyfactor Command after %d retries", MAX_CONTEXT_DEADLINE_RETRIES)
-		}
-	} else if respErr != nil {
+	case respErr != nil:
 		return nil, respErr
+	case resp == nil:
+		return nil, errors.New("no response from Keyfactor Command")
 	}
 	var stringMessage string
 	if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusNoContent {

v2/api/security.go

@@ -134,20 +134,11 @@ func (c *Client) GetSecurityRoles() ([]GetSecurityRolesResponse, error) {
 		return nil, err
 	}
 
-	//var jsonRespDebug []GetSecurityRolesResponseDebug
-	//var rawInterface interface{}
-	//err = json.NewDecoder(resp.Body).Decode(&rawInterface)
-	//get first element of the array and cast it to a
 	var jsonResp []GetSecurityRolesResponse
 	err = json.NewDecoder(resp.Body).Decode(&jsonResp)
-
 	if err != nil {
 		return nil, err
 	}
-
-	// Convert interface into a slice of GetSecurityRolesResponse
-	//jsonResp = rawInterface.([]GetSecurityRolesResponse)
-
 	return jsonResp, nil
 }