acc: add Env setting

acceptance/acceptance_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/databricks/cli/acceptance/internal"
 	"github.com/databricks/cli/internal/testutil"
 	"github.com/databricks/cli/libs/testdiff"
+	"github.com/databricks/cli/libs/utils"
 	"github.com/databricks/databricks-sdk-go/service/iam"
 	"github.com/stretchr/testify/require"
 )
@@ -415,19 +416,19 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
  cmd.Env = append(cmd.Env, "GOCOVERDIR="+coverDir)
 	}
 
+	for _, key := range utils.SortedKeys(config.Env) {
+ if hasKey(customEnv, key) {
+ // We want EnvMatrix to take precedence.
+ // Skip rather than relying on cmd.Env order, because this might interfere with replacements and substitutions.
+ continue
+ }
+ cmd.Env = addEnvVar(t, cmd.Env, &repls, key, config.Env[key])
+	}
+
 	for _, keyvalue := range customEnv {
  items := strings.SplitN(keyvalue, "=", 2)
  require.Len(t, items, 2)
- key := items[0]
- value := items[1]
- newValue, newValueWithPlaceholders := internal.SubstituteEnv(value, cmd.Env)
- if value != newValue {
- t.Logf("Substituted %s %#v -> %#v (%#v)", key, value, newValue, newValueWithPlaceholders)
- }
- cmd.Env = append(cmd.Env, key+"="+newValue)
- repls.Set(newValue, "["+key+"]")
- // newValue won't match because parts of it were already replaced; we adding it anyway just in case but we need newValueWithPlaceholders:
- repls.Set(newValueWithPlaceholders, "["+key+"]")
+ cmd.Env = addEnvVar(t, cmd.Env, &repls, items[0], items[1])
 	}
 
 	absDir, err := filepath.Abs(dir)
@@ -484,6 +485,32 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
 	}
 }
 
+func hasKey(env []string, key string) bool {
+	for _, keyvalue := range env {
+ items := strings.SplitN(keyvalue, "=", 2)
+ if len(items) == 2 && items[0] == key {
+ return true
+ }
+	}
+	return false
+}
+
+func addEnvVar(t *testing.T, env []string, repls *testdiff.ReplacementsContext, key, value string) []string {
+	newValue, newValueWithPlaceholders := internal.SubstituteEnv(value, env)
+	if value != newValue {
+ t.Logf("Substituted %s %#v -> %#v (%#v)", key, value, newValue, newValueWithPlaceholders)
+	}
+
+	// Checking length to avoid replacements for variables like this ENABLED=1
+	if len(newValue) >= 2 && len(newValueWithPlaceholders) >= 2 {
+ repls.Set(newValue, "["+key+"]")
+ // newValue won't match because parts of it were already replaced; we adding it anyway just in case but we need newValueWithPlaceholders:
+ repls.Set(newValueWithPlaceholders, "["+key+"]")
+	}
+
+	return append(env, key+"="+newValue)
+}
+
 func doComparison(t *testing.T, repls testdiff.ReplacementsContext, dirRef, dirNew, relPath string, printedRepls *bool) {
 	pathRef := filepath.Join(dirRef, relPath)
 	pathNew := filepath.Join(dirNew, relPath)

acceptance/bundle/test.toml

@@ -1,6 +1,6 @@
-[EnvMatrix]
+[Env]
 # The lowest Python version we support. Alternative to "uv run --python 3.10"
-UV_PYTHON = ["3.10"]
+UV_PYTHON = "3.10"
 
 [[Repls]]
 Old = '1\d{18}'

acceptance/internal/config.go

@@ -79,6 +79,12 @@ type TestConfig struct {
 
 	CompiledIgnoreObject *ignore.GitIgnore
 
+	// Environment variables
+	// If the same variable is defined both in Env and EnvMatrix, the one in EnvMatrix takes precedence
+	// regardless of which config file it is defined in.
+	// Note, keys are sorted alphabetically rather in order they are defined. This matter when one key reference another (same for EnvMatrix).
+	Env map[string]string
+
 	// Environment variables matrix.
 	// For each key you can specify zero, one or more values.
 	// If you specify zero, the key is omitted, as if it was not defined at all.

acceptance/selftest/envmatrix/inner/output.txt

@@ -1,3 +1,5 @@
 FIRST=[FIRST]
 SECOND=[SECOND]
 THIRD=[THIRD]
+A_REGULAR_VAR=[A_REGULAR_VAR]
+B_REGULAR_VAR=[B_REGULAR_VAR]

acceptance/selftest/envmatrix/inner/script

@@ -4,3 +4,5 @@
 echo "FIRST=$FIRST"
 echo "SECOND=$SECOND"
 echo "THIRD=$THIRD"
+echo "A_REGULAR_VAR=$A_REGULAR_VAR"
+echo "B_REGULAR_VAR=$B_REGULAR_VAR"

acceptance/selftest/envmatrix/inner/test.toml

@@ -1,3 +1,4 @@
 [EnvMatrix]
+B_REGULAR_VAR = ["hello"]
 FIRST = ["one", "two"]
 SECOND = ["variantA", "variantB"]

acceptance/selftest/envmatrix/output.txt

@@ -0,0 +1,2 @@
+A_REGULAR_VAR=[A_REGULAR_VAR]
+B_REGULAR_VAR=[B_REGULAR_VAR]

acceptance/selftest/envmatrix/script

@@ -0,0 +1,2 @@
+echo "A_REGULAR_VAR=$A_REGULAR_VAR"
+echo "B_REGULAR_VAR=$B_REGULAR_VAR"

acceptance/selftest/envmatrix/test.toml

@@ -1,3 +1,7 @@
+[Env]
+A_REGULAR_VAR = "yes"
+B_REGULAR_VAR = "answer:$A_REGULAR_VAR"
+
 [EnvMatrix]
 FIRST = ["overriden-in-inner"]
 THIRD = ["three $FIRST"]