Clean up expression error messages, allow - in json pointer in condit…

…ional expressions Signed-off-by: Taylor Gray <[email protected]>
opensearch-project · Oct 17, 2024 · 22301fe · 22301fe
1 parent dce5388
commit 22301fe
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 8 deletions.
diff --git a/data-prepper-expression/src/main/antlr/DataPrepperExpression.g4 b/data-prepper-expression/src/main/antlr/DataPrepperExpression.g4
@@ -226,7 +226,7 @@ JsonPointerCharacters
 
 fragment
 JsonPointerCharacter
-    : [A-Za-z0-9_.@]
+    : [A-Za-z0-9_.@\-]
     ;
 
 EscapedJsonPointer

diff --git a/.../main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessor.java b/.../main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessor.java
@@ -81,7 +81,9 @@ public AggregateProcessor(final AggregateProcessorConfig aggregateProcessorConfi
         pluginMetrics.gauge(CURRENT_AGGREGATE_GROUPS, aggregateGroupManager, AggregateGroupManager::getAllGroupsSize);
 
         if (aggregateProcessorConfig.getWhenCondition() != null && (!expressionEvaluator.isValidExpressionStatement(aggregateProcessorConfig.getWhenCondition()))) {
-            throw new InvalidPluginConfigurationException("aggregate_when {} is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax");
+            throw new InvalidPluginConfigurationException(
+                    String.format("aggregate_when \"%s\" is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax",
+                            aggregateProcessorConfig.getWhenCondition()));
         }
     }
 

diff --git a/...cessor/src/main/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessor.java b/...cessor/src/main/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessor.java
@@ -67,7 +67,9 @@ public DateProcessor(PluginMetrics pluginMetrics, final DateProcessorConfig date
             extractKeyAndFormatters();
 
         if (dateProcessorConfig.getDateWhen() != null && (!expressionEvaluator.isValidExpressionStatement(dateProcessorConfig.getDateWhen()))) {
-            throw new InvalidPluginConfigurationException("date_when {} is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax");
+            throw new InvalidPluginConfigurationException(
+                    String.format("date_when \"%s\" is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax",
+                            dateProcessorConfig.getDateWhen()));
         }
     }
 

diff --git a/.../src/main/java/org/opensearch/dataprepper/plugins/processor/dissect/DissectProcessor.java b/.../src/main/java/org/opensearch/dataprepper/plugins/processor/dissect/DissectProcessor.java
@@ -52,7 +52,9 @@ public DissectProcessor(PluginMetrics pluginMetrics, final DissectProcessorConfi
 
         if (dissectConfig.getDissectWhen() != null &&
                 (!expressionEvaluator.isValidExpressionStatement(dissectConfig.getDissectWhen()))) {
-            throw new InvalidPluginConfigurationException("dissect_when {} is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax");
+            throw new InvalidPluginConfigurationException(
+                    String.format("dissect_when \"%s\" is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax",
+                            dissectConfig.getDissectWhen()));
         }
 
     }

diff --git a/.../src/main/java/org/opensearch/dataprepper/plugins/processor/flatten/FlattenProcessor.java b/.../src/main/java/org/opensearch/dataprepper/plugins/processor/flatten/FlattenProcessor.java
@@ -45,7 +45,9 @@ public FlattenProcessor(final PluginMetrics pluginMetrics, final FlattenProcesso
 
         if (config.getFlattenWhen() != null &&
                 (!expressionEvaluator.isValidExpressionStatement(config.getFlattenWhen()))) {
-            throw new InvalidPluginConfigurationException("flatten_when {} is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax");
+            throw new InvalidPluginConfigurationException(
+                    String.format("flatten_when \"%s\" is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax",
+                            config.getFlattenWhen()));
         }
     }
 

diff --git a/...ssor/src/main/java/org/opensearch/dataprepper/plugins/geoip/processor/GeoIPProcessor.java b/...ssor/src/main/java/org/opensearch/dataprepper/plugins/geoip/processor/GeoIPProcessor.java
@@ -78,7 +78,9 @@ public GeoIPProcessor(final PluginMetrics pluginMetrics,
 
     if (geoIPProcessorConfig.getWhenCondition() != null &&
             (!expressionEvaluator.isValidExpressionStatement(geoIPProcessorConfig.getWhenCondition()))) {
-      throw new InvalidPluginConfigurationException("geoip_when {} is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax");
+      throw new InvalidPluginConfigurationException(
+              String.format("geoip_when \"%s\" is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax",
+                      geoIPProcessorConfig.getWhenCondition()));
     }
 
     this.geoIPProcessorService = geoIpConfigSupplier.getGeoIPProcessorService().orElseThrow(() ->

diff --git a/...cessor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java b/...cessor/src/main/java/org/opensearch/dataprepper/plugins/processor/grok/GrokProcessor.java
@@ -123,7 +123,9 @@ public GrokProcessor(final PluginMetrics pluginMetrics,
 
         if (grokProcessorConfig.getGrokWhen() != null &&
                 (!expressionEvaluator.isValidExpressionStatement(grokProcessorConfig.getGrokWhen()))) {
-            throw new InvalidPluginConfigurationException("grok_when {} is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax");
+            throw new InvalidPluginConfigurationException(
+                    String.format("grok_when \"%s\" is not a valid expression statement. See https://opensearch.org/docs/latest/data-prepper/pipelines/expression-syntax/ for valid expression syntax",
+                            grokProcessorConfig.getGrokWhen()));
         }
     }
 

diff --git a/...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java
@@ -244,7 +244,8 @@ public static IndexConfiguration readIndexConfig(final PluginSetting pluginSetti
 
         builder = builder.withVersionExpression(versionExpression);
         if (versionExpression != null && (!expressionEvaluator.isValidFormatExpression(versionExpression))) {
-            throw new InvalidPluginConfigurationException("document_version {} is not a valid format expression.");
+            throw new InvalidPluginConfigurationException(
+                    String.format("document_version \"%s\" is not a valid format expression.", versionExpression));
         }
 
         builder = builder.withVersionType(versionType);