v1.0.4 hotfixes (#287)

* update cqlsh.url to point to bundled+prepatched cqlsh-astra

* update upgrade notifier to hopefully cause less security false alarms

Author: toptobes

.idea/inspectionProfiles/Project_Default.xml

@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "com.dtsx.astra.cli"
-version = "1.0.3"
+version = "1.0.4"
 
 val mockitoAgent = configurations.create("mockitoAgent")
 

assets/cqlsh-astra.tar.gz

@@ -11,7 +11,8 @@ com.dtsx.astra.sdk.org.domain.[User,ResponseAllUsers,InviteUserRequest]
 com.dtsx.astra.sdk.org.domain.[Role,RolePolicy]
 
 # Db gateway
-com.dtsx.astra.sdk.db.domain.^[.+\$Database.+Builder,AccessList.*]
+# com.dtsx.astra.sdk.db.domain.^[.+\$Database.+Builder,AccessList.*]
+com.dtsx.astra.sdk.db.domain.*
 
 # Token gateway
 com.dtsx.astra.sdk.org.domain.[CreateTokenResponse,ResponseAllIamTokens,IamToken]
@@ -35,10 +36,8 @@ com.dtsx.astra.sdk.pcu.domain.*
 
 # Other misc Data API stuff
 com.datastax.astra.internal.api.[DataAPI.+]
-com.datastax.astra.client.core.vectorize.VectorServiceOptions
-com.datastax.astra.client.core.vector.VectorOptions
-com.datastax.astra.client.core.rerank.RerankServiceOptions$Parameters
-com.datastax.astra.client.core.rerank.RerankServiceOptions
-com.datastax.astra.client.core.rerank.CollectionRerankOptions
+com.datastax.astra.client.core.vectorize.*
+com.datastax.astra.client.core.vector.*
+com.datastax.astra.client.core.rerank.*
 com.datastax.astra.client.core.lexical.LexicalOptions
 com.datastax.astra.client.core.commands.Command$CommandSerializer

build.gradle.kts

@@ -117,7 +117,7 @@ function Get-Env {
 }
 
 # Version (updated automatically by CI)
-$ASTRA_CLI_VERSION = "1.0.3"
+$ASTRA_CLI_VERSION = "1.0.4"
 
 # Checksum constant (updated automatically by CI)
 $WINDOWS_X86_64_CHECKSUM = "bac92ad514cedd07e21e9e5435f7361751c679a6d28b9ee8f4df000e88cc12d3"

reflected.txt

@@ -46,7 +46,7 @@ renderCommand() {
 }
 
 # Constants
-ASTRA_CLI_VERSION="1.0.3"
+ASTRA_CLI_VERSION="1.0.4"
 
 # Checksum constants (updated automatically by CI)
 LINUX_X86_64_CHECKSUM="4e7fc02419f14baf5da3905323b8e2fc5bf192cda4fea8c550f0eeb93a286f7c"

scripts/install.ps1

@@ -53,7 +53,6 @@
 
 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;

scripts/install.sh

@@ -51,8 +51,8 @@ protected OutputHuman executeHuman(Supplier<Void> v) {
             throw new OptionValidationException("spec file", "Specified path does not exist: " + specFile);
         }
 
-        val docsSpec = JsonUtils.objectMapper().readValue(
-            specFile.toFile(),
+        val docsSpec = JsonUtils.readValue(
+            Files.readString(specFile),
             ExternalDocsSpec.class
         );
 

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

@@ -43,7 +43,7 @@ public class CliContext {
     Optional<Profile> forceProfileForTesting;
 
     public Path path(String first, String... more) {
-        return fs.getPath(first, more);
+        return FileUtils.expandTilde(this, fs.getPath(first, more));
     }
 
     public Path absPath(String first, String... more) {

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

@@ -113,6 +113,6 @@ private String readJsonString(String value) {
 
     @SneakyThrows
     private String writeJsonString(String value) {
-        return JsonUtils.writeValue(value); // easy way to escape strings
+        return JsonUtils.formatJsonCompact(value); // easy way to escape strings
     }
 }