[apache#768] feat(cli): Cli method for blacklist update

beryllw · Jun 7, 2023 · d201d97 · d201d97
1 parent c274b37
commit d201d97
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/cli/src/main/java/org/apache/uniffle/cli/UniffleCLI.java b/cli/src/main/java/org/apache/uniffle/cli/UniffleCLI.java
@@ -38,7 +38,7 @@ public class UniffleCLI extends AbstractCustomCommandLine {
   private final Option checkerClass;
   private final Option coordServer;
   private final Option coordPort;
-  private final Option refreshAccessCli;
+  private final Option refreshCheckerCli;
   private final Option help;
   protected UniffleRestClient client;
 
@@ -48,21 +48,22 @@ public UniffleCLI(String shortPrefix, String longPrefix) {
         true, "This is an client cli command that will print args.");
     uniffleAdminCli = new Option(shortPrefix + "a", longPrefix + "admin",
         true, "This is an admin command that will print args.");
-    refreshAccessCli = new Option(shortPrefix + "rc", longPrefix + "refreshChecker",
+    refreshCheckerCli = new Option(shortPrefix + "rc", longPrefix + "refreshChecker",
         false, "This is an admin command that will refresh access checker.");
     checkerClass = new Option(shortPrefix + "cc", longPrefix + "checkerClass",
         true, "This is the checker class that will be refreshed.");
-    help = new Option(shortPrefix + "h", longPrefix + "help",
-        false, "Help for the Uniffle CLI.");
     coordServer = new Option(shortPrefix + "s", longPrefix + "host",
         true, "This is coordinator server host.");
     coordPort = new Option(shortPrefix + "p", longPrefix + "port",
         true, "This is coordinator server port.");
+    help = new Option(shortPrefix + "h", longPrefix + "help",
+            false, "Help for the Uniffle CLI.");
     allOptions.addOption(uniffleClientCli);
     allOptions.addOption(uniffleAdminCli);
+    allOptions.addOption(refreshCheckerCli);
+    allOptions.addOption(checkerClass);
     allOptions.addOption(coordServer);
     allOptions.addOption(coordPort);
-    allOptions.addOption(refreshAccessCli);
     allOptions.addOption(help);
   }
 
@@ -98,7 +99,7 @@ public int run(String[] args) throws UniffleCliArgsException {
       client = UniffleRestClient.builder(hostUrl).build();
     }
 
-    if (cmd.hasOption(refreshAccessCli.getOpt())) {
+    if (cmd.hasOption(refreshCheckerCli.getOpt())) {
       String checker = cmd.getOptionValue(checkerClass.getOpt());
       LOG.info("uniffle-admin-cli : refresh access checker {}!", checker);
       refreshAccessChecker(checker);
@@ -120,7 +121,7 @@ private String refreshAccessChecker(String checker) throws UniffleCliArgsExcepti
   public void addRunOptions(Options baseOptions) {
     baseOptions.addOption(uniffleClientCli);
     baseOptions.addOption(uniffleAdminCli);
-    baseOptions.addOption(refreshAccessCli);
+    baseOptions.addOption(refreshCheckerCli);
     baseOptions.addOption(checkerClass);
     baseOptions.addOption(coordServer);
     baseOptions.addOption(coordPort);

diff --git a/cli/src/test/java/org/apache/uniffle/cli/UniffleTestCLI.java b/cli/src/test/java/org/apache/uniffle/cli/UniffleTestCLI.java
@@ -51,11 +51,19 @@ public void testHelp() throws UniffleCliArgsException, IOException {
     assertEquals(0, uniffleCLI.run(args1));
     oldOutPrintStream.println(dataOut);
     assertTrue(dataOut.toString().contains(
-        "-a,--admin <arg>   This is an admin command that will print args."));
+        "-a,--admin <arg>           This is an admin command that will print args."));
     assertTrue(dataOut.toString().contains(
-        "-c,--cli <arg>     This is an client cli command that will print args."));
+        "-c,--cli <arg>             This is an client cli command that will print args."));
     assertTrue(dataOut.toString().contains(
-        "-h,--help          Help for the Uniffle CLI."));
+        "-h,--help                  Help for the Uniffle CLI."));
+    assertTrue(dataOut.toString().contains(
+            "-cc,--checkerClass <arg>   This is the checker class that will be refreshed."));
+    assertTrue(dataOut.toString().contains(
+            "-rc,--refreshChecker       This is an admin command that will refresh access checker."));
+    assertTrue(dataOut.toString().contains(
+            "-s,--host <arg>            This is coordinator server host."));
+    assertTrue(dataOut.toString().contains(
+            "-p,--port <arg>            This is coordinator server port."));
 
     System.setOut(oldOutPrintStream);
     System.setErr(oldErrPrintStream);