[KOGITO-9810] Supporting nested properties

kiegroup · Sep 14, 2023 · 8df264f · 8df264f
1 parent 402e4cc
commit 8df264f
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 11 deletions.
diff --git a/...less-workflow/kogito-jq-expression/src/main/java/org/kie/kogito/expr/jq/JqExpression.java b/...less-workflow/kogito-jq-expression/src/main/java/org/kie/kogito/expr/jq/JqExpression.java
@@ -28,6 +28,7 @@
 import org.kie.kogito.jackson.utils.JsonObjectUtils;
 import org.kie.kogito.jackson.utils.ObjectMapperFactory;
 import org.kie.kogito.process.expr.Expression;
+import org.kie.kogito.serverless.workflow.utils.ConfigResolverHolder;
 import org.kie.kogito.serverless.workflow.utils.ExpressionHandlerUtils;
 import org.kie.kogito.serverless.workflow.utils.JsonNodeContext;
 import org.slf4j.Logger;
@@ -151,7 +152,7 @@ public void assign(Object target, Object value, KogitoProcessContext context) {
 
     private Scope getScope(KogitoProcessContext processInfo) {
         Scope childScope = Scope.newChildScope(scope.get());
-        childScope.setValue(ExpressionHandlerUtils.SECRET_MAGIC, new FunctionJsonNode(ExpressionHandlerUtils::getSecret));
+        childScope.setValue(ExpressionHandlerUtils.SECRET_MAGIC, JsonObjectUtils.fromValue(ConfigResolverHolder.getConfigResolver().asNestedMap()));
         childScope.setValue(ExpressionHandlerUtils.CONTEXT_MAGIC, new FunctionJsonNode(ExpressionHandlerUtils.getContextFunction(processInfo)));
         childScope.setValue(ExpressionHandlerUtils.CONST_MAGIC, ExpressionHandlerUtils.getConstants(processInfo));
         return childScope;

diff --git a/...ow/kogito-jq-expression/src/test/java/org/kie/kogito/expr/jq/JqExpressionHandlerTest.java b/...ow/kogito-jq-expression/src/test/java/org/kie/kogito/expr/jq/JqExpressionHandlerTest.java
@@ -284,8 +284,7 @@ private static Stream<Arguments> provideMagicWordExpressionsToTest() {
                 Arguments.of("$SECRET.none", "null", getContext()),
                 Arguments.of("\"$SECRET.none\"", "$SECRET.none", getContext()),
                 Arguments.of("$SECRET.lettersonly", "secretlettersonly", getContext()),
-                Arguments.of("$SECRET.dot.secret", "null", getContext()),
-                Arguments.of("$SECRET.\"dot.secret\"", "secretdotsecret", getContext()),
+                Arguments.of("$SECRET.dot.secret", "secretdotsecret", getContext()),
                 Arguments.of("$SECRET.\"dash-secret\"", "secretdashsecret", getContext()),
                 Arguments.of("$CONST.someconstant", "value", getContext()),
                 Arguments.of("$CONST.\"someconstant\"", "value", getContext()),

diff --git a/...ssion/src/main/java/org/kie/kogito/expr/jsonpath/WorkflowJacksonJsonNodeJsonProvider.java b/...ssion/src/main/java/org/kie/kogito/expr/jsonpath/WorkflowJacksonJsonNodeJsonProvider.java
@@ -21,6 +21,8 @@
 import java.util.function.Function;
 
 import org.kie.kogito.internal.process.runtime.KogitoProcessContext;
+import org.kie.kogito.jackson.utils.JsonObjectUtils;
+import org.kie.kogito.serverless.workflow.utils.ConfigResolverHolder;
 import org.kie.kogito.serverless.workflow.utils.ExpressionHandlerUtils;
 
 import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
@@ -40,7 +42,7 @@ public Object getMapValue(Object obj, String key) {
         } else {
             switch (key) {
                 case "$" + ExpressionHandlerUtils.SECRET_MAGIC:
-                    return (Function<String, Object>) ExpressionHandlerUtils::getSecret;
+                    return JsonObjectUtils.fromValue(ConfigResolverHolder.getConfigResolver().asNestedMap());
                 case "$" + ExpressionHandlerUtils.CONTEXT_MAGIC:
                     return ExpressionHandlerUtils.getContextFunction(context);
                 case "$" + ExpressionHandlerUtils.CONST_MAGIC:

diff --git a/...-expression/src/test/java/org/kie/kogito/expr/jsonpath/JsonPathExpressionHandlerTest.java b/...-expression/src/test/java/org/kie/kogito/expr/jsonpath/JsonPathExpressionHandlerTest.java
@@ -238,9 +238,7 @@ private static Stream<Arguments> provideMagicWordExpressionsToTest() {
         return Stream.of(
                 Arguments.of("$WORKFLOW.instanceId", "1111-2222-3333", getContext()),
                 Arguments.of("$SECRET.lettersonly", "secretlettersonly", getContext()),
-                Arguments.of("$SECRET.none", "null", getContext()),
-                //                Arguments.of("$SECRET.dot.secret", "null", getContext()), // exception due to missing object at path .dot
-                Arguments.of("$SECRET[\"dot.secret\"]", "secretdotsecret", getContext()),
+                Arguments.of("$SECRET.dot.secret", "secretdotsecret", getContext()),
                 Arguments.of("$SECRET[\"dash-secret\"]", "secretdashsecret", getContext()),
                 Arguments.of("$CONST.someconstant", "value", getContext()),
                 Arguments.of("$CONST[\"someconstant\"]", "value", getContext()),

diff --git a/...in/java/org/kie/kogito/serverless/workflow/workitemparams/ExpressionWorkItemResolver.java b/...in/java/org/kie/kogito/serverless/workflow/workitemparams/ExpressionWorkItemResolver.java
@@ -57,7 +57,7 @@ private JsonNode transform(JsonNode node, Object inputModel, KogitoProcessContex
             }
             return expr.isValid() ? expr.eval(inputModel, JsonNode.class, context) : node;
         } catch (Exception ex) {
-            logger.info("Error evaluating expression, returning original text {}", node);
+            logger.info("Error {} evaluating expression}, returning original text {}", ex.getMessage(), expr.asString(), node);
             return node;
         }
     }

diff --git a/...workflow-utils/src/main/java/org/kie/kogito/serverless/workflow/utils/ConfigResolver.java b/...workflow-utils/src/main/java/org/kie/kogito/serverless/workflow/utils/ConfigResolver.java
@@ -31,6 +31,24 @@ public interface ConfigResolver {
 
     <T> Collection<T> getIndexedConfigProperty(String name, Class<T> clazz);
 
+    default Map<String, Object> asNestedMap() {
+        Map<String, Object> map = new HashMap<>();
+        for (String name : getPropertyNames()) {
+            Optional<String> value = getConfigProperty(name, String.class);
+            if (value.isPresent()) {
+                String[] parts = name.split("\\.");
+                Map<String, Object> localMap = map;
+                for (int i = 0; i < parts.length - 1; i++) {
+                    Map<String, Object> newMap = new HashMap<>();
+                    localMap.put(parts[i], newMap);
+                    localMap = newMap;
+                }
+                localMap.put(parts[parts.length - 1], value.orElseThrow());
+            }
+        }
+        return map;
+    }
+
     default Map<String, Object> asMap() {
         Map<String, Object> map = new HashMap<>();
         for (String name : getPropertyNames()) {

diff --git a/...-utils/src/main/java/org/kie/kogito/serverless/workflow/utils/ExpressionHandlerUtils.java b/...-utils/src/main/java/org/kie/kogito/serverless/workflow/utils/ExpressionHandlerUtils.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.jbpm.ruleflow.core.Metadata;
@@ -54,7 +55,11 @@ public static JsonNode getConstants(KogitoProcessContext context) {
     }
 
     public static String getSecret(String key) {
-        return ConfigResolverHolder.getConfigResolver().getConfigProperty(key, String.class).orElse(null);
+        return getProperty(key).orElse(null);
+    }
+
+    private static Optional<String> getProperty(String key) {
+        return ConfigResolverHolder.getConfigResolver().getConfigProperty(key, String.class);
     }
 
     public static Function<String, Object> getContextFunction(KogitoProcessContext context) {

diff --git a/...to-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties b/...to-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
@@ -67,7 +67,7 @@ mp.messaging.incoming.event2Exclusive.path=/event2Exclusive
 mp.messaging.incoming.event3Exclusive.connector=quarkus-http
 mp.messaging.incoming.event3Exclusive.path=/event3Exclusive
 
-my_name=javierito
+expression.my_name=javierito
 
 # Kafka configuration for the sw tests that produce events
 mp.messaging.outgoing.kogito_outgoing_stream.connector=smallrye-kafka

diff --git a/...kogito-quarkus-serverless-workflow-integration-test/src/main/resources/expression.sw.json b/...kogito-quarkus-serverless-workflow-integration-test/src/main/resources/expression.sw.json
@@ -29,7 +29,7 @@
     {
       "name": "secretMessage",
       "type": "expression",
-      "operation": ".message |= \"my name is \"+$SECRET.my_name"
+      "operation": ".message |= \"my name is \"+$SECRET.expression.my_name"
     },
     {
       "name": "constantMessage",

diff --git a/...uarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolver.java b/...uarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolver.java
@@ -25,13 +25,17 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.kie.kogito.serverless.workflow.utils.ConfigResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.quarkus.runtime.Startup;
 import io.smallrye.config.SecretKeys;
 
 @Startup
 public class QuarkusConfigResolver implements ConfigResolver {
 
+    private static Logger logger = LoggerFactory.getLogger(QuarkusConfigResolver.class);
+
     private Config config;
 
     public QuarkusConfigResolver() {
@@ -45,6 +49,9 @@ public <T> Optional<T> getConfigProperty(String key, Class<T> clazz) {
         } catch (SecurityException ex) {
             // see https://smallrye.io/docs/smallrye-config/config/secret-keys.html
             return SecretKeys.doUnlocked(() -> config.getOptionalValue(key, clazz));
+        } catch (IllegalArgumentException ex) {
+            logger.info("Error {} retrieving key {}", ex.getMessage(), key);
+            return Optional.empty();
         }
     }