More work on resolving #255

Author: toptobes

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

@@ -42,6 +42,7 @@
 import lombok.SneakyThrows;
 import lombok.experimental.Accessors;
 import lombok.val;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
@@ -53,6 +54,7 @@
 
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.function.Supplier;
@@ -197,7 +199,17 @@ public static int run(Ref<CliContext> ctxRef, String... args) {
             return DefaultsRenderer.helpWithOverriddenDefaultsRendering(spec, cs);
         });
 
-        return cmd.execute(args);
+        val allArgs = ArrayUtils.addAll(defaultArgs(), args);
+        return cmd.execute(allArgs);
+    }
+
+    private static String[] defaultArgs() {
+        val defaultArgsStr = Optional.ofNullable(System.getenv(ConstEnvVars.DEFAULT_ARGS))
+            .orElse("");
+
+        return Arrays.stream(defaultArgsStr.split("\\s+"))
+            .filter(s -> !s.isBlank())
+            .toArray(String[]::new);
     }
 
     private static IFactory mkFactory(Ref<CliContext> ctxRef) {

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

@@ -16,6 +16,7 @@
 import com.dtsx.astra.cli.core.exceptions.AstraCliException;
 import com.dtsx.astra.cli.core.models.AstraToken;
 import com.dtsx.astra.cli.core.output.Hint;
+import com.dtsx.astra.cli.core.properties.CliProperties.ConstEnvVars;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import lombok.val;
 import org.apache.commons.lang3.tuple.Pair;
@@ -28,6 +29,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.dtsx.astra.cli.core.output.ExitCode.PARSE_ISSUE;
 import static com.dtsx.astra.cli.core.output.ExitCode.PROFILE_NOT_FOUND;
 
 public abstract class AbstractConnectedCmd<OpRes> extends AbstractCmd<OpRes> {
@@ -71,7 +73,7 @@ public static class ConfigSpec {
         @Option(
             names = { $Profile.LONG, $Profile.SHORT },
             completionCandidates = AvailableProfilesCompletion.class,
-            description = "The @|code .astrarc|@ profile to use for this command",
+            description = "The @|code .astrarc|@ profile to use for this command. Can be set via @|code " + ConstEnvVars.PROFILE + "|@.",
             paramLabel = $Profile.LABEL
         )
         public Optional<ProfileName> $profileName;
@@ -121,7 +123,14 @@ private ProfileSource profileSource() {
 
         if ($credsProvider != null && $credsProvider.$config != null) {
             val configFile = $credsProvider.$config.$configFile;
-            val profileName = $credsProvider.$config.$profileName.orElse(ProfileName.DEFAULT);
+
+            val defaultProfileName = Optional.ofNullable(System.getenv(ConstEnvVars.PROFILE))
+                 .map(ProfileName::parse)
+                 .map((p) -> p.getRight((e) -> new AstraCliException(PARSE_ISSUE, "Invalid profile name in " + ConstEnvVars.PROFILE + ": '" + e + "'")))
+                 .orElse(ProfileName.DEFAULT);
+
+            val profileName = $credsProvider.$config.$profileName
+                .orElse(defaultProfileName);
 
             // the check for if it's the default file is later used to decide whether to update the completions cache or not
             if (configFile.isPresent()) {

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

@@ -27,7 +27,6 @@ public enum ColorMode { auto, never, always }
         description = { "One of: ${COMPLETION-CANDIDATES}", SHOW_CUSTOM_DEFAULT + "auto" },
         arity = "0..1",
         fallbackValue = "always",
-        defaultValue = "${ASTRA_DEFAULT_COLOR:-auto}",
         paramLabel = "WHEN"
     )
     private void setAnsi(ColorMode mode) {
@@ -40,7 +39,6 @@ private void setAnsi(ColorMode mode) {
 
     @Option(
         names = "--no-color",
-        defaultValue = "${ASTRA_NO_COLOR:-false}", // no DEFAULT in env var on purpose to better adhere to per-program NO_COLOR semantics
         hidden = true
     )
     private void setAnsi(boolean noColor) {
@@ -50,7 +48,7 @@ private void setAnsi(boolean noColor) {
     @Option(
         names = { "--output", "-o" },
         completionCandidates = OutputTypeCompletion.class,
-        defaultValue = "${ASTRA_DEFAULT_OUTPUT_TYPE:-human}",
+        defaultValue = "human",
         description = "One of: ${COMPLETION-CANDIDATES}",
         paramLabel = "FORMAT"
     )
@@ -61,7 +59,6 @@ private void setAnsi(boolean noColor) {
     @Option(
         names = { "-V", "--verbose" },
         description = "Enable verbose logging output",
-        defaultValue = "${ASTRA_DEFAULT_VERBOSE:-false}",
         showDefaultValue = Visibility.NEVER
     )
     private boolean verbose;
@@ -70,7 +67,6 @@ private void setAnsi(boolean noColor) {
     @Option(
         names = { "-q", "--quiet" },
         description = "Only output essential information",
-        defaultValue = "${ASTRA_DEFAULT_QUIET:-false}",
         showDefaultValue = Visibility.NEVER
     )
     private boolean quiet;
@@ -79,7 +75,6 @@ private void setAnsi(boolean noColor) {
     @Option(
         names = { "--spinner" },
         description = { "Enable/disable loading spinners", SHOW_CUSTOM_DEFAULT + "enabled if tty and not quiet" },
-        defaultValue = "${ASTRA_DEFAULT_SPINNER:-" + Option.NULL_VALUE + "}",
         negatable = true,
         fallbackValue = "true"
     )
@@ -95,7 +90,6 @@ private void setAnsi(boolean noColor) {
         names = "--dump-logs",
         description = { "Write all logs to an optionally specified file", SHOW_CUSTOM_DEFAULT + "${cli.home-folder.path}/logs/<file>.log" },
         fallbackValue = "__fallback__",
-        defaultValue = "${ASTRA_DEFAULT_DUMP_LOGS:-" + Option.NULL_VALUE + "}",
         paramLabel = "FILE",
         arity = "0..1"
     )
@@ -130,7 +124,6 @@ private void setDumpLogs(boolean noDumpLogs) {
     @Option(
         names = "--no-input",
         description = "Don't ask for user input (e.g. confirmation prompts)",
-        defaultValue = "${ASTRA_DEFAULT_NO_INPUT:-false}",
         showDefaultValue = Visibility.NEVER
     )
     private boolean noInput;

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

@@ -19,6 +19,8 @@ class ConstEnvVars {
         public static final String IGNORE_BETA_WARNINGS = "ASTRA_IGNORE_BETA_WARNINGS";
         public static final String NO_UPDATE_NOTIFIER = "ASTRA_NO_UPDATE_NOTIFIER";
         public static final String COMPLETIONS_SETUP = "ASTRA_COMPLETIONS_SETUP";
+        public static final String DEFAULT_ARGS = "ASTRA_DEFAULT_ARGS";
+        public static final String PROFILE = "ASTRA_PROFILE";
     }
 
     record ExternalSoftware(