RUN-660: Add new feature to the plugin so that it can capture multiple key-value pairs for each matched line

Author: carlosrfranco

src/main/groovy/com/rundeck/plugin/DataKeyFilterMultiLines.groovy

@@ -50,6 +50,14 @@ See the [Java Pattern](https://docs.oracle.com/javase/8/docs/api/java/util/regex
     )
     Boolean hideOutput
 
+    @PluginProperty(
+            title = 'Capture multiple values',
+            description = '''If true, each line is scanned separately to match the regex, capturing multiple key/value pairs. 
+If it just capture one group, each matched value will be added for the same key''',
+            defaultValue = 'false'
+    )
+    Boolean captureMultipleKeysValues
+
     @PluginProperty(
             title = 'Log Data',
             description = '''If true, log the captured data''',
@@ -87,7 +95,11 @@ See the [Java Pattern](https://docs.oracle.com/javase/8/docs/api/java/util/regex
     @Override
     void handleEvent(final PluginLoggingContext context, final LogEventControl event) {
         if (event.eventType == 'log' && event.loglevel == LogLevel.NORMAL && event.message?.length() > 0) {
-            buffer.append(event.message).append(System.getProperty("line.separator"))
+            if(captureMultipleKeysValues){
+                extractKeyValue(event.message)
+            } else {
+                buffer.append(event.message).append(System.getProperty("line.separator"))
+            }
 
             if(hideOutput){
                 event.loglevel = LogLevel.DEBUG
@@ -98,30 +110,12 @@ See the [Java Pattern](https://docs.oracle.com/javase/8/docs/api/java/util/regex
 
     @Override
     void complete(final PluginLoggingContext context) {
-
         if(buffer.size()>0){
-            Matcher match = dataPattern.matcher(buffer.toString())
-
-            if (match.matches()) {
-                def key,value
-
-                if(match.groupCount()>0){
-                    if(match.groupCount()==1 && name){
-                        key = name
-                        value = match.group(1)
-                    }else {
-                        if(match.groupCount()>1){
-                            key = match.group(1)
-                            value = match.group(2)
-                        }
-                    }
+            extractKeyValue(buffer.toString())
+        }
 
-                    if (key && value) {
-                        allData[key] = value
-                        outputContext.addOutput("data", key, value)
-                    }
-                }
-            }
+        if(!allData.isEmpty()){
+            allData.each {outputContext.addOutput("data", it.getKey(), it.getValue())}
 
             if (logData) {
                 context.log(
@@ -134,6 +128,33 @@ See the [Java Pattern](https://docs.oracle.com/javase/8/docs/api/java/util/regex
                 )
             }
         }
+    }
+
+    private void extractKeyValue(String output){
+        Matcher match = dataPattern.matcher(output)
+
+        if (match.matches()) {
+            def key,value
+
+            if(match.groupCount()>0){
+                if(match.groupCount()==1 && name){
+                    key = name
+                    value = match.group(1)
+                }else {
+                    if(match.groupCount()>1){
+                        key = match.group(1)
+                        value = match.group(2)
+                    }
+                }
 
+                if (key && value) {
+                    if(allData[key]) {
+                        allData[key] += "\n$value"
+                    } else {
+                        allData[key] = value
+                    }
+                }
+            }
+        }
     }
 }

src/test/groovy/com/rundeck/plugin/DataKeyFilterMultiLinesSpec.groovy

@@ -120,4 +120,64 @@ class DataKeyFilterMultiLinesSpec extends Specification {
                                                          '',
                                                          'done']  | null
     }
+
+    @Unroll
+    def "multiline-filter-multiple-key-value-pairs"() {
+        given:
+        def plugin = new DataKeyFilterMultiLines()
+        plugin.regex = regex
+        plugin.logData = dolog
+        plugin.name = name
+        plugin.captureMultipleKeysValues = true
+        def sharedoutput = new DataOutput(ContextView.global())
+        def context = Mock(PluginLoggingContext) {
+            getOutputContext() >> sharedoutput
+        }
+        def events = []
+        lines.each { line ->
+            events << Mock(LogEventControl) {
+                getMessage() >> line
+                getEventType() >> 'log'
+                getLoglevel() >> LogLevel.NORMAL
+            }
+        }
+        when:
+        plugin.init(context)
+        events.each {
+            plugin.handleEvent(context, it)
+        }
+        plugin.complete(context)
+        then:
+
+        sharedoutput.getSharedContext().getData(ContextView.global())?.getData() == (expect ? ['data': expect] : null)
+        if (expect) {
+            if (dolog) {
+                1 * context.log(2, _, _)
+            } else {
+                0 * context.log(*_)
+            }
+        }
+
+
+        where:
+        dolog | name | regex                         | lines    | expect
+        true  | null | "(\\w+)\\s(\\d+)" | ['hello 1',
+                                                        'world 2',
+                                                        'test 456',
+                                                        '',
+                                                        'done'] | [test: "456", hello: "1", world: "2"]
+
+
+        true  | "any_name" | "(\\w+\\s\\d+)" | ['hello 1',
+                                            'world 2',
+                                            'test 456',
+                                            '',
+                                            'done'] | ["any_name": "hello 1\nworld 2\ntest 456"]
+
+        true  | null | "(\\w+\\s\\d+)" | ['hello 1',
+                                            'world 2',
+                                            'test 456',
+                                            '',
+                                            'done'] | null
+    }
 }