Merge branch 'main' into simonfaltum/list-tui-paginated

Author: simonfaltum

.codegen/_openapi_sha

@@ -1 +1 @@
-a7c320a6b531263c8fa45619c1565b63849750e5
+d09dbd77f5a9560cbb816746773da43a8bdbde08

.gitattributes

@@ -90,6 +90,7 @@ cmd/workspace/enable-notebook-table-clipboard/enable-notebook-table-clipboard.go
 cmd/workspace/enable-results-downloading/enable-results-downloading.go linguist-generated=true
 cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go linguist-generated=true
 cmd/workspace/entity-tag-assignments/entity-tag-assignments.go linguist-generated=true
+cmd/workspace/environments/environments.go linguist-generated=true
 cmd/workspace/experiments/experiments.go linguist-generated=true
 cmd/workspace/external-lineage/external-lineage.go linguist-generated=true
 cmd/workspace/external-locations/external-locations.go linguist-generated=true

.github/dependabot.yml

@@ -15,3 +15,7 @@ updates:
       - "/.github/actions/setup-build-environment"
     schedule:
       interval: "monthly"
+    # tagging.yml is generated and maintained externally. Ignore
+    # actions/create-github-app-token since it is only used in tagging.yml.
+    ignore:
+      - dependency-name: "actions/create-github-app-token"

.github/workflows/renovate.yml

@@ -98,8 +98,6 @@ test-slow-acc:
 .PHONY: test-update
 test-update:
 	-go test ./acceptance -run '^TestAccept$$' -update -timeout=${LOCAL_TIMEOUT}
-	@# at the moment second pass is required because some tests show diff against output of another test for easier review
-	-go test ./acceptance -run '^TestAccept$$' -update -timeout=${LOCAL_TIMEOUT}
 
 # Updates acceptance test output for template tests only
 .PHONY: test-update-templates

Makefile

@@ -20,6 +20,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 	"unicode/utf8"
@@ -293,14 +294,33 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 
 	envFilters := getEnvFilters(t)
 
+	// Phases are only needed in update mode, where phase 0 tests regenerate
+	// output files that phase 1 tests read via $TESTDIR. In normal runs,
+	// those files are already committed and stable.
+	usePhases := testdiff.OverwriteMode
+	var phase0wg sync.WaitGroup
+	phase1Gate := make(chan struct{})
+	if !usePhases {
+		close(phase1Gate)
+	}
+
 	for _, dir := range testDirs {
 		totalDirs += 1
 
 		t.Run(dir, func(t *testing.T) {
 			selectedDirs += 1
 
 			config, configPath := internal.LoadConfig(t, dir)
-			skipReason := getSkipReason(&config, configPath)
+			err := validateTestPhase(config.Phase)
+			if err != nil {
+				t.Fatalf("Invalid config %s: %s", configPath, err)
+			}
+
+			// Apply default: CloudSlow implies Cloud. Do this before generating
+			// the materialized config so the implication is visible in out.test.toml.
+			if isTruePtr(config.CloudSlow) {
+				config.Cloud = config.CloudSlow
+			}
 
 			// Generate materialized config for this test.
 			// We do this before skipping the test, so the configs are generated for all tests.
@@ -313,21 +333,32 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 				t.Skip("Skipping test execution (only regenerating out.test.toml)")
 			}
 
+			skipReason := getSkipReason(&config, configPath)
 			if skipReason != "" {
 				skippedDirs += 1
 				t.Skip(skipReason)
 			}
 
 			runParallel := !inprocessMode
-
 			if benchmarkMode && strings.Contains(dir, "benchmark") {
 				runParallel = false
 			}
 
+			// t.Run blocks until t.Parallel() is called, so Add must happen before t.Parallel().
+			// This ensures all phase0 adds are visible before the wait goroutine starts.
+			if usePhases && config.Phase == 0 {
+				phase0wg.Add(1)
+				t.Cleanup(phase0wg.Done)
+			}
+
 			if runParallel {
 				t.Parallel()
 			}
 
+			if config.Phase != 0 {
+				<-phase1Gate
+			}
+
 			// Build extra vars for exclusion matching (config state as env vars)
 			var extraVars []string
 			if cloudEnv != "" {
@@ -336,26 +367,25 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 
 			expanded := internal.ExpandEnvMatrix(config.EnvMatrix, config.EnvMatrixExclude, extraVars)
 
-			if len(expanded) == 1 {
-				// env vars aren't part of the test case name, so log them for debugging
-				if len(expanded[0]) > 0 {
-					t.Logf("Running test with env %v", expanded[0])
-				}
-				runTest(t, dir, 0, coverDir, repls.Clone(), config, expanded[0], envFilters)
-			} else {
-				for ind, envset := range expanded {
-					envname := strings.Join(envset, "/")
-					t.Run(envname, func(t *testing.T) {
-						if runParallel {
-							t.Parallel()
-						}
-						runTest(t, dir, ind, coverDir, repls.Clone(), config, envset, envFilters)
-					})
-				}
+			for ind, envset := range expanded {
+				envname := strings.Join(envset, "/")
+				t.Run(envname, func(t *testing.T) {
+					if runParallel {
+						t.Parallel()
+					}
+					runTest(t, dir, ind, coverDir, repls.Clone(), config, envset, envFilters)
+				})
 			}
 		})
 	}
 
+	if usePhases {
+		go func() {
+			phase0wg.Wait()
+			close(phase1Gate)
+		}()
+	}
+
 	t.Logf("Summary (dirs): %d/%d/%d run/selected/total, %d skipped", selectedDirs-skippedDirs, selectedDirs, totalDirs, skippedDirs)
 
 	return selectedDirs - skippedDirs
@@ -405,13 +435,16 @@ func getTests(t *testing.T) []string {
 	return testDirs
 }
 
-// Return a reason to skip the test. Empty string means "don't skip".
-func getSkipReason(config *internal.TestConfig, configPath string) string {
-	// Apply default first, so that it's visible in out.test.toml
-	if isTruePtr(config.CloudSlow) {
-		config.Cloud = config.CloudSlow
+func validateTestPhase(phase int) error {
+	if phase == 0 || phase == 1 {
+		return nil
 	}
 
+	return fmt.Errorf("Phase must be 0 or 1, got %d", phase)
+}
+
+// Return a reason to skip the test. Empty string means "don't skip".
+func getSkipReason(config *internal.TestConfig, configPath string) string {
 	if os.Getenv("DATABRICKS_TEST_SKIPLOCAL") != "" && isTruePtr(config.Local) {
 		return "Disabled via DATABRICKS_TEST_SKIPLOCAL environment variable in " + configPath
 	}

acceptance/acceptance_test.go

@@ -1,3 +1,7 @@
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
 {
   "method": "POST",
   "path": "/api/2.0/apps/test-app/deployments",

acceptance/apps/deploy/bundle-with-appname/out.requests.txt

@@ -1,3 +1,7 @@
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
 {
   "method": "POST",
   "path": "/api/2.0/apps/test-app/deployments",

acceptance/apps/deploy/no-bundle-with-appname/out.requests.txt

@@ -13,6 +13,7 @@
 
 === Inside the bundle, profile flag not matching bundle host. Should use profile from the flag and not the bundle.
 >>> errcode [CLI] current-user me -p profile_name
+Warn: Failed to resolve host metadata: (redacted). Falling back to user config.
 Error: Get "https://non.existing.subdomain.databricks.com/api/2.0/preview/scim/v2/Me": (redacted)
 
 Exit code: 1
@@ -72,6 +73,7 @@ Validation OK!
 
 === Bundle commands load bundle configuration with -t and -p flag, validation not OK (profile host don't match bundle host)
 >>> errcode [CLI] bundle validate -t prod -p DEFAULT
+Warn: Failed to resolve host metadata: (redacted). Falling back to user config.
 Error: cannot resolve bundle auth configuration: the host in the profile ([DATABRICKS_TARGET]) doesn’t match the host configured in the bundle (https://bar.com)
 
 Name: test-auth

acceptance/auth/bundle_and_profile/output.txt

@@ -9,6 +9,10 @@ New='DATABRICKS_TARGET'
 Old='DATABRICKS_URL'
 New='DATABRICKS_TARGET'
 
+[[Repls]]
+Old='Warn: Failed to resolve host metadata: .*\. Falling back to user config\.'
+New='Warn: Failed to resolve host metadata: (redacted). Falling back to user config.'
+
 [[Repls]]
 Old='Get "https://non.existing.subdomain.databricks.com/api/2.0/preview/scim/v2/Me": .*'
 New='Get "https://non.existing.subdomain.databricks.com/api/2.0/preview/scim/v2/Me": (redacted)'