Skip to content

Commit dda1dfc

Browse files
clunclun
committed
Add 0.1.1
1 parent cd48d6a commit dda1dfc

File tree

80 files changed

+1926
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1926
-629
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
1515
<app.main.class>com.dtsx.astra.cli.AstraCli</app.main.class>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<astra-sdk.version>0.3.5</astra-sdk.version>
17+
<astra-sdk.version>0.3.6-SNAPSHOT</astra-sdk.version>
1818
<jansi.version>2.4.0</jansi.version>
1919
<airline.version>2.9.0</airline.version>
2020
<slf4j.version>2.0.3</slf4j.version>

‎src/main/java/com/dtsx/astra/cli/AstraCli.java‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,21 @@
3939
import com.dtsx.astra.cli.db.exception.KeyspaceAlreadyExistException;
4040
import com.dtsx.astra.cli.db.keyspace.DbCreateKeyspaceCmd;
4141
import com.dtsx.astra.cli.db.keyspace.DbListKeyspacesCmd;
42-
import com.dtsx.astra.cli.iam.*;
43-
import com.dtsx.astra.cli.iam.exception.RoleNotFoundException;
44-
import com.dtsx.astra.cli.iam.exception.UserAlreadyExistException;
45-
import com.dtsx.astra.cli.iam.exception.UserNotFoundException;
42+
import com.dtsx.astra.cli.db.region.*;
43+
import com.dtsx.astra.cli.db.tool.DbGraphqlPlaygroundCmd;
44+
import com.dtsx.astra.cli.db.tool.DbSwaggerUICmd;
45+
import com.dtsx.astra.cli.iam.role.exception.RoleNotFoundException;
46+
import com.dtsx.astra.cli.iam.user.exception.UserAlreadyExistException;
47+
import com.dtsx.astra.cli.iam.user.exception.UserNotFoundException;
48+
import com.dtsx.astra.cli.iam.role.RoleGetCmd;
49+
import com.dtsx.astra.cli.iam.role.RoleListCmd;
50+
import com.dtsx.astra.cli.iam.token.TokenCreateCmd;
51+
import com.dtsx.astra.cli.iam.token.TokenDeleteCmd;
52+
import com.dtsx.astra.cli.iam.token.TokenListCmd;
53+
import com.dtsx.astra.cli.iam.user.UserDeleteCmd;
54+
import com.dtsx.astra.cli.iam.user.UserGetCmd;
55+
import com.dtsx.astra.cli.iam.user.UserInviteCmd;
56+
import com.dtsx.astra.cli.iam.user.UserListCmd;
4657
import com.dtsx.astra.cli.org.*;
4758
import com.dtsx.astra.cli.streaming.*;
4859
import com.dtsx.astra.cli.streaming.cdc.StreamingCreateCdcCmd;
@@ -103,14 +114,18 @@
103114
DbListCmd.class, DbGetCmd.class, DbStatusCmd.class,
104115
// Operation
105116
DbResumeCmd.class, DbDownloadScbCmd.class, DbCreateDotEnvCmd.class,
106-
// Keyspaces
107-
DbCreateKeyspaceCmd.class, DbListKeyspacesCmd.class,
108117
// DsBulk
109118
DbCountCmd.class, DbLoadCmd.class, DbUnLoadCmd.class,
110119
// Cqlshell
111120
DbCqlShellCmd.class,
112-
// List Regions
113-
DbListRegionsClassicCmd.class, DbListRegionsServerlessCmd.class
121+
// Work with Keyspaces
122+
DbCreateKeyspaceCmd.class, DbListKeyspacesCmd.class,
123+
// Work with Regions
124+
DbCreateRegionCmd.class, DbListRegionsCmd.class, DbDeleteRegionCmd.class,
125+
// List Region
126+
DbListRegionsClassicCmd.class, DbListRegionsServerlessCmd.class,
127+
// External Tools
128+
DbSwaggerUICmd.class, DbGraphqlPlaygroundCmd.class
114129
}),
115130

116131
@Group(
@@ -124,10 +139,11 @@
124139
StreamingListCmd.class, StreamingGetCmd.class,
125140
StreamingExistCmd.class, StreamingStatusCmd.class,
126141
StreamingPulsarTokenCmd.class, StreamingCreateDotEnvCmd.class,
142+
// list Regions
127143
StreamingListRegionsCmd.class,
128144
// Pulsar Shell
129145
PulsarShellCmd.class,
130-
// Create CDC
146+
// Change Data Capture
131147
StreamingCreateCdcCmd.class, StreamingDeleteCdcCmd.class, StreamingGetCdcCmd.class
132148
}),
133149

@@ -147,6 +163,14 @@
147163
UserGetCmd.class, UserInviteCmd.class, UserDeleteCmd.class,
148164
UserListCmd.class
149165
}),
166+
167+
@Group(
168+
name= "token",
169+
description = "Manage tokens",
170+
defaultCommand = TokenListCmd.class,
171+
commands = {
172+
TokenListCmd.class, TokenCreateCmd.class, TokenDeleteCmd.class
173+
})
150174
})
151175
public class AstraCli {
152176

@@ -239,6 +263,7 @@ public static ExitCode run(Class<?> clazz, String[] args) {
239263
AstraCliConsole.outputError(ExitCode.UNAVAILABLE, ex.getMessage());
240264
return ExitCode.UNAVAILABLE;
241265
} catch (Exception ex) {
266+
ex.printStackTrace();
242267
AstraCliConsole.outputError(ExitCode.INTERNAL_ERROR, ex.getMessage());
243268
return ExitCode.INTERNAL_ERROR;
244269
}

‎src/main/java/com/dtsx/astra/cli/config/ConfigCreateCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.dtsx.astra.cli.core.exception.InvalidTokenException;
2626
import com.dtsx.astra.cli.core.exception.TokenNotFoundException;
2727
import com.dtsx.astra.cli.core.out.AstraCliConsole;
28-
import com.dtsx.astra.sdk.organizations.OrganizationsClient;
29-
import com.dtsx.astra.sdk.organizations.domain.Organization;
28+
import com.dtsx.astra.sdk.org.OrganizationsClient;
29+
import com.dtsx.astra.sdk.org.domain.Organization;
3030
import com.github.rvesse.airline.annotations.Arguments;
3131
import com.github.rvesse.airline.annotations.Command;
3232
import com.github.rvesse.airline.annotations.Option;

‎src/main/java/com/dtsx/astra/cli/config/ConfigDeleteCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class ConfigDeleteCmd extends AbstractCmd {
4646
/** {@inheritDoc} */
4747
@Override
4848
public void execute() {
49-
OperationsConfig.assertSectionExist(sectionName);
49+
ServiceConfig.assertSectionExist(sectionName);
5050
ctx().getConfiguration().deleteSection(sectionName);
5151
ctx().getConfiguration().save();
5252
AstraCliConsole.outputSuccess("Section '" + sectionName + "' has been deleted.");

‎src/main/java/com/dtsx/astra/cli/config/ConfigGetCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ConfigGetCmd extends AbstractCmd {
5656
/** {@inheritDoc} */
5757
@Override
5858
public void execute() throws ConfigurationException {
59-
OperationsConfig.assertSectionExist(sectionName);
59+
ServiceConfig.assertSectionExist(sectionName);
6060
if (key != null) {
6161
Optional<String> optKey = ctx().getConfiguration().getSectionKey(sectionName, key);
6262
if (optKey.isEmpty()) {

‎src/main/java/com/dtsx/astra/cli/config/ConfigListCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class ConfigListCmd extends AbstractCmd {
3636
/** {@inheritDoc} */
3737
@Override
3838
public void execute() {
39-
OperationsConfig.listConfigurations();
39+
ServiceConfig.listConfigurations();
4040
}
4141

4242
}

‎src/main/java/com/dtsx/astra/cli/config/ConfigUseCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class ConfigUseCmd extends AbstractCmd {
4848
/** {@inheritDoc} */
4949
@Override
5050
public void execute() {
51-
OperationsConfig.assertSectionExist(sectionName);
51+
ServiceConfig.assertSectionExist(sectionName);
5252
ctx().getConfiguration().copySection(sectionName, AstraConfiguration.ASTRARC_DEFAULT);
5353
ctx().getConfiguration().save();
5454
AstraCliConsole.outputSuccess("Section '" + sectionName + "' is set as default.");

src/main/java/com/dtsx/astra/cli/config/OperationsConfig.java renamed to src/main/java/com/dtsx/astra/cli/config/ServiceConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* @author Cedrick LUNVEN (@clunven)
3737
*/
38-
public class OperationsConfig {
38+
public class ServiceConfig {
3939

4040
/**
4141
* Title of the table.
@@ -45,7 +45,7 @@ public class OperationsConfig {
4545
/**
4646
* Hide default constructor
4747
*/
48-
private OperationsConfig() {}
48+
private ServiceConfig() {}
4949

5050
/**
5151
* Syntax sugar.

‎src/main/java/com/dtsx/astra/cli/config/SetupCmd.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.dtsx.astra.cli.core.exception.InvalidTokenException;
2525
import com.dtsx.astra.cli.core.out.AstraCliConsole;
2626
import com.dtsx.astra.cli.core.out.LoggerShell;
27-
import com.dtsx.astra.sdk.organizations.OrganizationsClient;
27+
import com.dtsx.astra.sdk.org.OrganizationsClient;
2828
import com.github.rvesse.airline.annotations.Command;
2929
import com.github.rvesse.airline.annotations.Option;
3030
import org.fusesource.jansi.Ansi;
@@ -94,7 +94,9 @@ private void createDefaultSection(String token)
9494
ccc.sectionName = new OrganizationsClient(token).organization().getName();
9595
ccc.run();
9696
} catch(Exception e) {
97-
LoggerShell.error("Token provided is invalid. Please enter a valid token or quit with CTRL+C");
97+
LoggerShell.warning("Invalid token: It must be start with 'AstraCS:..' and have Organization Administrator privileges.");
98+
LoggerShell.warning("Generated token at database creation cannot be used.");
99+
LoggerShell.warning("Please enter a valid token or quit with CTRL+C.");
98100
throw new InvalidTokenException(token, e);
99101
}
100102
}

‎src/main/java/com/dtsx/astra/cli/core/CliContext.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
import com.dtsx.astra.cli.core.out.AstraCliConsole;
2727
import com.dtsx.astra.cli.core.out.LoggerShell;
2828
import com.dtsx.astra.cli.core.out.OutputFormat;
29-
import com.dtsx.astra.sdk.databases.DatabasesClient;
30-
import com.dtsx.astra.sdk.organizations.OrganizationsClient;
29+
import com.dtsx.astra.sdk.db.DatabasesClient;
30+
import com.dtsx.astra.sdk.org.OrganizationsClient;
31+
import com.dtsx.astra.sdk.org.OrganizationsClient;
3132
import com.dtsx.astra.sdk.streaming.StreamingClient;
3233
import com.dtsx.astra.sdk.utils.AstraRc;
3334
import org.apache.commons.lang3.StringUtils;
@@ -183,7 +184,7 @@ private void validateToken() {
183184
*/
184185
public String getToken()
185186
throws TokenNotFoundException {
186-
if (StringUtils.isEmpty(tokenOptions.token())) {
187+
if (tokenOptions == null || StringUtils.isEmpty(tokenOptions.token())) {
187188
throw new TokenNotFoundException();
188189
}
189190
return tokenOptions.token();

0 commit comments

Comments
 (0)