FIX: include route validation error into collector (#5332)

* MAINT: include route validation error into collector Signed-off-by: George Chen <[email protected]>
opensearch-project · Jan 14, 2025 · 5f51c2b · 5f51c2b
1 parent 9b07d40
commit 5f51c2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...repper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java b/...repper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java
@@ -176,10 +176,6 @@ private void buildPipelineFromConfiguration(
                     .map(this::buildRoutedSinkOrConnector)
                     .collect(Collectors.toList());
 
-            final List<PluginError> subPipelinePluginErrors = pluginErrorCollector.getPluginErrors()
-                    .stream().filter(pluginError -> pipelineName.equals(pluginError.getPipelineName()))
-                    .collect(Collectors.toList());
-
             final List<PluginError> invalidRouteExpressions = pipelineConfiguration.getRoutes()
                     .stream().filter(route -> !expressionEvaluator.isValidExpressionStatement(route.getCondition()))
                     .map(route -> PluginError.builder()
@@ -190,8 +186,12 @@ private void buildPipelineFromConfiguration(
                             .build())
                     .collect(Collectors.toList());
 
-            if (!subPipelinePluginErrors.isEmpty() || !invalidRouteExpressions.isEmpty()) {
-                subPipelinePluginErrors.addAll(invalidRouteExpressions);
+            invalidRouteExpressions.forEach(pluginErrorCollector::collectPluginError);
+            final List<PluginError> subPipelinePluginErrors = pluginErrorCollector.getPluginErrors()
+                    .stream().filter(pluginError -> pipelineName.equals(pluginError.getPipelineName()))
+                    .collect(Collectors.toList());
+
+            if (!subPipelinePluginErrors.isEmpty()) {
                 pluginErrorsHandler.handleErrors(subPipelinePluginErrors);
                 throw new InvalidPluginConfigurationException(
                         String.format("One or more plugins are not configured correctly in the pipeline: %s.\n",

diff --git a/...r-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java b/...r-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java
@@ -396,6 +396,7 @@ void parseConfiguration_with_invalid_route_expressions_handles_errors_and_return
         final Collection<PluginError> pluginErrorCollection = pluginErrorArgumentCaptor.getValue();
         assertThat(pluginErrorCollection, notNullValue());
         assertThat(pluginErrorCollection.size(), equalTo(1));
+        assertThat(pluginErrorCollector.getPluginErrors(), equalTo(pluginErrorCollection));
 
         final PluginError pluginError = pluginErrorCollection.stream().findAny().orElseThrow();
         final String expectedErrorMessage = String.format(CONDITIONAL_ROUTE_INVALID_EXPRESSION_FORMAT, "service", "/value == service");