fix: wrong error printed on server error (datreeio#765)

* fix: wrongfully print network error

* test: replace http error with connection refused

Co-authored-by: shalev avhar <shalev@datree.io>

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("http error"),
+				error:  errors.New("connection refused"),
 			},
 		},
 		expected: struct {
@@ -678,7 +678,7 @@ func test_sendEvaluationResult_network_error(offlineMode string, expectedRespons
 			}{
 				status: http.StatusInternalServerError,
 				body:   nil,
-				error:  errors.New("http error"),
+				error:  errors.New("connection refused"),
 			},
 		},
 		expected: struct {

pkg/httpClient/client.go

@@ -78,7 +78,16 @@ func (c *Client) Request(method string, resourceURI string, body interface{}, he
 	}
 
 	if response.StatusCode > 399 {
-		return responseBody, fmt.Errorf("http error: %s", string(b))
+		var errorResponse struct {
+			Message string `json:"message"`
+		}
+
+		err := json.Unmarshal(b, &errorResponse)
+		if err != nil || errorResponse.Message == "" {
+			return responseBody, fmt.Errorf("http error: %s", string(b))
+		}
+
+		return responseBody, fmt.Errorf(errorResponse.Message)
 	}
 
 	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("http error"))
+	return validator.IdentifyNetworkError(errors.New("connection refused"))
 }
 
 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", "http error"}
+	networkErrors := []string{"network error", "connection refused", "no such host", "i/o timeout", "server misbehaving"}
 	return stringInSliceContains(err.Error(), networkErrors) || isUrlErrorType(err)
 }