review up

Author: ibodrov

runtime/v2/runner-test/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java

@@ -1761,8 +1761,8 @@ public void prefixedFunctionsInExpressions() throws Exception {
     }
 
     @Test
-    public void maskFunction() throws Exception {
-        deploy("maskFunction");
+    public void sensitiveFunction() throws Exception {
+        deploy("sensitiveFunction");
 
         save(ProcessConfiguration.builder().build());
 

runtime/v2/runner-test/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/maskFunction/concord.yml renamed to runtime/v2/runner-test/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/sensitiveFunction/concord.yml

@@ -2,5 +2,5 @@ flows:
   default:
     - set:
         regularValue: "regularValue"
-        secretValue: "${mask(regularValue)}"
+        secretValue: "${sensitive(regularValue)}"
     - log: "The 'regularValue' is masked now"

runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/el/functions/MaskFunction.java renamed to runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/el/functions/MarkAsSensitiveFunction.java

@@ -27,18 +27,18 @@
 
 import static java.util.Objects.requireNonNull;
 
-public class MaskFunction {
+public class MarkAsSensitiveFunction {
 
     private static SensitiveDataHolder sensitiveData;
 
     @Inject
-    public MaskFunction(SensitiveDataHolder sensitiveData) {
-        MaskFunction.sensitiveData = requireNonNull(sensitiveData);
+    public MarkAsSensitiveFunction(SensitiveDataHolder sensitiveData) {
+        MarkAsSensitiveFunction.sensitiveData = requireNonNull(sensitiveData);
     }
 
     @ELFunction
-    public static String mask(Object v) {
-        if (MaskFunction.sensitiveData == null) {
+    public static String sensitive(Object v) {
+        if (MarkAsSensitiveFunction.sensitiveData == null) {
             throw new IllegalStateException("MaskFunction must be initialized first");
         }
 
@@ -54,6 +54,6 @@ public static String mask(Object v) {
             return s;
         }
 
-        throw new IllegalArgumentException("Only string values can be masked. Got a " + v.getClass());
+        throw new IllegalArgumentException("Only string values can be masked. Got a " + v.getClass() + " instead");
     }
 }

runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/guice/ExpressionSupportModule.java

@@ -84,7 +84,7 @@ public <I> void hear(TypeLiteral<I> type, TypeEncounter<I> encounter) {
         binder.bind(HasVariableFunction.class).asEagerSingleton();
         binder.bind(IsDebugFunction.class).asEagerSingleton();
         binder.bind(IsDryRunFunction.class).asEagerSingleton();
-        binder.bind(MaskFunction.class).asEagerSingleton();
+        binder.bind(MarkAsSensitiveFunction.class).asEagerSingleton();
         binder.bind(OrDefaultFunction.class).asEagerSingleton();
         binder.bind(ThrowFunction.class).asEagerSingleton();
         binder.bind(UuidFunction.class).asEagerSingleton();