fix: add schema validation for cel expression testing (#5761)

Author: wolf4ood

extensions/common/api/management-api-schema-validator/src/main/java/org/eclipse/edc/connector/api/management/schema/ManagementApiSchemaValidatorExtension.java

@@ -31,6 +31,7 @@
 import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CATALOG_ASSET;
 import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CATALOG_REQUEST;
 import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CEL_EXPRESSION;
+import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CEL_EXPRESSION_TEST_REQUEST;
 import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CONTRACT_AGREEMENT;
 import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CONTRACT_DEFINITION;
 import static org.eclipse.edc.api.management.schema.ManagementApiJsonSchema.V4.CONTRACT_NEGOTIATION;
@@ -73,6 +74,7 @@
 import static org.eclipse.edc.participantcontext.spi.config.model.ParticipantContextConfiguration.PARTICIPANT_CONTEXT_CONFIG_TYPE_TERM;
 import static org.eclipse.edc.participantcontext.spi.types.ParticipantContext.PARTICIPANT_CONTEXT_TYPE_TERM;
 import static org.eclipse.edc.policy.cel.model.CelExpression.CEL_EXPRESSION_TYPE_TERM;
+import static org.eclipse.edc.policy.cel.model.CelExpressionTestRequest.CEL_EXPRESSION_TEST_REQUEST_TYPE_TERM;
 import static org.eclipse.edc.policy.engine.spi.plan.PolicyEvaluationPlan.EDC_POLICY_EVALUATION_PLAN_TYPE_TERM;
 import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
 import static org.eclipse.edc.spi.query.QuerySpec.EDC_QUERY_SPEC_TYPE_TERM;
@@ -116,6 +118,7 @@ public class ManagementApiSchemaValidatorExtension implements ServiceExtension {
             put(PARTICIPANT_CONTEXT_TYPE_TERM, PARTICIPANT_CONTEXT);
             put(PARTICIPANT_CONTEXT_CONFIG_TYPE_TERM, PARTICIPANT_CONTEXT_CONFIG);
             put(CEL_EXPRESSION_TYPE_TERM, CEL_EXPRESSION);
+            put(CEL_EXPRESSION_TEST_REQUEST_TYPE_TERM, CEL_EXPRESSION_TEST_REQUEST);
             put("AssociateDataspaceProfile", ASSOCIATE_DATASPACE_PROFILE_CONTEXT);
         }
     };

extensions/common/api/management-api-schema-validator/src/main/resources/schema/management/v4/cel-expression-test-request-schema.json

@@ -29,7 +29,14 @@
           "type": "string"
         },
         "rightOperand": {
-          "type": "object"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object"
+            }
+          ]
         },
         "params": {
           "type": "object"

system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/v5/CelExpressionApiV5EndToEndTest.java

@@ -443,6 +443,26 @@ void test_evaluationError(ManagementEndToEndV5TestContext context) {
                     .body("error", containsString("key 'agent' is not present in map"))
                     .body("evaluationResult", nullValue());
         }
+
+        @Test
+        void test_validationError(ManagementEndToEndV5TestContext context) {
+            var requestBody = createObjectBuilder()
+                    .add(CONTEXT, jsonLdContext())
+                    .add(TYPE, "CelExpressionTestRequest")
+                    .build();
+
+            context.baseRequest(adminToken)
+                    .body(requestBody.toString())
+                    .contentType(JSON)
+                    .post("/v5beta/celexpressions/test")
+                    .then()
+                    .statusCode(400)
+                    .log().ifError()
+                    .body("[0].message", containsString("required property 'leftOperand' not found"))
+                    .body("[1].message", containsString("required property 'expression' not found"))
+                    .body("[2].message", containsString("required property 'rightOperand' not found"))
+                    .body("[3].message", containsString("required property 'operator' not found"));
+        }
     }
 
     @Nested