fix: handle http response code 4XX/5XX as errors (datreeio#756)

* fix: handle http response code 4XX/5XX as errors

* fix: add http and network errors to IsNetworkError

pkg/cliClient/cliClient_test.go

@@ -519,7 +519,7 @@ func test_requestEvaluationPrerunData_network_error(offlineMode string, expected
 			}{
 				status: http.StatusInternalServerError,
 				body:   nil,
-				error:  errors.New("network error"),
+				error:  errors.New("http error"),
 			},
 		},
 		expected: struct {
@@ -678,7 +678,7 @@ func test_sendEvaluationResult_network_error(offlineMode string, expectedRespons
 			}{
 				status: http.StatusInternalServerError,
 				body:   nil,
-				error:  errors.New("network error"),
+				error:  errors.New("http error"),
 			},
 		},
 		expected: struct {

pkg/httpClient/client.go

@@ -60,45 +60,27 @@ func (c *Client) Request(method string, resourceURI string, body interface{}, he
 	}
 
 	response, err := c.httpClient.Do(request)
+	if response != nil {
+		responseBody.StatusCode = response.StatusCode
+	}
+
 	if err != nil {
 		return responseBody, err
 	}
 
 	defer response.Body.Close()
 
 	b, err := io.ReadAll(response.Body)
+	responseBody.Body = b
+
 	if err != nil {
 		return responseBody, err
 	}
 
-	if response.StatusCode > 500 {
-		responseBody.StatusCode = response.StatusCode
-		return responseBody, fmt.Errorf("network error")
-	}
-
 	if response.StatusCode > 399 {
-		var errorJson map[string]interface{}
-		err = json.Unmarshal(b, &errorJson)
-		if err != nil {
-			return responseBody, err
-		}
-
-		responseBody = Response{
-			StatusCode: response.StatusCode,
-			Body:       b,
-		}
-
-		return responseBody, fmt.Errorf(fmt.Sprintf("%v", errorJson["message"]))
-	}
-
-	if err != nil {
-		return responseBody, err
+		return responseBody, fmt.Errorf("http error: %s", string(b))
 	}
 
-	responseBody = Response{
-		StatusCode: response.StatusCode,
-		Body:       b,
-	}
 	return responseBody, nil
 }
 

pkg/networkValidator/validator_test.go

@@ -59,7 +59,7 @@ func TestNetworkValidatorOtherError(t *testing.T) {
 
 func test_identifyNetworkError_network_error(validator *NetworkValidator, offlineMode string) error {
 	validator.SetOfflineMode(offlineMode)
-	return validator.IdentifyNetworkError(errors.New("network error"))
+	return validator.IdentifyNetworkError(errors.New("http error"))
 }
 
 func test_identifyNoInternet_noSuchHost_network_error(validator *NetworkValidator, offlineMode string) error {

pkg/utils/errors.go

@@ -18,7 +18,7 @@ func ParseErrorToString(err interface{}) string {
 }
 
 func IsNetworkError(err error) bool {
-	networkErrors := []string{"network error", "connection refused", "no such host", "i/o timeout", "server misbehaving"}
+	networkErrors := []string{"network error", "connection refused", "no such host", "i/o timeout", "server misbehaving", "http error"}
 	return stringInSliceContains(err.Error(), networkErrors) || isUrlErrorType(err)
 }