create-keyspace

Author: clun

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

@@ -5,6 +5,7 @@
 import org.fusesource.jansi.AnsiConsole;
 
 import com.datastax.astra.shell.cmd.HelpCommand;
+import com.datastax.astra.shell.cmd.config.BaseConfigCommand;
 import com.datastax.astra.shell.cmd.config.ConfigCreate;
 import com.datastax.astra.shell.cmd.config.ConfigDefault;
 import com.datastax.astra.shell.cmd.config.ConfigDelete;
@@ -13,11 +14,13 @@
 import com.datastax.astra.shell.cmd.config.ConfigSetup;
 import com.datastax.astra.shell.cmd.db.DbCqlShellCli;
 import com.datastax.astra.shell.cmd.db.DbCreateCli;
+import com.datastax.astra.shell.cmd.db.DbCreateKeyspaceCli;
 import com.datastax.astra.shell.cmd.db.DbDeleteCli;
 import com.datastax.astra.shell.cmd.db.DbListCli;
 import com.datastax.astra.shell.cmd.db.DbGetCli;
 import com.datastax.astra.shell.cmd.db.OperationsDb;
 import com.datastax.astra.shell.cmd.iam.RoleListCli;
+import com.datastax.astra.shell.cmd.iam.OperationIam;
 import com.datastax.astra.shell.cmd.iam.RoleGetCli;
 import com.datastax.astra.shell.cmd.iam.UserDeleteCli;
 import com.datastax.astra.shell.cmd.iam.UserInviteCli;
@@ -50,19 +53,20 @@
                   DbDeleteCli.class,
                   DbGetCli.class,
                   DbListCli.class,
+                  DbCreateKeyspaceCli.class
           }),
-          @Group(name = "config", description = "Manage configuration file", commands = { 
+          @Group(name = BaseConfigCommand.COMMAND_CONFIG, description = "Manage configuration file", commands = { 
                   ConfigCreate.class,
                   ConfigDefault.class,
                   ConfigDelete.class,
                   ConfigGet.class,
                   ConfigList.class
           }),
-          @Group(name= "role", description = "Manage roles (RBAC)", commands = {
+          @Group(name= OperationIam.COMMAND_ROLE, description = "Manage roles (RBAC)", commands = {
                   RoleListCli.class,
                   RoleGetCli.class
           }),
-          @Group(name= "user", description = "Manage users", commands = {
+          @Group(name= OperationIam.COMMAND_USER, description = "Manage users", commands = {
                   UserListCli.class,
                   UserGetCli.class,
                   UserInviteCli.class,

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

@@ -9,12 +9,13 @@
 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.OperationIam;
 import com.datastax.astra.shell.cmd.iam.RoleGetCli;
+import com.datastax.astra.shell.cmd.iam.RoleListShell;
 import com.datastax.astra.shell.cmd.iam.UserDeleteShell;
+import com.datastax.astra.shell.cmd.iam.UserGetShell;
 import com.datastax.astra.shell.cmd.iam.UserInviteShell;
 import com.datastax.astra.shell.cmd.iam.UserListShell;
-import com.datastax.astra.shell.cmd.iam.UserGetShell;
 import com.datastax.astra.shell.cmd.shell.ConnectCommand;
 import com.datastax.astra.shell.cmd.shell.EmptyCommand;
 import com.datastax.astra.shell.out.LoggerShell;
@@ -47,11 +48,11 @@
                   DbGetShell.class,
                   DbUseShell.class
           }),
-          @Group(name= "role", description = "Manage the roles (RBAC)", commands = {
+          @Group(name= OperationIam.COMMAND_ROLE, description = "Manage the roles (RBAC)", commands = {
                   RoleListShell.class,
                   RoleGetCli.class
           }),
-          @Group(name= "user", description = "Manage the users permission", commands = {
+          @Group(name= OperationIam.COMMAND_USER, description = "Manage the users permission", commands = {
                   UserListShell.class,
                   UserGetShell.class,
                   UserInviteShell.class,

astra-shell/src/main/java/com/datastax/astra/shell/cmd/config/BaseConfigCommand.java

@@ -11,6 +11,9 @@
  */
 public abstract class BaseConfigCommand extends BaseCommand {
 
+    /** worki with roles. */
+    public static final String COMMAND_CONFIG = "config";
+    
     /**
      * File on disk to reuse configuration.
      */

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

@@ -18,6 +18,11 @@
 @Command(name = BaseCommand.CREATE, description = "Create a database with cli")
 public class DbCreateCli extends BaseCliCommand {
 
+    /** Cqlsh Options. */
+    @Option(name = { "--if-not-exist" }, 
+            description = "will create a new DB only if none with same name")
+    protected boolean ifNotExist = false;
+    
     /**
      * Database name or identifier
      */
@@ -35,14 +40,14 @@ public class DbCreateCli extends BaseCliCommand {
     /**
      * Default keyspace created with the Db
      */
-    @Option(name = { "-ks", "--keyspace" }, title = "KEYSPACE", arity = 1, 
+    @Option(name = { "-k", "--keyspace" }, title = "KEYSPACE", arity = 1, 
             description = "Default keyspace created with the Db")
     protected String defaultKeyspace;
 
     /** {@inheritDoc} */
     @Override
     public ExitCode execute() {
-        return OperationsDb.createDb(databaseName, databaseRegion, defaultKeyspace);
+        return OperationsDb.createDb(databaseName, databaseRegion, defaultKeyspace, ifNotExist);
     }
 
 }

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

@@ -0,0 +1,43 @@
+package com.datastax.astra.shell.cmd.db;
+
+import com.datastax.astra.shell.ExitCode;
+import com.datastax.astra.shell.cmd.BaseCliCommand;
+import com.github.rvesse.airline.annotations.Arguments;
+import com.github.rvesse.airline.annotations.Command;
+import com.github.rvesse.airline.annotations.Option;
+import com.github.rvesse.airline.annotations.restrictions.Required;
+
+/**
+ * Delete a DB is exist
+ *
+ * @author Cedrick LUNVEN (@clunven)
+ */
+@Command(name = OperationsDb.CMD_CREATE_KEYSPACE, description = "Create a new keyspace")
+public class DbCreateKeyspaceCli extends BaseCliCommand {
+    
+    /**
+     * Database name or identifier
+     */
+    @Required
+    @Arguments(title = "DB", description = "Database name or identifier")
+    public String database;
+   
+    /** Provide a keyspace Name. */
+    @Required
+    @Option(name = {"-k", "--keyspace" }, 
+            title = "KEYSPACE", 
+            arity = 1,  
+            description = "Name of the keyspace to create")
+    public String keyspace;
+    
+    /** Cqlsh Options. */
+    @Option(name = { "--if-not-exist" }, 
+            description = "will create a new DB only if none with same name")
+    protected boolean ifNotExist = false;
+    
+    /** {@inheritDoc} */
+    public ExitCode execute() {
+        return OperationsDb.createKeyspace(database, keyspace, ifNotExist);
+    }
+    
+}

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

@@ -18,6 +18,11 @@
 @Command(name = BaseCommand.CREATE, description = "Create a database with shell")
 public class DbCreateShell extends BaseShellCommand {
 
+    /** Cqlsh Options. */
+    @Option(name = { "--if-not-exist" }, 
+            description = "will create a new DB only if none with same name")
+    protected boolean ifNotExist = false;
+    
     /**
      * Database name or identifier
      */
@@ -42,7 +47,7 @@ public class DbCreateShell extends BaseShellCommand {
     /** {@inheritDoc} */
     @Override
     public ExitCode execute() {
-        return OperationsDb.createDb(databaseName, databaseRegion, defaultKeyspace);
+        return OperationsDb.createDb(databaseName, databaseRegion, defaultKeyspace, ifNotExist);
     }
 
 }

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

@@ -18,11 +18,11 @@ public class DbGetCli extends BaseCliCommand {
     /** name of the DB. */
     @Required
     @Arguments(title = "DB", description = "Database name or identifier")
-    public String databaseId;
+    public String database;
 
     /** {@inheritDoc} */
     public ExitCode execute() {
-        return OperationsDb.showDb(databaseId);
+        return OperationsDb.showDb(database);
     }
 
 }