Return yaml unmarshal error

config/config.go

@@ -81,6 +81,9 @@ func parseAndValidateConfigBytes(yamlBytes []byte) (config *Config, err error) {
 	yamlBytes = []byte(os.ExpandEnv(string(yamlBytes)))
 	// Parse configuration file
 	err = yaml.Unmarshal(yamlBytes, &config)
+	if err != nil {
+		return
+	}
 	// Check if the configuration file at least has services.
 	if config == nil || config.Services == nil || len(config.Services) == 0 {
 		err = ErrNoServiceInConfig

core/condition.go

@@ -82,7 +82,15 @@ func (c *Condition) evaluate(result *Result) bool {
 	// If the condition isn't a success, return what the resolved condition was too
 	if !success {
 		log.Printf("[Condition][evaluate] Condition '%s' did not succeed because '%s' is false", condition, resolvedCondition)
-		conditionToDisplay = fmt.Sprintf("%s (%s)", condition, resolvedCondition)
+		// Check if the resolved condition was an invalid path
+		isResolvedConditionInvalidPath := strings.ReplaceAll(resolvedCondition, fmt.Sprintf("%s ", InvalidConditionElementSuffix), "") == condition
+		if isResolvedConditionInvalidPath {
+			// Since, in the event of an invalid path, the resolvedCondition contains the condition itself,
+			// we'll only display the resolvedCondition
+			conditionToDisplay = resolvedCondition
+		} else {
+			conditionToDisplay = fmt.Sprintf("%s (%s)", condition, resolvedCondition)
+		}
 	}
 	result.ConditionResults = append(result.ConditionResults, &ConditionResult{Condition: conditionToDisplay, Success: success})
 	return success
@@ -138,7 +146,9 @@ func sanitizeAndResolve(list []string, result *Result) []string {
 				}
 				resolvedElement, resolvedElementLength, err := jsonpath.Eval(strings.Replace(element, fmt.Sprintf("%s.", BodyPlaceHolder), "", 1), result.Body)
 				if err != nil {
-					result.Errors = append(result.Errors, err.Error())
+					if err.Error() != "unexpected end of JSON input" {
+						result.Errors = append(result.Errors, err.Error())
+					}
 					element = fmt.Sprintf("%s %s", element, InvalidConditionElementSuffix)
 				} else {
 					if wantLength {

core/condition_test.go

@@ -113,6 +113,19 @@ func TestCondition_evaluateWithBodyJsonPathComplex(t *testing.T) {
 	}
 }
 
+func TestCondition_evaluateWithInvalidBodyJsonPathComplex(t *testing.T) {
+	expectedResolvedCondition := "[BODY].data.name (INVALID) == john"
+	condition := Condition("[BODY].data.name == john")
+	result := &Result{Body: []byte("{\"data\": {\"id\": 1}}")}
+	condition.evaluate(result)
+	if result.ConditionResults[0].Success {
+		t.Errorf("Condition '%s' should have been a failure, because the path was invalid", condition)
+	}
+	if result.ConditionResults[0].Condition != expectedResolvedCondition {
+		t.Errorf("Condition '%s' should have resolved to '%s', but resolved to '%s' instead", condition, expectedResolvedCondition, result.ConditionResults[0].Condition)
+	}
+}
+
 func TestCondition_evaluateWithBodyJsonPathDoublePlaceholders(t *testing.T) {
 	condition := Condition("[BODY].user.firstName != [BODY].user.lastName")
 	result := &Result{Body: []byte("{\"user\": {\"firstName\": \"john\", \"lastName\": \"doe\"}}")}