Fix: JSON path value assertion needs expression and value

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
grafana · May 17, 2023 · 4c25c8e · 4c25c8e
1 parent 21b9498
commit 4c25c8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/pkg/pb/synthetic_monitoring/checks_extra.go b/pkg/pb/synthetic_monitoring/checks_extra.go
@@ -783,11 +783,13 @@ func (a *MultiHttpEntryAssertion) Validate() error {
 			return ErrInvalidMultiHttpAssertion
 		}
 
-		// Expression is not allowed.
-		if len(a.Expression) != 0 {
+		// Expression is required
+		if len(a.Expression) == 0 {
 			return ErrInvalidMultiHttpAssertion
 		}
 
+		// Condition is covered above
+
 	case MultiHttpEntryAssertionType_JSON_PATH_ASSERTION:
 		// Subject must not be set
 		if a.Subject != 0 {

diff --git a/pkg/pb/synthetic_monitoring/checks_extra_test.go b/pkg/pb/synthetic_monitoring/checks_extra_test.go
@@ -1283,18 +1283,20 @@ func TestMultiHttpEntryAssertionValidate(t *testing.T) {
 		},
 		"json path value with valid value": {
 			input: &MultiHttpEntryAssertion{
-				Type:      MultiHttpEntryAssertionType_JSON_PATH_VALUE,
-				Condition: MultiHttpEntryAssertionConditionVariant_CONTAINS,
-				Value:     "bar",
+				Type:       MultiHttpEntryAssertionType_JSON_PATH_VALUE,
+				Condition:  MultiHttpEntryAssertionConditionVariant_CONTAINS,
+				Expression: "$.data",
+				Value:      "foo",
 			},
 			expectError: false,
 		},
 		"json path value does not allow for setting the subject": {
 			input: &MultiHttpEntryAssertion{
-				Type:      MultiHttpEntryAssertionType_JSON_PATH_VALUE,
-				Subject:   MultiHttpEntryAssertionSubjectVariant_RESPONSE_HEADERS, // invalid
-				Condition: MultiHttpEntryAssertionConditionVariant_CONTAINS,
-				Value:     "bar",
+				Type:       MultiHttpEntryAssertionType_JSON_PATH_VALUE,
+				Subject:    MultiHttpEntryAssertionSubjectVariant_RESPONSE_HEADERS, // invalid
+				Condition:  MultiHttpEntryAssertionConditionVariant_CONTAINS,
+				Expression: "$.data",
+				Value:      "foo",
 			},
 			expectError: true,
 		},