Namespace arguments for hoptimator-operator (#23)

* Minor fix in check CLI function

* Added and used Apache Commons CLI to support custom namespaces with hoptimator operator

* Added Apache commons CLI to libs

* Update hoptimator-operator/src/main/java/com/linkedin/hoptimator/operator/HoptimatorOperatorApp.java

Co-authored-by: Ryanne Dolan <[email protected]>

* Fixed formatting

---------

Co-authored-by: Ryanne Dolan <[email protected]>

Author: stevenewald

gradle/libs.versions.toml

@@ -28,3 +28,5 @@ kubernetesExtendedClient = "io.kubernetes:client-java-extended:16.0.2"
 slf4jSimple = "org.slf4j:slf4j-simple:1.7.30"
 slf4jApi = "org.slf4j:slf4j-api:1.7.30"
 sqlline = "sqlline:sqlline:1.12.0"
+commonsCli = 'commons-cli:commons-cli:1.4'
+

hoptimator-cli/src/main/java/com/linkedin/hoptimator/HoptimatorCliApp.java

@@ -360,11 +360,16 @@ public void execute(String line, DispatchCallback dispatchCallback) {
             }
             break;
           case "value":
+            boolean varFound = false;
             while (iter.hasNext()) {
               if(String.valueOf(iter.next()).contains(value)) {
+                varFound = true;
                 break;
               }
             }
+            if (varFound) {
+              break;
+            }
             throw new IllegalArgumentException("Query result did not contain expected value");
         }
         sqlline.output("PASS");

hoptimator-operator/build.gradle

@@ -25,7 +25,8 @@ dependencies {
   implementation libs.kubernetesClient
   implementation libs.kubernetesExtendedClient
   implementation libs.slf4jApi
-
+  implementation libs.commonsCli
+  
   testImplementation libs.junit
   testImplementation libs.assertj
 }

hoptimator-operator/src/main/java/com/linkedin/hoptimator/operator/HoptimatorOperatorApp.java

@@ -13,6 +13,14 @@
 import com.linkedin.hoptimator.operator.subscription.SubscriptionReconciler;
 import com.linkedin.hoptimator.planner.HoptimatorPlanner;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,10 +45,34 @@ public HoptimatorOperatorApp(String modelPath, String namespace, Properties prop
   }
 
   public static void main(String[] args) throws Exception {
-    if (args.length != 1) {
+    if (args.length < 1) {
       throw new IllegalArgumentException("Missing model file argument.");
     }
-    new HoptimatorOperatorApp(args[0], "default", new Properties()).run();
+
+    Options options = new Options();
+
+    Option namespace = new Option("n", "namespace", true, "specified namespace");
+    namespace.setRequired(false);
+    options.addOption(namespace);
+
+    CommandLineParser parser = new DefaultParser();
+    HelpFormatter formatter = new HelpFormatter();
+    CommandLine cmd;
+
+    try {
+      cmd = parser.parse(options, args);
+    } catch (ParseException e) {
+      System.out.println(e.getMessage());
+      formatter.printHelp("utility-name", options);
+
+      System.exit(1);
+      return;
+    }
+
+    String modelFileInput = cmd.getArgs()[0];
+    String namespaceInput = cmd.getOptionValue("namespace", "default");
+
+    new HoptimatorOperatorApp(modelFileInput, namespaceInput, new Properties()).run();
   }
 
   public void run() throws Exception {