From 4bb999d4a68bb665a6cd3f675234929348dd8d01 Mon Sep 17 00:00:00 2001 From: Eric Hare Date: Tue, 17 Mar 2026 10:21:23 -0700 Subject: [PATCH 1/3] feat: Clean up the endpoints list --- .../cli/commands/db/endpoints/Endpoint.java | 30 +++++++++++-------- .../db/endpoints/EndpointsApiCmd.java | 22 -------------- .../db/endpoints/EndpointsClientCmd.java | 22 ++++++++++++++ .../commands/db/endpoints/EndpointsCmd.java | 2 +- .../db/endpoints/EndpointsDataApiCmd.java | 2 +- .../db/endpoints/legacy/EndpointApiCmd.java | 2 +- ...va => EndpointsClientCmdSnapshotTest.java} | 6 ++-- .../endpoint_found.csv.approved.txt | 2 +- .../endpoint_found.human.approved.txt | 2 +- .../endpoint_found.json.approved.txt | 2 +- ...dpoint_found_for_region.human.approved.txt | 2 +- ...ndpoint_found_for_region.json.approved.txt | 2 +- .../endpoint_found.csv.approved.txt | 6 ++-- .../endpoint_found.human.approved.txt | 6 ++-- .../endpoint_found.json.approved.txt | 10 +++---- ...dpoint_found_for_region.human.approved.txt | 6 ++-- ...ndpoint_found_for_region.json.approved.txt | 10 +++---- 17 files changed, 69 insertions(+), 65 deletions(-) delete mode 100644 src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java create mode 100644 src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java rename src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/{EndpointsApiCmdSnapshotTest.java => EndpointsClientCmdSnapshotTest.java} (66%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsApiCmd => EndpointsClientCmd}/endpoint_found.csv.approved.txt (69%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsApiCmd => EndpointsClientCmd}/endpoint_found.human.approved.txt (67%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsApiCmd => EndpointsClientCmd}/endpoint_found.json.approved.txt (72%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsApiCmd => EndpointsClientCmd}/endpoint_found_for_region.human.approved.txt (63%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsApiCmd => EndpointsClientCmd}/endpoint_found_for_region.json.approved.txt (68%) diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java index 67bb54f6..fa0251b8 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java @@ -11,12 +11,16 @@ @RequiredArgsConstructor public enum Endpoint { - API("api", (result, env) -> { - val db = result.database(); + CLIENT("client", (result, env) -> { + return apiBaseUrl(result, env); + }), - return (db.getInfo().getDbType() == null) - ? ApiLocator.getApiRestEndpoint(env, db.getId(), result.region()) - : ApiLocator.getApiEndpoint(env, db.getId(), result.region()); + CURL("curl", (result, env) -> { + return apiBaseUrl(result, env) + "/api/v1/json"; + }), + + PLAYGROUND("playground", (result, env) -> { + return ApiLocator.getApiGraphQLEndPoint(env, result.database().getId(), result.region()) + "/playground"; }), SWAGGER("swagger", (result, env) -> { @@ -25,14 +29,6 @@ public enum Endpoint { return (db.getInfo().getDbType() == null) ? ApiLocator.getApiRestEndpoint(env, db.getId(), result.region()) + "/swagger-ui" : ApiLocator.getApiEndpoint(env, db.getId(), result.region()) + "/api/json/swagger-ui"; - }), - - PLAYGROUND("playground", (result, env) -> { - return ApiLocator.getApiGraphQLEndPoint(env, result.database().getId(), result.region()) + "/playground"; - }), - - DATA_API("data-api", (result, env) -> { - return API.mkUrl.apply(result, env) + "/api/v1/json"; }); @Getter @@ -42,4 +38,12 @@ public enum Endpoint { public String mkUrl(EndpointGetResponse result, AstraEnvironment env) { return mkUrl.apply(result, env); } + + private static String apiBaseUrl(EndpointGetResponse result, AstraEnvironment env) { + val db = result.database(); + + return (db.getInfo().getDbType() == null) + ? ApiLocator.getApiRestEndpoint(env, db.getId(), result.region()) + : ApiLocator.getApiEndpoint(env, db.getId(), result.region()); + } } diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java deleted file mode 100644 index 0e2376d7..00000000 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.dtsx.astra.cli.commands.db.endpoints; - -import com.dtsx.astra.cli.core.help.Example; -import picocli.CommandLine.Command; - -@Command( - name = "api", - description = "Get the API endpoint to interact with the specified database" -) -@Example( - comment = "Get the API endpoint for the database", - command = "${cli.name} db endpoints api mydb" -) -@Example( - comment = "Get the API endpoint for the database in a specific region", - command = "${cli.name} db endpoints api mydb --region us-east1" -) -public class EndpointsApiCmd extends AbstractEndpointGetCmd { - public EndpointsApiCmd() { - super(Endpoint.API); - } -} diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java new file mode 100644 index 00000000..976467e6 --- /dev/null +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java @@ -0,0 +1,22 @@ +package com.dtsx.astra.cli.commands.db.endpoints; + +import com.dtsx.astra.cli.core.help.Example; +import picocli.CommandLine.Command; + +@Command( + name = "client", + description = "Get the Data API client endpoint for the specified database" +) +@Example( + comment = "Get the Data API client endpoint for the database", + command = "${cli.name} db endpoints client mydb" +) +@Example( + comment = "Get the Data API client endpoint for the database in a specific region", + command = "${cli.name} db endpoints client mydb --region us-east1" +) +public class EndpointsClientCmd extends AbstractEndpointGetCmd { + public EndpointsClientCmd() { + super(Endpoint.CLIENT); + } +} diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java index 4237028e..0d57f56d 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java @@ -9,7 +9,7 @@ description = "Get various endpoints for your database", subcommands = { EndpointsListCmd.class, - EndpointsApiCmd.class, + EndpointsClientCmd.class, EndpointsDataApiCmd.class, EndpointsSwaggerCmd.class, EndpointsPlaygroundCmd.class, diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java index a52ec58b..d26a8032 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java @@ -17,6 +17,6 @@ ) public class EndpointsDataApiCmd extends AbstractEndpointGetCmd { public EndpointsDataApiCmd() { - super(Endpoint.DATA_API); + super(Endpoint.CURL); } } diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java index 7020abc3..ef23e384 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java @@ -9,6 +9,6 @@ ) public class EndpointApiCmd extends AbstractLegacyEndpointGetCmd { public EndpointApiCmd() { - super(Endpoint.API); + super(Endpoint.CLIENT); } } diff --git a/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsApiCmdSnapshotTest.java b/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsClientCmdSnapshotTest.java similarity index 66% rename from src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsApiCmdSnapshotTest.java rename to src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsClientCmdSnapshotTest.java index 6f1353a7..7ce3dd57 100644 --- a/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsApiCmdSnapshotTest.java +++ b/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsClientCmdSnapshotTest.java @@ -4,16 +4,16 @@ import com.dtsx.astra.cli.snapshot.annotations.TestForAllOutputs; import com.dtsx.astra.cli.snapshot.annotations.TestForDifferentOutputs; -public class EndpointsApiCmdSnapshotTest extends BaseEndpointCmdSnapshotTest { +public class EndpointsClientCmdSnapshotTest extends BaseEndpointCmdSnapshotTest { @Override @TestForAllOutputs public void endpoint_found(OutputType outputType) { - verifyRun("db endpoints api ${DatabaseId}", outputType, opts); + verifyRun("db endpoints client ${DatabaseId}", outputType, opts); } @Override @TestForDifferentOutputs public void endpoint_found_for_region(OutputType outputType) { - verifyRun("db endpoints api ${DatabaseId} -r ap-south-1", outputType, opts); + verifyRun("db endpoints client ${DatabaseId} -r ap-south-1", outputType, opts); } } diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.csv.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.csv.approved.txt similarity index 69% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.csv.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.csv.approved.txt index 2d4db7db..097250e3 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.csv.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.csv.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -o csv +command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -o csv exit_code: 0 ---- output ---- stdout: code,message,data diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.human.approved.txt similarity index 67% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.human.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.human.approved.txt index 58ca5b04..70134d99 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.human.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 +command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 exit_code: 0 ---- output ---- stdout: https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.json.approved.txt similarity index 72% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.json.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.json.approved.txt index 38328d59..0e285c80 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.json.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -o json +command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -o json exit_code: 0 ---- output ---- stdout: { diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.human.approved.txt similarity index 63% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.human.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.human.approved.txt index 434a3a41..d7a7ca75 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.human.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 +command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 exit_code: 0 ---- output ---- stdout: https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.json.approved.txt similarity index 68% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.json.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.json.approved.txt index 7e779519..8c0076b8 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.json.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 -o json +command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 -o json exit_code: 0 ---- output ---- stdout: { diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt index ea8083f7..12842aa9 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt @@ -3,8 +3,8 @@ command: astra db endpoints list 822b0fff-6a73-4322-a8ec-09832b075287 -o csv exit_code: 0 ---- output ---- stdout: code,message,endpoint,url -stdout: OK,,api,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com -stdout: OK,,swagger,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui +stdout: OK,,client,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com +stdout: OK,,curl,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json stdout: OK,,playground,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/playground -stdout: OK,,data-api,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json +stdout: OK,,swagger,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui ---- end ---- diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt index 300c11d6..cfe93cc6 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt @@ -5,9 +5,9 @@ exit_code: 0 stdout: ┌────────────┬────────────────────────────────────────────────────────────────────────────────────────────────────────┐ stdout: │ Endpoint │ URL │ stdout: ├────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -stdout: │ api │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com │ -stdout: │ swagger │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui │ +stdout: │ client │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com │ +stdout: │ curl │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json │ stdout: │ playground │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/playground │ -stdout: │ data-api │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json │ +stdout: │ swagger │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui │ stdout: └────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ ---- end ---- diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt index b81dae16..4dd74ead 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt @@ -5,17 +5,17 @@ exit_code: 0 stdout: { stdout: "code" : "OK", stdout: "data" : [ { -stdout: "endpoint" : "api", +stdout: "endpoint" : "client", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com" stdout: }, { -stdout: "endpoint" : "swagger", -stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui" +stdout: "endpoint" : "curl", +stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json" stdout: }, { stdout: "endpoint" : "playground", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/playground" stdout: }, { -stdout: "endpoint" : "data-api", -stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json" +stdout: "endpoint" : "swagger", +stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui" stdout: } ] stdout: } ---- end ---- diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt index e42bf581..8485536b 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt @@ -5,9 +5,9 @@ exit_code: 0 stdout: ┌────────────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────┐ stdout: │ Endpoint │ URL │ stdout: ├────────────┼─────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -stdout: │ api │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com │ -stdout: │ swagger │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/json/swagger-ui │ +stdout: │ client │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com │ +stdout: │ curl │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json │ stdout: │ playground │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/playground │ -stdout: │ data-api │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json │ +stdout: │ swagger │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/json/swagger-ui │ stdout: └────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────┘ ---- end ---- diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt index fc333701..ab8bc8fd 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt @@ -5,17 +5,17 @@ exit_code: 0 stdout: { stdout: "code" : "OK", stdout: "data" : [ { -stdout: "endpoint" : "api", +stdout: "endpoint" : "client", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com" stdout: }, { -stdout: "endpoint" : "swagger", -stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/json/swagger-ui" +stdout: "endpoint" : "curl", +stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json" stdout: }, { stdout: "endpoint" : "playground", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/playground" stdout: }, { -stdout: "endpoint" : "data-api", -stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json" +stdout: "endpoint" : "swagger", +stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/json/swagger-ui" stdout: } ] stdout: } ---- end ---- From 9bbdf6effc849e012fdc6f47bed52893a208c0fb Mon Sep 17 00:00:00 2001 From: Eric Hare Date: Tue, 17 Mar 2026 10:32:04 -0700 Subject: [PATCH 2/3] Alias curl to data-api for backwards compat --- .../commands/db/endpoints/EndpointsDataApiCmd.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java index d26a8032..8039f736 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java @@ -4,16 +4,17 @@ import picocli.CommandLine.Command; @Command( - name = "data-api", - description = "Get the Data API endpoint for the specified database" + name = "curl", + aliases = {"data-api"}, + description = "Get the Data API curl endpoint for the specified database" ) @Example( - comment = "Get the Data API endpoint for the database", - command = "${cli.name} db endpoints data-api mydb" + comment = "Get the Data API curl endpoint for the database", + command = "${cli.name} db endpoints curl mydb" ) @Example( - comment = "Get the Data API endpoint for the database in a specific region", - command = "${cli.name} db endpoints data-api mydb --region us-east1" + comment = "Get the Data API curl endpoint for the database in a specific region", + command = "${cli.name} db endpoints curl mydb --region us-east1" ) public class EndpointsDataApiCmd extends AbstractEndpointGetCmd { public EndpointsDataApiCmd() { From a7b62b2b5bc4338023984ce3f8b7afa9db06ed9e Mon Sep 17 00:00:00 2001 From: Eric Hare Date: Sun, 22 Mar 2026 12:17:34 -0700 Subject: [PATCH 3/3] Feedback on naming scheme --- .../cli/commands/db/endpoints/Endpoint.java | 4 ++-- .../db/endpoints/EndpointsApiCmd.java | 23 +++++++++++++++++++ .../db/endpoints/EndpointsClientCmd.java | 22 ------------------ .../commands/db/endpoints/EndpointsCmd.java | 2 +- .../db/endpoints/EndpointsDataApiCmd.java | 15 ++++++------ .../db/endpoints/legacy/EndpointApiCmd.java | 2 +- ....java => EndpointsApiCmdSnapshotTest.java} | 6 ++--- .../endpoint_found.csv.approved.txt | 2 +- .../endpoint_found.human.approved.txt | 2 +- .../endpoint_found.json.approved.txt | 2 +- ...dpoint_found_for_region.human.approved.txt | 2 +- ...ndpoint_found_for_region.json.approved.txt | 2 +- .../endpoint_found.csv.approved.txt | 4 ++-- .../endpoint_found.human.approved.txt | 4 ++-- .../endpoint_found.json.approved.txt | 4 ++-- ...dpoint_found_for_region.human.approved.txt | 4 ++-- ...ndpoint_found_for_region.json.approved.txt | 4 ++-- 17 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java delete mode 100644 src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java rename src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/{EndpointsClientCmdSnapshotTest.java => EndpointsApiCmdSnapshotTest.java} (66%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsClientCmd => EndpointsApiCmd}/endpoint_found.csv.approved.txt (69%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsClientCmd => EndpointsApiCmd}/endpoint_found.human.approved.txt (67%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsClientCmd => EndpointsApiCmd}/endpoint_found.json.approved.txt (72%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsClientCmd => EndpointsApiCmd}/endpoint_found_for_region.human.approved.txt (63%) rename src/test/resources/snapshots/_db/_endpoints/{EndpointsClientCmd => EndpointsApiCmd}/endpoint_found_for_region.json.approved.txt (68%) diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java index fa0251b8..55aa1fd8 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/Endpoint.java @@ -11,11 +11,11 @@ @RequiredArgsConstructor public enum Endpoint { - CLIENT("client", (result, env) -> { + API("api", (result, env) -> { return apiBaseUrl(result, env); }), - CURL("curl", (result, env) -> { + DATA_API("data-api", (result, env) -> { return apiBaseUrl(result, env) + "/api/v1/json"; }), diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java new file mode 100644 index 00000000..a73b50f6 --- /dev/null +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsApiCmd.java @@ -0,0 +1,23 @@ +package com.dtsx.astra.cli.commands.db.endpoints; + +import com.dtsx.astra.cli.core.help.Example; +import picocli.CommandLine.Command; + +@Command( + name = "api", + aliases = {"data-api-client"}, + description = "Get the API endpoint to interact with the specified database" +) +@Example( + comment = "Get the API endpoint for the database", + command = "${cli.name} db endpoints api mydb" +) +@Example( + comment = "Get the API endpoint for the database in a specific region", + command = "${cli.name} db endpoints api mydb --region us-east1" +) +public class EndpointsApiCmd extends AbstractEndpointGetCmd { + public EndpointsApiCmd() { + super(Endpoint.API); + } +} diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java deleted file mode 100644 index 976467e6..00000000 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsClientCmd.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.dtsx.astra.cli.commands.db.endpoints; - -import com.dtsx.astra.cli.core.help.Example; -import picocli.CommandLine.Command; - -@Command( - name = "client", - description = "Get the Data API client endpoint for the specified database" -) -@Example( - comment = "Get the Data API client endpoint for the database", - command = "${cli.name} db endpoints client mydb" -) -@Example( - comment = "Get the Data API client endpoint for the database in a specific region", - command = "${cli.name} db endpoints client mydb --region us-east1" -) -public class EndpointsClientCmd extends AbstractEndpointGetCmd { - public EndpointsClientCmd() { - super(Endpoint.CLIENT); - } -} diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java index 0d57f56d..4237028e 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsCmd.java @@ -9,7 +9,7 @@ description = "Get various endpoints for your database", subcommands = { EndpointsListCmd.class, - EndpointsClientCmd.class, + EndpointsApiCmd.class, EndpointsDataApiCmd.class, EndpointsSwaggerCmd.class, EndpointsPlaygroundCmd.class, diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java index 8039f736..a52ec58b 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/EndpointsDataApiCmd.java @@ -4,20 +4,19 @@ import picocli.CommandLine.Command; @Command( - name = "curl", - aliases = {"data-api"}, - description = "Get the Data API curl endpoint for the specified database" + name = "data-api", + description = "Get the Data API endpoint for the specified database" ) @Example( - comment = "Get the Data API curl endpoint for the database", - command = "${cli.name} db endpoints curl mydb" + comment = "Get the Data API endpoint for the database", + command = "${cli.name} db endpoints data-api mydb" ) @Example( - comment = "Get the Data API curl endpoint for the database in a specific region", - command = "${cli.name} db endpoints curl mydb --region us-east1" + comment = "Get the Data API endpoint for the database in a specific region", + command = "${cli.name} db endpoints data-api mydb --region us-east1" ) public class EndpointsDataApiCmd extends AbstractEndpointGetCmd { public EndpointsDataApiCmd() { - super(Endpoint.CURL); + super(Endpoint.DATA_API); } } diff --git a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java index ef23e384..7020abc3 100644 --- a/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java +++ b/src/main/java/com/dtsx/astra/cli/commands/db/endpoints/legacy/EndpointApiCmd.java @@ -9,6 +9,6 @@ ) public class EndpointApiCmd extends AbstractLegacyEndpointGetCmd { public EndpointApiCmd() { - super(Endpoint.CLIENT); + super(Endpoint.API); } } diff --git a/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsClientCmdSnapshotTest.java b/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsApiCmdSnapshotTest.java similarity index 66% rename from src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsClientCmdSnapshotTest.java rename to src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsApiCmdSnapshotTest.java index 7ce3dd57..6f1353a7 100644 --- a/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsClientCmdSnapshotTest.java +++ b/src/test/java/com/dtsx/astra/cli/snapshot/commands/db/endpoints/EndpointsApiCmdSnapshotTest.java @@ -4,16 +4,16 @@ import com.dtsx.astra.cli.snapshot.annotations.TestForAllOutputs; import com.dtsx.astra.cli.snapshot.annotations.TestForDifferentOutputs; -public class EndpointsClientCmdSnapshotTest extends BaseEndpointCmdSnapshotTest { +public class EndpointsApiCmdSnapshotTest extends BaseEndpointCmdSnapshotTest { @Override @TestForAllOutputs public void endpoint_found(OutputType outputType) { - verifyRun("db endpoints client ${DatabaseId}", outputType, opts); + verifyRun("db endpoints api ${DatabaseId}", outputType, opts); } @Override @TestForDifferentOutputs public void endpoint_found_for_region(OutputType outputType) { - verifyRun("db endpoints client ${DatabaseId} -r ap-south-1", outputType, opts); + verifyRun("db endpoints api ${DatabaseId} -r ap-south-1", outputType, opts); } } diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.csv.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.csv.approved.txt similarity index 69% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.csv.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.csv.approved.txt index 097250e3..2d4db7db 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.csv.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.csv.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -o csv +command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -o csv exit_code: 0 ---- output ---- stdout: code,message,data diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.human.approved.txt similarity index 67% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.human.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.human.approved.txt index 70134d99..58ca5b04 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.human.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 +command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 exit_code: 0 ---- output ---- stdout: https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.json.approved.txt similarity index 72% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.json.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.json.approved.txt index 0e285c80..38328d59 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found.json.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -o json +command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -o json exit_code: 0 ---- output ---- stdout: { diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.human.approved.txt similarity index 63% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.human.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.human.approved.txt index d7a7ca75..434a3a41 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.human.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 +command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 exit_code: 0 ---- output ---- stdout: https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.json.approved.txt similarity index 68% rename from src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.json.approved.txt rename to src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.json.approved.txt index 8c0076b8..7e779519 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsClientCmd/endpoint_found_for_region.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsApiCmd/endpoint_found_for_region.json.approved.txt @@ -1,5 +1,5 @@ ---- meta ---- -command: astra db endpoints client 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 -o json +command: astra db endpoints api 822b0fff-6a73-4322-a8ec-09832b075287 -r ap-south-1 -o json exit_code: 0 ---- output ---- stdout: { diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt index 12842aa9..0b97d874 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.csv.approved.txt @@ -3,8 +3,8 @@ command: astra db endpoints list 822b0fff-6a73-4322-a8ec-09832b075287 -o csv exit_code: 0 ---- output ---- stdout: code,message,endpoint,url -stdout: OK,,client,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com -stdout: OK,,curl,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json +stdout: OK,,api,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com +stdout: OK,,data-api,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json stdout: OK,,playground,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/playground stdout: OK,,swagger,https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui ---- end ---- diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt index cfe93cc6..9d380504 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.human.approved.txt @@ -5,8 +5,8 @@ exit_code: 0 stdout: ┌────────────┬────────────────────────────────────────────────────────────────────────────────────────────────────────┐ stdout: │ Endpoint │ URL │ stdout: ├────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -stdout: │ client │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com │ -stdout: │ curl │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json │ +stdout: │ api │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com │ +stdout: │ data-api │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json │ stdout: │ playground │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/playground │ stdout: │ swagger │ https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/json/swagger-ui │ stdout: └────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt index 4dd74ead..07c21022 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found.json.approved.txt @@ -5,10 +5,10 @@ exit_code: 0 stdout: { stdout: "code" : "OK", stdout: "data" : [ { -stdout: "endpoint" : "client", +stdout: "endpoint" : "api", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com" stdout: }, { -stdout: "endpoint" : "curl", +stdout: "endpoint" : "data-api", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-us-east-2.apps.astra-dev.datastax.com/api/v1/json" stdout: }, { stdout: "endpoint" : "playground", diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt index 8485536b..875b8a11 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.human.approved.txt @@ -5,8 +5,8 @@ exit_code: 0 stdout: ┌────────────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────┐ stdout: │ Endpoint │ URL │ stdout: ├────────────┼─────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -stdout: │ client │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com │ -stdout: │ curl │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json │ +stdout: │ api │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com │ +stdout: │ data-api │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json │ stdout: │ playground │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/playground │ stdout: │ swagger │ https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/json/swagger-ui │ stdout: └────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────┘ diff --git a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt index ab8bc8fd..39912aa4 100644 --- a/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt +++ b/src/test/resources/snapshots/_db/_endpoints/EndpointsListCmd/endpoint_found_for_region.json.approved.txt @@ -5,10 +5,10 @@ exit_code: 0 stdout: { stdout: "code" : "OK", stdout: "data" : [ { -stdout: "endpoint" : "client", +stdout: "endpoint" : "api", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com" stdout: }, { -stdout: "endpoint" : "curl", +stdout: "endpoint" : "data-api", stdout: "url" : "https://822b0fff-6a73-4322-a8ec-09832b075287-ap-south-1.apps.astra-dev.datastax.com/api/v1/json" stdout: }, { stdout: "endpoint" : "playground",