review up

Author: brig

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

@@ -305,7 +305,7 @@ public Map<String, String> getSensitiveMapStrict(String str) {
             return result;
         }
 
-        @SensitiveData(paths = {"key.top-secret"})
+        @SensitiveData(keys = {"key.top-secret"})
         public Map<String, Object> getSensitiveMapWithPath(String str) {
             Map<String, Object> inner = new LinkedHashMap<>();
             inner.put("top-secret", str);

runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/el/resolvers/SensitiveDataProcessor.java

@@ -61,25 +61,18 @@ public void process(Object value, Method method) {
     }
 
     private void collectFromMap(Map<String, Object> m, SensitiveData a) {
-        // paths
-        if (a.paths() != null && a.paths().length > 0) {
-            for (var p : a.paths()) {
-                var path = p.split("\\.");
+        if (a.keys() != null && a.keys().length > 0) {
+            for (var k : a.keys()) {
+                var path = k.split("\\.");
                 if (ConfigurationUtils.has(m, path)) {
                     var v = ConfigurationUtils.get(m, path);
                     collectValue(v, a);
                 }
             }
-            return;
-        }
-
-        // all keys or specific keys
-        var keys = (a.keys() != null && a.keys().length > 0)
-                ? new HashSet<>(Arrays.asList(a.keys()))
-                : m.keySet();
-
-        for (var key : keys) {
-            collectValue(m.get(key), a);
+        } else {
+            for (var key : m.keySet()) {
+                collectValue(m.get(key), a);
+            }
         }
     }
 

runtime/v2/sdk/src/main/java/com/walmartlabs/concord/runtime/v2/sdk/SensitiveData.java

@@ -51,7 +51,5 @@
 
     String[] keys() default {};
 
-    String[] paths() default {};
-
     boolean includeNestedValues() default false;
 }