grabber up

Author: brig

plugins/tasks/input-params-assert/src/main/java/com/walmartlabs/concord/plugins/input/parser/CommentParser.java

@@ -24,10 +24,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class CommentParser {
 
@@ -36,7 +33,7 @@ public class CommentParser {
 
     private static final ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
 
-    private static final Set<String> keys = Set.of("in:", "out:");
+    private static final Set<String> keys = new HashSet<>(Arrays.asList("in:", "out:"));
 
     @SuppressWarnings("unchecked")
     public FlowDefinition parse(List<String> commentLines) {
@@ -82,7 +79,7 @@ public Map<String, Object> parseFields(List<String> commentLines) {
             }
         }
 
-        StringBuilder inOut =  new StringBuilder();
+        StringBuilder inOut = new StringBuilder();
         for (int i = keyIndex; i < commentLines.size(); i++) {
             String line = trimStartChar(commentLines.get(i).trim(), '#');
             inOut.append(line).append('\n');

plugins/tasks/input-params-assert/src/main/java/com/walmartlabs/concord/plugins/input/parser/CommentsGrabber.java

@@ -34,25 +34,45 @@ public class CommentsGrabber {
     public Map<String, List<String>> grab(Path file) {
         Map<String, List<String>> result = new LinkedHashMap<>();
         try (BufferedReader reader = Files.newBufferedReader(file)) {
-            int lineNum = findKey(reader, "flows:");
-            if (lineNum == -1) {
+            String flowsLine = findKey(reader, "flows:");
+            if (flowsLine == null) {
                 return result;
             }
 
+            int flowsIndent = getIndentLevel(flowsLine);
+
+            int flowNameIndent = -1;
             List<String> lines = new ArrayList<>();
             String line;
             while ((line = reader.readLine()) != null) {
-                if (isNewYamlBlock(line)) {
-                    break;
-                } else if (line.trim().startsWith("#")) {
+                if (line.trim().isEmpty()) {
+                    continue;
+                }
+
+                if (line.trim().startsWith("#")) {
                     lines.add(line);
-                } else if (isFlowName(line)) {
+                    continue;
+                }
+
+                int lineIndentLevel = getIndentLevel(line);
+                if (lineIndentLevel <= flowsIndent) {
+                    // another tag (e.g. profiles ...)
+                    break;
+                }
+
+                if (flowNameIndent < 0) {
+                    flowNameIndent = lineIndentLevel;
+                }
+
+                if (flowNameIndent == lineIndentLevel) {
                     if (!lines.isEmpty()) {
                         line = line.trim();
                         String flowName = line.substring(0, line.length() - 1);
                         result.put(flowName, new ArrayList<>(lines));
                         lines.clear();
                     }
+                } else {
+                    lines.clear();
                 }
             }
 
@@ -62,31 +82,23 @@ public Map<String, List<String>> grab(Path file) {
         }
     }
 
-    private static int findKey(BufferedReader reader, String key) throws IOException {
+    private static String findKey(BufferedReader reader, String key) throws IOException {
         String line;
-        int lineNum = 0;
         while ((line = reader.readLine()) != null) {
-            lineNum++;
             if (key.equals(line.trim())) {
-                return lineNum;
+                return line;
             }
         }
-        return -1;
+        return null;
     }
 
-    private static boolean isNewYamlBlock(String line) {
-        if (line.trim().isEmpty() || line.trim().startsWith("#")) {
-            return false;
-        }
-
-        return !Character.isWhitespace(line.charAt(0));
-    }
+    private static int getIndentLevel(String line) {
+        int count = 0;
 
-    private static boolean isFlowName(String line) {
-        if (line.trim().isEmpty() || line.trim().startsWith("#")) {
-            return false;
+        while (count < line.length() && Character.isWhitespace(line.charAt(count))) {
+            count++;
         }
 
-        return Character.isWhitespace(line.charAt(0));
+        return count;
     }
 }

plugins/tasks/input-params-assert/src/test/java/com/walmartlabs/concord/plugins/input/parser/CommentsGrabberTest.java

@@ -0,0 +1,68 @@
+package com.walmartlabs.concord.plugins.input.parser;
+
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2023 Walmart Inc.
+ * -----
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =====
+ */
+
+import com.walmartlabs.concord.plugins.input.FlowCallSchemaGeneratorTest;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class CommentsGrabberTest {
+
+    @Test
+    public void test1() throws Exception {
+        Map<String, List<String>> result = new CommentsGrabber().grab(readResource("grabber/001.concord.yaml"));
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    public void test2() throws Exception {
+        Map<String, List<String>> result = new CommentsGrabber().grab(readResource("grabber/002.concord.yaml"));
+
+        assertEquals(1, result.size());
+        assertNotNull(result.get("test"));
+        assertEquals(4, result.get("test").size());
+    }
+
+    @Test
+    public void test3() throws Exception {
+        Map<String, List<String>> result = new CommentsGrabber().grab(readResource("grabber/003.concord.yaml"));
+
+        assertEquals(1, result.size());
+        assertNotNull(result.get("test"));
+        assertEquals(5, result.get("test").size());
+    }
+
+    private static Path readResource(String name) throws Exception {
+        URL url = FlowCallSchemaGeneratorTest.class.getResource(name);
+        if (url == null) {
+            throw new RuntimeException("Resource '" + name + "' not found");
+        }
+
+        return Paths.get(url.toURI());
+    }
+}

plugins/tasks/input-params-assert/src/test/java/com/walmartlabs/concord/plugins/input/parser/ParamDefinitionParserTest.java

@@ -25,6 +25,8 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,7 +44,7 @@ public void testParse_withSingleSimpleParam() {
 
         Map<String, ParamDefinition> result = ParamDefinitionParser.parse(toMap(input));
 
-        assertEquals(Map.of("stringParam", expected), result);
+        assertEquals(Collections.singletonMap("stringParam", expected), result);
     }
 
     @Test
@@ -65,7 +67,11 @@ public void testParse_withTwoSimpleParam() {
 
         Map<String, ParamDefinition> result = ParamDefinitionParser.parse(toMap(input));
 
-        assertEquals(Map.of("stringParam", expectedString, "booleanParam", expectedBoolean), result);
+        Map<String, Object> expected = new HashMap<>();
+        expected.put("stringParam", expectedString);
+        expected.put("booleanParam", expectedBoolean);
+
+        assertEquals(expected, result);
     }
 
     @Test
@@ -87,7 +93,11 @@ public void testParse_withComplexParam() {
 
         Map<String, ParamDefinition> result = ParamDefinitionParser.parse(toMap(input));
 
-        assertEquals(Map.of("objectParam", expected, "objectParam.stringParam", expectedValue), result);
+        Map<String, Object> expectedResult = new HashMap<>();
+        expectedResult.put("objectParam", expected);
+        expectedResult.put("objectParam.stringParam", expectedValue);
+
+        assertEquals(expectedResult, result);
     }
 
     @Test
@@ -109,7 +119,11 @@ public void testParse_withArrayType() {
 
         Map<String, ParamDefinition> result = ParamDefinitionParser.parse(toMap(input));
 
-        assertEquals(Map.of("arrayParam", expected, "arrayParam.stringParam", expectedValue), result);
+        Map<String, Object> expectedResult = new HashMap<>();
+        expectedResult.put("arrayParam", expected);
+        expectedResult.put("arrayParam.stringParam", expectedValue);
+
+        assertEquals(expectedResult, result);
     }
 
     private static final TypeReference<Map<String, String>> MAP_TYPE = new TypeReference<Map<String, String>>() {

plugins/tasks/input-params-assert/src/test/resources/com/walmartlabs/concord/plugins/input/grabber/001.concord.yaml

@@ -0,0 +1,13 @@
+  configuration:
+    runtime: concord-v2
+    dependencies:
+      - "mvn://com.walmartlabs.concord.plugins.basic:input-params-assert:1.102.1-SNAPSHOT"
+    arguments:
+      param1: "global"
+
+  flows:
+    default:
+      - call: test
+        in:
+          #        param2: true
+          additionalParam: "value"

plugins/tasks/input-params-assert/src/test/resources/com/walmartlabs/concord/plugins/input/grabber/002.concord.yaml

@@ -0,0 +1,20 @@
+  configuration:
+    runtime: concord-v2
+    dependencies:
+      - "mvn://com.walmartlabs.concord.plugins.basic:input-params-assert:1.102.1-SNAPSHOT"
+    arguments:
+      param1: "global"
+
+  flows:
+    default:
+      - call: test
+        in:
+          param2: true
+          additionalParam: "value"
+
+    ##
+    #  in:
+    #    param1: string, optional, boo
+    ##
+    test:
+      - log: "me"

plugins/tasks/input-params-assert/src/test/resources/com/walmartlabs/concord/plugins/input/grabber/003.concord.yaml

@@ -0,0 +1,22 @@
+configuration:
+  runtime: concord-v2
+  debug: true
+  dependencies:
+    - "mvn://com.walmartlabs.concord.plugins.basic:input-params-assert:1.102.1-SNAPSHOT"
+  arguments:
+    param1: "global"
+
+flows:
+  default:
+    - call: test
+      in:
+        #        param2: true
+        additionalParam: "value"
+
+  ##
+  #  in:
+  #    param1: string, mandatory, param1 description
+  #    param2: boolean, mandatory, param2 description
+  ##
+  test:
+    - log: "in test"