more commands

Author: clun

astra-shell/src/test/resources/NOTES.MD renamed to astra-shell/NOTES.MD

@@ -8,7 +8,7 @@
 import com.datastax.astra.shell.cmd.config.ConfigDelete;
 import com.datastax.astra.shell.cmd.config.ConfigList;
 import com.datastax.astra.shell.cmd.config.ConfigShow;
-import com.datastax.astra.shell.cmd.config.Setup;
+import com.datastax.astra.shell.cmd.config.ConfigSetup;
 import com.datastax.astra.shell.cmd.db.DbCreateCli;
 import com.datastax.astra.shell.cmd.db.DbDeleteCli;
 import com.datastax.astra.shell.cmd.db.DbListCli;
@@ -36,41 +36,39 @@
   description    = "CLI for DataStax Astra™ including an interactive mode",
   defaultCommand = ShellCommand.class, // no command => interactive
   commands       = { 
-    Setup.class,
+    ConfigSetup.class,
     HelpCommand.class,
     ShellCommand.class
   },
   groups = {
-          @Group(name = OperationsDb.DB, description = "Commands acting of database", commands = { 
+          @Group(name = OperationsDb.DB, description = "Manage databases", commands = { 
                   DbCreateCli.class,
                   DbDeleteCli.class,
                   DbListCli.class,
                   DbShow.class
           }),
-          @Group(name = "config", description = "Edit configuration file", commands = { 
+          @Group(name = "config", description = "Manage configuration file", commands = { 
                   ConfigCreate.class,
                   ConfigDefault.class,
                   ConfigDelete.class,
                   ConfigShow.class,
                   ConfigList.class
           }),
-          @Group(name= "role", description = "Manage the roles (RBAC)", commands = {
+          @Group(name= "role", description = "Manage roles (RBAC)", commands = {
                   RoleListCli.class,
                   RoleShowCli.class
           }),
-          @Group(name= "user", description = "Manage the users permissions", commands = {
+          @Group(name= "user", description = "Manage users", commands = {
                   UserListCli.class,
                   UserShowCli.class,
                   UserInviteCli.class,
                   UserDeleteCli.class
           }),
-          @Group(name= "token", description = "Manage the security tokens", commands = {
-                  
+          /*
+          @Group(name= "token", description = "Manage security tokens", commands = {
           }),
-          @Group(name= "acl", description = "Manage the access lists", commands = {
-                  
-          })
-          
+          @Group(name= "acl", description = "Manage Access lists", commands = {
+          })*/
   })
 public class AstraCli {
 

astra-shell/src/main/java/com/datastax/astra/shell/AstraCli.java

@@ -6,6 +6,7 @@
 import com.datastax.astra.shell.cmd.db.DbCreateShell;
 import com.datastax.astra.shell.cmd.db.DbDeleteShell;
 import com.datastax.astra.shell.cmd.db.DbListShell;
+import com.datastax.astra.shell.cmd.db.DbUseShell;
 import com.datastax.astra.shell.cmd.db.OperationsDb;
 import com.datastax.astra.shell.cmd.iam.RoleListShell;
 import com.datastax.astra.shell.cmd.iam.RoleShowCli;
@@ -16,7 +17,6 @@
 import com.datastax.astra.shell.cmd.shell.ConnectCommand;
 import com.datastax.astra.shell.cmd.shell.CqlShCommand;
 import com.datastax.astra.shell.cmd.shell.EmptyCommand;
-import com.datastax.astra.shell.cmd.use.UseDb;
 import com.datastax.astra.shell.utils.LoggerShell;
 import com.github.rvesse.airline.annotations.Cli;
 import com.github.rvesse.airline.annotations.Group;
@@ -44,7 +44,8 @@
           @Group(name = OperationsDb.DB, description = "Commands acting of database", commands = {
                   DbCreateShell.class,
                   DbDeleteShell.class,
-                  DbListShell.class
+                  DbListShell.class,
+                  DbUseShell.class
           }),
           @Group(name= "role", description = "Manage the roles (RBAC)", commands = {
                   RoleListShell.class,
@@ -55,10 +56,7 @@
                   UserShowShell.class,
                   UserInviteShell.class,
                   UserDeleteShell.class
-          }),
-          @Group(name = "use", description = "Focus on an entity (context & prompt changed)", commands = {
-                 UseDb.class
-          }),
+          })
     })
 public class AstraShell {
 

astra-shell/src/main/java/com/datastax/astra/shell/AstraShell.java

@@ -22,6 +22,9 @@ public abstract class BaseCommand implements Runnable {
     /** Command constants. */
     public static final String LIST       = "list";
 
+    /** Command constants. */
+    public static final String USE       = "use";
+    
     // --- Flags ---
 
     /** 

astra-shell/src/main/java/com/datastax/astra/shell/cmd/BaseCommand.java

@@ -10,7 +10,7 @@
  *
  * @param <T>
  */
-@Command(name = "help", description = "Display help information")
+@Command(name = "help", description = "View help for any command")
 public class HelpCommand<T> extends Help<T> {
 
     /** {@inheritDoc} */

astra-shell/src/main/java/com/datastax/astra/shell/cmd/HelpCommand.java

@@ -17,10 +17,8 @@
  *
  * @author Cedrick LUNVEN (@clunven)
  */
-@Command(
-   name = "setup", 
-   description = "Intialize configuration")
-public class Setup extends BaseConfigCommand implements Runnable {
+@Command(name = "setup", description = "Initialize configuration file")
+public class ConfigSetup extends BaseConfigCommand implements Runnable {
 
     /** {@inheritDoc} */
     @Override

astra-shell/src/main/java/com/datastax/astra/shell/cmd/config/Setup.java renamed to astra-shell/src/main/java/com/datastax/astra/shell/cmd/config/ConfigSetup.java

@@ -0,0 +1,40 @@
+package com.datastax.astra.shell.cmd.db;
+
+import java.util.Optional;
+
+import com.datastax.astra.sdk.databases.DatabaseClient;
+import com.datastax.astra.shell.ExitCode;
+import com.datastax.astra.shell.cmd.BaseCommand;
+import com.datastax.astra.shell.cmd.BaseShellCommand;
+import com.datastax.astra.shell.utils.LoggerShell;
+import com.github.rvesse.airline.annotations.Arguments;
+import com.github.rvesse.airline.annotations.Command;
+import com.github.rvesse.airline.annotations.restrictions.Required;
+
+/**
+ * Select one Database in the Shell.
+ *
+ * @author Cedrick LUNVEN (@clunven)
+ */
+@Command(name = BaseCommand.USE, description = "Select a database in the shell")
+public class DbUseShell extends BaseShellCommand {
+
+    @Required
+    @Arguments(title = "DB", description = "Database name or identifier")
+    public String database;
+
+    /** {@inheritDoc} */
+    @Override
+    public ExitCode execute() {
+        // We want the use command to be verbose
+        this.verbose = true;
+        Optional<DatabaseClient> dbClient = OperationsDb.getDatabaseClient(database);
+        if (dbClient.isPresent()) {
+            ctx().useDatabase(dbClient.get().find().get());
+            LoggerShell.info("Selecting Database '" + database + "'");
+            return ExitCode.SUCCESS;
+        }
+        return ExitCode.NOT_FOUND;
+    } 
+    
+}

astra-shell/src/main/java/com/datastax/astra/shell/cmd/db/DbUseShell.java

@@ -16,7 +16,7 @@
  *
  * @author Cedrick LUNVEN (@clunven)
  */
-@Command(name = "shell", description = "Enter interactive mode")
+@Command(name = "shell", description = "Interactive mode (default if no command provided)")
 public class ShellCommand extends BaseCliCommand {
 
     /** 

astra-shell/src/main/java/com/datastax/astra/shell/cmd/shell/ShellCommand.java

@@ -12,7 +12,7 @@ public class RolesCommandsTest extends AbstractAstraCliTest {
 
     @Test
     public void interactive()  throws Exception {
-        astraCli( "--verbose");
+        astraCli();
     }
 
     @Test