Skip to content

acc: Clean up and reject EnvMatrix.DATABRICKS_BUNDLE_ENGINE #7136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denik merged 3 commits into from
Oct 23, 2026
Merged

acc: Clean up and reject EnvMatrix.DATABRICKS_BUNDLE_ENGINE #7136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8de2777
acc: Reject EnvMatrix.DATABRICKS_BUNDLE_ENGINE
denik Oct 20, 2026
34a6345
acc: Remove remaining DATABRICKS_BUNDLE_ENGINE pins
denik Oct 21, 2026
f0fd02e
acc: Remove DATABRICKS_BUNDLE_ENGINE pin from apps/validate-package-m…
denik Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions acceptance/acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,10 @@ func testAccept(t *testing.T, inprocessMode bool, selectedTests []string, skipTo
extraVars = append(extraVars, "CONFIG_Cloud=true")
}

if _, ok := config.EnvMatrix["DATABRICKS_BUNDLE_ENGINE"]; ok {
t.Fatalf("%s: EnvMatrix.DATABRICKS_BUNDLE_ENGINE is not needed, the direct engine is the only engine; remove it from test.toml", dir)
}

expanded := internal.ExpandEnvMatrix(config.EnvMatrix, config.EnvMatrixExclude, extraVars)
if Subset {
expanded = internal.SubsetExpanded(expanded, dir)
Expand Down
1 change: 0 additions & 1 deletion acceptance/apps/validate-package-manager/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
1 change: 0 additions & 1 deletion acceptance/apps/validate-package-manager/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
Ignore = ["commands.log"]

[[Repls]]
Expand Down
1 change: 0 additions & 1 deletion acceptance/apps/validate/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
1 change: 0 additions & 1 deletion acceptance/apps/validate/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
Env.VALIDATION_TEST_FAIL = ""
Ignore = ["commands.log"]

Expand Down
1 change: 0 additions & 1 deletion acceptance/bundle/deployment/bind/job/unreadable-state/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
EnvMatrix.DMS = [""]
2 changes: 0 additions & 2 deletions acceptance/bundle/deployment/bind/job/unreadable-state/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Cloud = false

EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
1 change: 0 additions & 1 deletion acceptance/bundle/environments/project_environment/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
EnvMatrix.DMS = ["", "true"]
1 change: 0 additions & 1 deletion acceptance/bundle/environments/project_environment/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
RecordRequests = true
1 change: 0 additions & 1 deletion acceptance/bundle/sync-upload-edge-cases/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
EnvMatrix.DMS = ["", "true"]
4 changes: 0 additions & 4 deletions acceptance/bundle/sync-upload-edge-cases/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
RecordRequests = true

# All sync uploads go through the same /workspace/import multipart code path; running
# both engine variants is unnecessary here.
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]

Ignore = [
"large.bin",
"empty.txt",
Expand Down
1 change: 0 additions & 1 deletion acceptance/bundle/templates/app-appkit/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
EnvMatrix.DMS = [""]
1 change: 0 additions & 1 deletion acceptance/bundle/templates/app-appkit/test.toml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion acceptance/cmd/apps/init/package_manager/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
1 change: 0 additions & 1 deletion acceptance/cmd/apps/init/package_manager/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
Env.DATABRICKS_APPKIT_TEMPLATE_PATH = "template"
Ignore = [
"empty-bin",
Expand Down
1 change: 0 additions & 1 deletion acceptance/cmd/apps/init/package_manager_prune/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
1 change: 0 additions & 1 deletion acceptance/cmd/apps/init/package_manager_prune/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
Env.DATABRICKS_APPKIT_TEMPLATE_PATH = "template"
Ignore = [
"test-app-pnpm",
Expand Down
1 change: 0 additions & 1 deletion acceptance/pipelines/history/basic/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Cloud = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
1 change: 0 additions & 1 deletion acceptance/pipelines/history/basic/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Cloud = false

EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
RecordRequests = true

[[Server]]
Expand Down
1 change: 0 additions & 1 deletion acceptance/ssh/connect-serverless-feature-disabled/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ Cloud = false
GOOS.darwin = false
GOOS.linux = true
GOOS.windows = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
2 changes: 0 additions & 2 deletions acceptance/ssh/connect-serverless-feature-disabled/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ GOOS.linux = true
GOOS.darwin = false
GOOS.windows = false

EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]

# Production does not serve port_fwd_serverless_enabled through the public API, so the CLI cannot
# check it up front there and only learns about it from the driver proxy's 403. This reproduces
# that environment, which the fake workspace's settings handler does not model.
Expand Down
1 change: 0 additions & 1 deletion acceptance/ssh/connect-serverless-port-forwarding-disabled/out.test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ Cloud = false
GOOS.darwin = false
GOOS.linux = true
GOOS.windows = false
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
2 changes: 0 additions & 2 deletions acceptance/ssh/connect-serverless-port-forwarding-disabled/test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ RecordRequests = true
GOOS.linux = true
GOOS.darwin = false
GOOS.windows = false

EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
Loading