resolve #249

Author: toptobes

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

@@ -42,7 +42,7 @@
 import lombok.SneakyThrows;
 import lombok.experimental.Accessors;
 import lombok.val;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
 import picocli.CommandLine;
@@ -229,20 +229,20 @@ public Pair<String, String> get(CliContext ctx) {
                     val configFileExists = Files.exists(AstraConfig.resolveDefaultAstraConfigFile(ctx));
 
                     if (!configFileExists) {
-                        return Pair.create("Setup the Astra CLI", "${cli.name} setup");
+                        return Pair.of("Setup the Astra CLI", "${cli.name} setup");
                     }
 
                     val autocompleteSetup = System.getenv(ConstEnvVars.COMPLETIONS_SETUP) != null;
 
                     if (!autocompleteSetup && ctx.isNotWindows()) {
-                        return Pair.create("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!",  "eval \"$(${cli.path} shellenv)\"");
                     }
                 } catch (Exception e) {
                     ctx.log().exception("Error resolving main example for AstraCli", e);
                 }
             }
 
-            return Pair.create("Create a new profile", "${cli.name} setup");
+            return Pair.of("Create a new profile", "${cli.name} setup");
         }
     }
 }

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

@@ -18,7 +18,7 @@
 import com.dtsx.astra.cli.core.output.Hint;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import lombok.val;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -101,7 +101,7 @@ public final Profile profile() {
     }
 
     public final Pair<Profile, ProfileSource> profileAndSource() {
-        return Pair.create(profile(), profileSource());
+        return Pair.of(profile(), profileSource());
     }
 
     private ProfileSource profileSource() {

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

@@ -91,7 +91,7 @@ private OutputAll handleNuked(NukeResult res) {
         val summary = new StringBuilder();
         val nothingToReport = new ArrayList<String>();
 
-        appendToSummary("Files deleted", summary, nothingToReport, "deleted", res.deletedFiles().stream().collect(HashMap::new, (m, v) -> m.put(v, Optional.of(" @|faint (contained binary)|@").filter((_) -> res.cliBinaryPath().startsWith(v))), Map::putAll));
+        appendToSummary("Files deleted", summary, nothingToReport, "deleted", res.deletedFiles().stream().collect(HashMap::new, (m, v) -> m.put(v, Optional.of(" @|faint (contained binary)|@").filter((_) -> res.cliPath().unwrap().startsWith(v))), Map::putAll));
         appendToSummary("Shell profiles containing @!astra!@", summary, nothingToReport, "needing updates", res.shellRcFilesToUpdate().stream().collect(HashMap::new, (m, v) -> m.put(v, Optional.empty()), Map::putAll));
         appendToSummary("Files skipped", summary, nothingToReport, "skipped", res.skipped().entrySet().stream().collect(HashMap::new, (m, v) -> m.put(v.getKey(), Optional.of(" - " + v.getValue().reason())), Map::putAll));
 
@@ -134,7 +134,7 @@ private String buildCompleteUninstallationMsg(BinaryDeleteResult res) {
             case BinaryDeleted() -> """
               @|green Astra CLI binary has been successfully deleted from your system.|@
             """;
-            case BinaryMustBeDeleted(var deleteCommand) -> """
+            case CLIMustBeDeleted(var deleteCommand) -> """
               To complete the uninstallation, please run the following command in your terminal:
             
               %s

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

@@ -3,6 +3,7 @@
 import com.dtsx.astra.cli.core.exceptions.AstraCliException;
 import com.dtsx.astra.cli.core.help.Example;
 import com.dtsx.astra.cli.core.mixins.HelpMixin;
+import com.dtsx.astra.cli.core.properties.CliProperties.AstraBinary;
 import com.dtsx.astra.cli.core.properties.CliProperties.ConstEnvVars;
 import com.dtsx.astra.cli.utils.FileUtils;
 import lombok.val;
@@ -86,18 +87,18 @@ public class ShellEnvCmd implements Runnable {
 
     @Override
     public void run() {
-        val binaryPath = FileUtils.getCurrentBinaryPath();
+        val binaryPath = FileUtils.resolvePathToAstra();
 
-        if (binaryPath.isEmpty()) {
+        if (!(binaryPath instanceof AstraBinary)) {
             throw new AstraCliException(UNSUPPORTED_EXECUTION, """
               @|bold,red Error: Can not run this command when not executing from a binary|@
             """);
         }
 
         val sb = new StringBuilder();
 
-        sb.append("export PATH=").append(binaryPath.get().getParent()).append(":$PATH").append(NL);
-        sb.append("source <(").append(binaryPath.get()).append(" compgen)").append(NL);
+        sb.append("export PATH=").append(binaryPath.unwrap().getParent()).append(":$PATH").append(NL);
+        sb.append("source <(").append(binaryPath.unwrap()).append(" compgen)").append(NL);
 
         if ($ignoreMultiplePaths) {
             sb.append("export ").append(ConstEnvVars.IGNORE_MULTIPLE_PATHS).append("=true").append(NL);

src/main/java/com/dtsx/astra/cli/commands/streaming/StreamingCreateCmd.java

@@ -14,7 +14,7 @@
 import com.dtsx.astra.cli.operations.Operation;
 import com.dtsx.astra.cli.operations.streaming.StreamingCreateOperation;
 import lombok.val;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Command;
@@ -114,7 +114,7 @@ protected Operation<StreamingCreateResult> mkOperation() {
         return new StreamingCreateOperation(streamingGateway, new StreamingCreateRequest(
             $tenantName,
             ($tenantCreationOptions.$clusterOrCloud.$regionSpec != null)
-                ? Either.pure(Pair.create($tenantCreationOptions.$clusterOrCloud.$regionSpec.$cloud, $tenantCreationOptions.$clusterOrCloud.$regionSpec.$region))
+                ? Either.pure(Pair.of($tenantCreationOptions.$clusterOrCloud.$regionSpec.$cloud, $tenantCreationOptions.$clusterOrCloud.$regionSpec.$region))
                 : Either.left($tenantCreationOptions.$clusterOrCloud.$cluster.orElseThrow()),
             $tenantCreationOptions.$plan,
             $tenantCreationOptions.$userEmail,

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

@@ -6,7 +6,7 @@
 import com.dtsx.astra.cli.core.config.Profile;
 import com.dtsx.astra.cli.core.config.ProfileName;
 import lombok.val;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.VisibleForTesting;
 
 import java.nio.file.Path;

src/main/java/com/dtsx/astra/cli/core/completions/caches/DbCompletionsCache.java

@@ -4,7 +4,7 @@
 import com.dtsx.astra.cli.core.CliContext;
 import com.dtsx.astra.cli.core.completions.ProfileLinkedCompletionsCache;
 import com.dtsx.astra.cli.core.config.Profile;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 
 public class DbCompletionsCache extends ProfileLinkedCompletionsCache {
     public DbCompletionsCache(CliContext ctx,Pair<Profile, ProfileSource> profileAndSource) {

src/main/java/com/dtsx/astra/cli/core/completions/caches/PcuGroupsCompletionsCache.java

@@ -4,7 +4,7 @@
 import com.dtsx.astra.cli.core.CliContext;
 import com.dtsx.astra.cli.core.completions.ProfileLinkedCompletionsCache;
 import com.dtsx.astra.cli.core.config.Profile;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 
 public class PcuGroupsCompletionsCache extends ProfileLinkedCompletionsCache {
     public PcuGroupsCompletionsCache(CliContext ctx,Pair<Profile, ProfileSource> profileAndSource) {

src/main/java/com/dtsx/astra/cli/core/completions/caches/TenantCompletionsCache.java

@@ -4,7 +4,7 @@
 import com.dtsx.astra.cli.core.CliContext;
 import com.dtsx.astra.cli.core.completions.ProfileLinkedCompletionsCache;
 import com.dtsx.astra.cli.core.config.Profile;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 
 public class TenantCompletionsCache extends ProfileLinkedCompletionsCache {
     public TenantCompletionsCache(CliContext ctx,Pair<Profile, ProfileSource> profileAndSource) {

src/main/java/com/dtsx/astra/cli/core/completions/caches/UserCompletionsCache.java

@@ -4,7 +4,7 @@
 import com.dtsx.astra.cli.core.CliContext;
 import com.dtsx.astra.cli.core.completions.ProfileLinkedCompletionsCache;
 import com.dtsx.astra.cli.core.config.Profile;
-import org.graalvm.collections.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 
 public class UserCompletionsCache extends ProfileLinkedCompletionsCache {
     public UserCompletionsCache(CliContext ctx,Pair<Profile, ProfileSource> profileAndSource) {