v1.0.3 (#280)

* .envrc patch

* update loading spinner impelmentation to be more reactive

* Resolve #279

* Resolves #276

* Resolves #272

* Resolves #271

* Resolves #281

* Resolves #282

* Resolves #273

* Resolves #270

* resolve #260

* Resolves #259

* version

* chore: update checksums and version for 1.0.3-beta.1 (#283)

Co-authored-by: toptobes <96998732+toptobes@users.noreply.github.com>

* Resolves #262

* add "astra db endpoints list"; update some tests

* bump version

* chore: update checksums and version for v1.0.3 (#284)

Co-authored-by: toptobes <96998732+toptobes@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: toptobes

.envrc

@@ -7,3 +7,5 @@ if nix --version &> /dev/null; then
 fi
 
 PATH_add scripts
+
+unset DEVELOPER_DIR

.idea/inspectionProfiles/Project_Default.xml

@@ -482,7 +482,7 @@ Some commands, namely the ones that build on `cqlsh`, `dsbulk`, and `pulsar-shel
     astra db cqlsh mydb -k my_keyspace -f ./my_script.cql
     
     # v1.x
-    echo "SELECT * FROM my_table" | astra db cqlsh exec mydb -k my_keyspace
+    echo "SELECT * FROM my_table" | astra db cqlsh exec mydb -k my_keyspace -e
     astra db cqlsh exec mydb -k my_keyspace "SELECT * FROM my_table"
     astra db cqlsh exec mydb -k my_keyspace -f ./my_script.cql
     ```

README.md

@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "com.dtsx.astra.cli"
-version = "1.0.2"
+version = "1.0.3"
 
 val mockitoAgent = configurations.create("mockitoAgent")
 
@@ -150,7 +150,8 @@ tasks.test {
 
     jvmArgs = listOf(
         "--enable-native-access=ALL-UNNAMED",
-        "-javaagent:${mockitoAgent.asPath}"
+        "-javaagent:${mockitoAgent.asPath}",
+        "-Duser.timezone=CST"
     )
 }
 

build.gradle.kts

@@ -0,0 +1 @@
+lombok.accessors.fluent = true

lombok.config

@@ -117,10 +117,10 @@ function Get-Env {
 }
 
 # Version (updated automatically by CI)
-$ASTRA_CLI_VERSION = "1.0.2"
+$ASTRA_CLI_VERSION = "1.0.3"
 
 # Checksum constant (updated automatically by CI)
-$WINDOWS_X86_64_CHECKSUM = "ef4f7feca7c83cdf040810b877f3736239be368739b46f1a8f5da6a7783131f6"
+$WINDOWS_X86_64_CHECKSUM = "bac92ad514cedd07e21e9e5435f7361751c679a6d28b9ee8f4df000e88cc12d3"
 
 if ($env:ASTRA_HOME) {
     $ASTRA_CLI_DIR = "$env:ASTRA_HOME\cli"

scripts/install.ps1

@@ -45,14 +45,14 @@ renderCommand() {
   printf "${BLUE}\$${RESET} %s\n" "$1"
 }
 
-# Version (updated automatically by CI)
-ASTRA_CLI_VERSION="1.0.2"
+# Constants
+ASTRA_CLI_VERSION="1.0.3"
 
 # Checksum constants (updated automatically by CI)
-LINUX_X86_64_CHECKSUM="9803787e9139ca51f52ae757a26116d2405dffba0a32a8f61093bead71ee78c6"
-LINUX_ARM64_CHECKSUM="ea94a1a729c5880139c703753b470eb61b7ac8edea2e75d30c3af0f345b7c713"
-MACOS_X86_64_CHECKSUM="8b873dfa3c75eaa17af8fde12f30f291558a0a2a5546f775b0ef207b49450edd"
-MACOS_ARM64_CHECKSUM="d868138f6714f3ed8f681283de8ff1a4c1318e592733821fbb6e75ae32547d0e"
+LINUX_X86_64_CHECKSUM="4e7fc02419f14baf5da3905323b8e2fc5bf192cda4fea8c550f0eeb93a286f7c"
+LINUX_ARM64_CHECKSUM="0fde0ddf84b30cf5f6e9a17cda744d4168c67aa8dd6bd5a14ff2f183e519c5f8"
+MACOS_X86_64_CHECKSUM="9d0edff05e251d64fd9ec54e39f51dc9b2503c8ff38768e2d2a1df0ca73cc417"
+MACOS_ARM64_CHECKSUM="508ca826cadebba997dbd1a8937840e2ba3f86a29e84960864cc9a78f45f9d8c"
 
 if [ -n "${ASTRA_HOME:-}" ]; then
   ASTRA_CLI_DIR_RESOLVER="custom"

scripts/install.sh

@@ -40,7 +40,6 @@
 import lombok.Cleanup;
 import lombok.Getter;
 import lombok.SneakyThrows;
-import lombok.experimental.Accessors;
 import lombok.val;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -54,6 +53,7 @@
 
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.sql.DataTruncation;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.StringJoiner;
@@ -142,7 +142,7 @@ public static void main(String... args) {
             CliPropertiesImpl.mkAndLoadSysProps(cliEnv, MemoizedCliProperties::new),
             OutputType.HUMAN,
             new AstraColors(Ansi.AUTO),
-            new AstraLogger(Level.REGULAR, getCtx, false, Optional.empty(), Optional.empty()),
+            new AstraLogger(Level.REGULAR, cliEnv, getCtx, false, Optional.empty(), Optional.empty()),
             new AstraConsole(System.in, mkPrintWriter(System.out, "stdout"), mkPrintWriter(System.err, "stderr"), null, getCtx, false),
             new AstraHome(getCtx),
             FileSystems.getDefault(),
@@ -155,7 +155,6 @@ public static void main(String... args) {
     }
 
     @Getter
-    @Accessors(fluent = true)
     private static @Nullable Supplier<CliContext> unsafeGlobalCliContext;
 
     @SneakyThrows
@@ -182,8 +181,8 @@ public static int run(Ref<CliContext> ctxRef, String... args) {
             .setOverwrittenOptionsAllowed(true);
 
         ctxRef.nowAndOnUpdate((ctx) -> {
-            cmd.setOut(ctx.console().getOut());
-            cmd.setErr(ctx.console().getErr());
+            cmd.setOut(ctx.console().stdout());
+            cmd.setErr(ctx.console().stderr());
         });
 
         cmd.getSubcommands().get("help").getCommandSpec().usageMessage().hidden(true);
@@ -236,26 +235,26 @@ public static <T> T exit(int exitCode) {
 
     public static class SetupExampleProvider implements ExampleProvider {
         @Override
-        public Pair<String, String> get(CliContext ctx) {
+        public Pair<String, String[]> get(CliContext ctx) {
             if (System.getProperty("cli.testing") == null) { // keeps output deterministic for testing
                 try {
                     val configFileExists = Files.exists(AstraConfig.resolveDefaultAstraConfigFile(ctx));
 
                     if (!configFileExists) {
-                        return Pair.of("Setup the Astra CLI", "${cli.name} setup");
+                        return Pair.of("Setup the Astra CLI", new String[] { "${cli.name} setup" });
                     }
 
                     val autocompleteSetup = System.getenv(ConstEnvVars.COMPLETIONS_SETUP) != null;
 
                     if (!autocompleteSetup && ctx.isNotWindows()) {
-                        return Pair.of("Put this in your shell profile to generate completions and more!",  "eval \"$(${cli.path} shellenv)\"");
+                        return Pair.of("Put this in your shell profile to generate completions and more!", new String[] { "eval \"$(${cli.path} shellenv)\"" });
                     }
                 } catch (Exception e) {
                     ctx.log().exception("Error resolving main example for AstraCli", e);
                 }
             }
 
-            return Pair.of("Create a new profile", "${cli.name} setup");
+            return Pair.of("Create a new profile", new String[] { "${cli.name} setup"});
         }
     }
 }

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

@@ -126,8 +126,8 @@ public final void run() {
             ctx.properties(),
             common.outputType(),
             new AstraColors(ansi),
-            new AstraLogger(level, () -> ctx, common.shouldDumpLogs(), common.dumpLogsTo(), common.enableSpinner()),
-            new AstraConsole(ctx.console().getIn(), ctx.console().getOut(), ctx.console().getErr(), ctx.console().getReadLineImpl(), () -> ctx, common.noInput()),
+            new AstraLogger(level, ctx.env(), () -> ctx, common.shouldDumpLogs(), common.dumpLogsTo(), common.enableSpinner()),
+            new AstraConsole(ctx.console().stdin(), ctx.console().stdout(), ctx.console().stderr(), ctx.console().readLineImpl(), () -> ctx, common.noInput()),
             ctx.home(),
             ctx.fs(),
             ctx.gateways(),

src/main/java/com/dtsx/astra/cli/commands/AbstractCmd.java

@@ -15,7 +15,6 @@
 
 import static com.dtsx.astra.cli.commands.AbstractCmd.SHOW_CUSTOM_DEFAULT;
 
-@Accessors(fluent = true)
 @AllArgsConstructor
 @NoArgsConstructor
 public class CommonOptions extends HelpMixin { // I don't like extending here but mixins don't compose w/ arg groups :(