fix some issues with installing external software (hopefully for real this time...)

Author: toptobes

.idea/inspectionProfiles/Project_Default.xml

@@ -69,7 +69,7 @@ public <T> T throwNoInstallationFound() {
           Please install @!cqlsh!@ by running any cqlsh command through @!${cli.name}!@.
         
           @|faint,italic Note that the CLI does not recognize cqlsh installations done outside of astra.|@
-        """.formatted(ctx.home().getDir()), List.of(
+        """.formatted(ctx.home().root()), List.of(
             new Hint("Example command to install cqlsh (no --if-exists flag):", "${cli.name} db cqlsh path")
         ));
     }

src/main/java/com/dtsx/astra/cli/commands/db/cqlsh/CqlshPathCmd.java

@@ -69,7 +69,7 @@ public <T> T throwNoInstallationFound() {
           Please install @!dsbulk!@ by running any dsbulk command through @!${cli.name}!@.
         
           @|faint,italic Note that the CLI does not recognize dsbulk installations done outside of astra.|@
-        """.formatted(ctx.home().getDir()), List.of(
+        """.formatted(ctx.home().root()), List.of(
             new Hint("Example command to install dsbulk (no --if-exists flag):", "${cli.name} db dsbulk path")
         ));
     }

src/main/java/com/dtsx/astra/cli/commands/db/dsbulk/DbDsbulkPathCmd.java

@@ -70,7 +70,7 @@ public <T> T throwNoInstallationFound() {
           Please install @!pulsar!@ by running any pulsar command through @!${cli.name}!@.
         
           @|faint,italic Note that the CLI does not recognize pulsar installations done outside of astra.|@
-        """.formatted(ctx.home().getDir()), List.of(
+        """.formatted(ctx.home().root()), List.of(
             new Hint("Example command to install pulsar:", "${cli.name} streaming pulsar version")
         ));
     }

src/main/java/com/dtsx/astra/cli/commands/streaming/pulsar/StreamingPulsarPathCmd.java

@@ -103,7 +103,7 @@ public final void removeFromCache(String completion) {
     }
 
     protected static Path defaultCacheDir(CliContext ctx) {
-        return ctx.home().dirs().useCompletionsCache();
+        return ctx.home().dirs.completionsCache.use();
     }
 
     @SneakyThrows

src/main/java/com/dtsx/astra/cli/core/completions/CompletionsCache.java

@@ -2,94 +2,81 @@
 
 import com.dtsx.astra.cli.core.CliContext;
 import com.dtsx.astra.cli.core.datatypes.Thunk;
-import com.dtsx.astra.cli.core.models.Version;
 import com.dtsx.astra.cli.utils.FileUtils;
-import lombok.val;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 public class AstraHome {
     private final Supplier<CliContext> ctxSupplier;
-    private final Thunk<Path> dir;
-    private final Thunk<Dirs> dirs;
+    private Thunk<Path> dir;
 
     public AstraHome(Supplier<CliContext> ctxSupplier) {
         this.ctxSupplier = ctxSupplier;
 
         this.dir = new Thunk<>(() -> (
            ctx().path(ctx().properties().homeFolderLocations(ctx().isWindows()).preferred())
         ));
-
-        this.dirs = new Thunk<>(Dirs::new);
     }
 
-    public String getDir() {
-        return dir.toString();
+    public String root() {
+        return dir.get().toString();
     }
 
-    public Path useDir() {
-        FileUtils.createDirIfNotExists(dir.get(), null);
-        return dir.get();
-    }
+    public final UsablePath updateNotifierProperties = new Thunk<>(() -> {
+        Path path = dir.get().resolve("upgrade-notifier.properties");
+        FileUtils.createFileIfNotExists(path, null);
+        return path;
+    })::get;
 
-    public Dirs dirs() {
-        return dirs.get();
-    }
+    public final AstraSubfolders dirs = new AstraSubfolders();
 
-    public class Dirs {
-        private final Path SCB = dir.get().resolve("scb");
-        private final Path COMPLETIONS_CACHE = dir.get().resolve("completions-cache");
-        private final Path LOGS = dir.get().resolve("logs");
-        private final Path CQLSH = dir.get().resolve("cqlsh-astra");
+    public class AstraSubfolders {
+        public final AstraSubfolder scb = new AstraSubfolder("scb");
+        public final AstraSubfolder completionsCache = new AstraSubfolder("completions-cache");
+        public final AstraSubfolder logs = new AstraSubfolder("logs");
 
-        public Path useScb() {
-            FileUtils.createDirIfNotExists(SCB, null);
-            return SCB;
+        public AstraSubfolder cqlsh(String version) {
+            return new AstraSubfolder("cqlsh-astra@v1", version);
         }
 
-        public Path useCompletionsCache() {
-            FileUtils.createDirIfNotExists(COMPLETIONS_CACHE, null);
-            return COMPLETIONS_CACHE;
+        public AstraSubfolder dsbulk(String version) {
+            return new AstraSubfolder("dsbulk@v1", version);
         }
 
-        public Path useLogs() {
-            FileUtils.createDirIfNotExists(LOGS, null);
-            return LOGS;
+        public AstraSubfolder pulsar(String version) {
+            return new AstraSubfolder("pulsar-shell@v1", version);
         }
+    }
 
-        public Path useCqlsh(Version version) {
-            val path = dir.get().resolve("cqlsh-astra").resolve(version.toString());
-            FileUtils.createDirIfNotExists(path, null);
-            return CQLSH;
-        }
+    public interface UsablePath {
+        Path use();
+    }
 
-        public Path useDsbulk(Version version) {
-            val path = dir.get().resolve("dsbulk").resolve(version.toString());
-            FileUtils.createDirIfNotExists(path, null);
-            return path;
-        }
+    public class AstraSubfolder implements UsablePath {
+        private final Supplier<Path> folder;
 
-        public Path usePulsar(Version version) {
-            val path = dir.get().resolve("lunastreaming-shell").resolve(version.toString());
-            FileUtils.createDirIfNotExists(path, null);
-            return path;
+        public AstraSubfolder(String... subfolder) {
+            this.folder = new Thunk<>(() -> dir.get().resolve(ctx().fs().getPath("", subfolder)));
         }
 
-        public boolean cqlshExists(Version version) {
-            val path = dir.get().resolve("cqlsh-astra").resolve(version.toString());
-            return Files.exists(path);
+        public boolean exists() {
+            return Files.exists(folder.get());
         }
 
-        public boolean dsbulkExists(Version version) {
-            val path = dir.get().resolve("dsbulk").resolve(version.toString());
-            return Files.exists(path);
+        public Optional<Path> useIfExists() {
+            if (exists()) {
+                return Optional.of(use());
+            }
+            return Optional.empty();
         }
 
-        public boolean pulsarExists(Version version) {
-            val path = dir.get().resolve("lunastreaming-shell").resolve(version.toString());
-            return Files.exists(path);
+        @Override
+        public Path use() {
+            FileUtils.createDirIfNotExists(folder.get(), null);
+            return folder.get();
         }
     }
 

src/main/java/com/dtsx/astra/cli/core/config/AstraHome.java

@@ -2,6 +2,7 @@
 
 import com.dtsx.astra.cli.core.CliContext;
 import com.dtsx.astra.cli.core.datatypes.Either;
+import com.dtsx.astra.cli.core.exceptions.internal.cli.CongratsYouFoundABugException;
 import com.dtsx.astra.cli.core.output.Highlightable;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -45,7 +46,7 @@ public static Either<String, Version> parse(String version) {
     }
 
     public static Version mkUnsafe(String version) {
-        return parse(version).getRight();
+        return parse(version).getRight((_) -> new CongratsYouFoundABugException("Invalid version: " + version));
     }
 
     public boolean isPreRelease() {

src/main/java/com/dtsx/astra/cli/core/models/Version.java

@@ -61,7 +61,7 @@ public AstraLogger(Level level, Supplier<CliContext> ctxSupplier, boolean should
             this.sessionLogFile = () -> {
                 if (cachedLogFile.ref == null) {
                     val timestamp = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss").format(Instant.now().atZone(ZoneId.systemDefault()));
-                    cachedLogFile.ref = ctx().home().dirs().useLogs().resolve(timestamp + ".astra.log");
+                    cachedLogFile.ref = ctx().home().dirs.logs.use().resolve(timestamp + ".astra.log");
                 }
                 return cachedLogFile.ref;
             };
@@ -191,7 +191,7 @@ public void dumpLogsToFile() {
         }
         logsDumped = true;
 
-        deleteOldLogs(ctx().home().dirs().useLogs());
+        deleteOldLogs(ctx().home().dirs.logs.use());
 
         try (var writer = Files.newBufferedWriter(sessionLogFile.get())) {
             for (val line : accumulated) {

src/main/java/com/dtsx/astra/cli/core/output/AstraLogger.java

@@ -23,7 +23,7 @@ class ConstEnvVars {
 
     record ExternalSoftware(
         String url,
-        Version version
+        String version // can't use Version here unfortunately b/c pulsar-shell doesn't use semver ._.
     ) {}
 
     enum PathLocationResolver { CUSTOM, XDG, HOME }

src/main/java/com/dtsx/astra/cli/core/properties/CliProperties.java

@@ -55,17 +55,17 @@ public static CliProperties mkAndLoadSysProps(CliEnvironment env, Function<CliPr
 
     @Override
     public ExternalSoftware cqlsh() {
-        return new ExternalSoftware(requireProperty("cqlsh.url"), Version.mkUnsafe(requireProperty("cqlsh.version")));
+        return new ExternalSoftware(requireProperty("cqlsh.url"), requireProperty("cqlsh.version"));
     }
 
     @Override
     public ExternalSoftware dsbulk() {
-        return new ExternalSoftware(requireProperty("dsbulk.url"), Version.mkUnsafe(requireProperty("dsbulk.version")));
+        return new ExternalSoftware(requireProperty("dsbulk.url"), requireProperty("dsbulk.version"));
     }
 
     @Override
     public ExternalSoftware pulsar() {
-        return new ExternalSoftware(requireProperty("pulsar-shell.url"), Version.mkUnsafe(requireProperty("pulsar-shell.version")));
+        return new ExternalSoftware(requireProperty("pulsar-shell.url"), requireProperty("pulsar-shell.version"));
     }
 
     @Override