write CLIHelper Test

Author: mtoffl01

components/cli/src/main/java/datadog.cli/CLIHelper.java

@@ -131,59 +131,43 @@ public static Map<String, List<String>> parseJvmArgs(List<String> args) {
 
       // Handle system properties (-Dkey=value)
       if (arg.startsWith("-D")) {
-        int equalsIndex = arg.indexOf('=');
-        if (equalsIndex >= 0) {
-          String key = arg.substring(0, equalsIndex);
-          String value = arg.substring(equalsIndex + 1);
-          parsedArgs.computeIfAbsent(key, k -> new ArrayList<>()).add(value);
-        } else {
-          parsedArgs.computeIfAbsent(arg, k -> new ArrayList<>()).add(null);
-        }
+        addEntryToMap('=', arg, parsedArgs);
         continue;
       }
 
       // Handle -XX flags
       if (arg.startsWith("-XX:")) {
         // -XX flags can have values after = (like -XX:MaxMetaspaceSize=128m)
-        int equalsIndex = arg.indexOf('=');
-        if (equalsIndex >= 0) {
-          String key = arg.substring(0, equalsIndex);
-          String value = arg.substring(equalsIndex + 1);
-          parsedArgs.computeIfAbsent("-XX:" + key, k -> new ArrayList<>()).add(value);
-        } else {
-          parsedArgs.computeIfAbsent(arg, k -> new ArrayList<>()).add(null);
-        }
+        addEntryToMap('=', arg, parsedArgs);
+        continue;
       }
 
       // Handle -javaagent
       if (arg.startsWith("-javaagent:")) {
-        String keyValue = arg.substring(11); // Remove "-javaagent:" prefix
-        int equalsIndex = keyValue.indexOf('=');
-        if (equalsIndex >= 0) {
-          String key = keyValue.substring(0, equalsIndex);
-          String value = keyValue.substring(equalsIndex + 1);
-          parsedArgs.computeIfAbsent("-javaagent:" + key, k -> new ArrayList<>()).add(value);
-        } else {
-          parsedArgs.computeIfAbsent(arg, k -> new ArrayList<>()).add(null);
-        }
+        addEntryToMap(':', arg, parsedArgs);
         continue;
       }
 
       // Handle other flags that might have values
       // Note that -X flags will not be parsed into key-vals; they'll be caught by the value-less
       // case and stored as a key. Therefore, duplicate keys are not supported for -X flags
       if (arg.startsWith("-")) {
-        int equalsIndex = arg.indexOf('=');
-        if (equalsIndex >= 0) {
-          String key = arg.substring(0, equalsIndex);
-          String value = arg.substring(equalsIndex + 1);
-          parsedArgs.computeIfAbsent(key, k -> new ArrayList<>()).add(value);
-        } else {
-          parsedArgs.computeIfAbsent(arg, k -> new ArrayList<>()).add(null);
-        }
+        addEntryToMap('=', arg, parsedArgs);
       }
     }
 
     return parsedArgs;
   }
+
+  private static void addEntryToMap(
+      char equalsOperator, String arg, Map<String, List<String>> parsedArgs) {
+    int equalsIndex = arg.indexOf(equalsOperator);
+    if (equalsIndex >= 0 && equalsIndex < (arg.length() - 1)) {
+      String key = arg.substring(0, equalsIndex);
+      String value = arg.substring(equalsIndex + 1);
+      parsedArgs.computeIfAbsent(key, k -> new ArrayList<>()).add(value);
+    } else {
+      parsedArgs.computeIfAbsent(arg, k -> new ArrayList<>()).add(null);
+    }
+  }
 }

components/cli/src/test/groovy/datadog/cli/CLIHelperTest.groovy

@@ -0,0 +1,51 @@
+package datadog.cli
+import spock.lang.Specification
+
+class CLIHelperTest extends Specification {
+  def "test parseJvmArgs"() {
+    when:
+    List<String> input = [
+      "-XX:MaxMetaspaceSize=128m",
+      "-XX:+UseG1GC",
+      "-Dkey=value1",
+      "-Dkey=value2",
+      "-DdisableFeature",
+      "-javaagent:/path/to/dd-java-agent.jar",
+      "-javaagent:/path/to/another-agent.jar",
+      "-javaagent",
+      "-Xmx512",
+      "-Xdebug",
+    ]
+    Map<String,List<String>> args = CLIHelper.parseJvmArgs(input)
+
+    then:
+    // -Xdebug
+    args.containsKey("-Xdebug")
+    args.get("-Xdebug") == [null]
+
+    // -Xmx512
+    args.containsKey("-Xmx512")
+    args.get("-Xmx512") == [null]
+
+    // -javaagent
+    args.containsKey("-javaagent")
+    args.get("-javaagent") == ["/path/to/dd-java-agent.jar", "/path/to/another-agent.jar", null]
+
+    // -DdisableFeature
+    args.containsKey("-DdisableFeature")
+    args.get("-DdisableFeature") == [null]
+
+    // -Dkey
+    // CLIHelper does not discriminate against what types of jvm args can have duplicate values, it accepts all args found on the process
+    args.containsKey("-Dkey")
+    args.get("-Dkey") == ["value1", "value2"]
+
+    //-XX:+UseG1GC
+    args.containsKey("-XX:+UseG1GC")
+    args.get("-XX:+UseG1GC") == [null]
+
+    //-XX:MaxMetaspaceSize
+    args.containsKey("-XX:MaxMetaspaceSize")
+    args.get("-XX:MaxMetaspaceSize") == ["128m"]
+  }
+}