diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index b5f7eec71a5..f7509623b81 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -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) diff --git a/acceptance/apps/validate-package-manager/out.test.toml b/acceptance/apps/validate-package-manager/out.test.toml index 0938e678987..18b1a88417e 100644 --- a/acceptance/apps/validate-package-manager/out.test.toml +++ b/acceptance/apps/validate-package-manager/out.test.toml @@ -1,2 +1 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/apps/validate-package-manager/test.toml b/acceptance/apps/validate-package-manager/test.toml index 0d42c72ca66..519fe8055a3 100644 --- a/acceptance/apps/validate-package-manager/test.toml +++ b/acceptance/apps/validate-package-manager/test.toml @@ -1,4 +1,3 @@ -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] Ignore = ["commands.log"] [[Repls]] diff --git a/acceptance/apps/validate/out.test.toml b/acceptance/apps/validate/out.test.toml index 0938e678987..18b1a88417e 100644 --- a/acceptance/apps/validate/out.test.toml +++ b/acceptance/apps/validate/out.test.toml @@ -1,2 +1 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/apps/validate/test.toml b/acceptance/apps/validate/test.toml index aef8c31494f..d549572ab77 100644 --- a/acceptance/apps/validate/test.toml +++ b/acceptance/apps/validate/test.toml @@ -1,4 +1,3 @@ -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] Env.VALIDATION_TEST_FAIL = "" Ignore = ["commands.log"] diff --git a/acceptance/bundle/deployment/bind/job/unreadable-state/out.test.toml b/acceptance/bundle/deployment/bind/job/unreadable-state/out.test.toml index 27ec2a7fcd6..19b5b15d11f 100644 --- a/acceptance/bundle/deployment/bind/job/unreadable-state/out.test.toml +++ b/acceptance/bundle/deployment/bind/job/unreadable-state/out.test.toml @@ -1,3 +1,2 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] EnvMatrix.DMS = [""] diff --git a/acceptance/bundle/deployment/bind/job/unreadable-state/test.toml b/acceptance/bundle/deployment/bind/job/unreadable-state/test.toml index 267ca365b0f..18b1a88417e 100644 --- a/acceptance/bundle/deployment/bind/job/unreadable-state/test.toml +++ b/acceptance/bundle/deployment/bind/job/unreadable-state/test.toml @@ -1,3 +1 @@ Cloud = false - -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/environments/project_environment/out.test.toml b/acceptance/bundle/environments/project_environment/out.test.toml index 59b56a2037c..a927a5fbc06 100644 --- a/acceptance/bundle/environments/project_environment/out.test.toml +++ b/acceptance/bundle/environments/project_environment/out.test.toml @@ -1,3 +1,2 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/environments/project_environment/test.toml b/acceptance/bundle/environments/project_environment/test.toml index ba0016a753f..159efe02696 100644 --- a/acceptance/bundle/environments/project_environment/test.toml +++ b/acceptance/bundle/environments/project_environment/test.toml @@ -1,2 +1 @@ -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] RecordRequests = true diff --git a/acceptance/bundle/sync-upload-edge-cases/out.test.toml b/acceptance/bundle/sync-upload-edge-cases/out.test.toml index 59b56a2037c..a927a5fbc06 100644 --- a/acceptance/bundle/sync-upload-edge-cases/out.test.toml +++ b/acceptance/bundle/sync-upload-edge-cases/out.test.toml @@ -1,3 +1,2 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/sync-upload-edge-cases/test.toml b/acceptance/bundle/sync-upload-edge-cases/test.toml index 2b1b33806af..db1e57486a1 100644 --- a/acceptance/bundle/sync-upload-edge-cases/test.toml +++ b/acceptance/bundle/sync-upload-edge-cases/test.toml @@ -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", diff --git a/acceptance/bundle/templates/app-appkit/out.test.toml b/acceptance/bundle/templates/app-appkit/out.test.toml index 27ec2a7fcd6..19b5b15d11f 100644 --- a/acceptance/bundle/templates/app-appkit/out.test.toml +++ b/acceptance/bundle/templates/app-appkit/out.test.toml @@ -1,3 +1,2 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] EnvMatrix.DMS = [""] diff --git a/acceptance/bundle/templates/app-appkit/test.toml b/acceptance/bundle/templates/app-appkit/test.toml deleted file mode 100644 index 9609e1af299..00000000000 --- a/acceptance/bundle/templates/app-appkit/test.toml +++ /dev/null @@ -1 +0,0 @@ -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/cmd/apps/init/package_manager/out.test.toml b/acceptance/cmd/apps/init/package_manager/out.test.toml index 0938e678987..18b1a88417e 100644 --- a/acceptance/cmd/apps/init/package_manager/out.test.toml +++ b/acceptance/cmd/apps/init/package_manager/out.test.toml @@ -1,2 +1 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/cmd/apps/init/package_manager/test.toml b/acceptance/cmd/apps/init/package_manager/test.toml index 18a4a204a54..32be679be9f 100644 --- a/acceptance/cmd/apps/init/package_manager/test.toml +++ b/acceptance/cmd/apps/init/package_manager/test.toml @@ -1,4 +1,3 @@ -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] Env.DATABRICKS_APPKIT_TEMPLATE_PATH = "template" Ignore = [ "empty-bin", diff --git a/acceptance/cmd/apps/init/package_manager_prune/out.test.toml b/acceptance/cmd/apps/init/package_manager_prune/out.test.toml index 0938e678987..18b1a88417e 100644 --- a/acceptance/cmd/apps/init/package_manager_prune/out.test.toml +++ b/acceptance/cmd/apps/init/package_manager_prune/out.test.toml @@ -1,2 +1 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/cmd/apps/init/package_manager_prune/test.toml b/acceptance/cmd/apps/init/package_manager_prune/test.toml index a206192400b..6a83d724db2 100644 --- a/acceptance/cmd/apps/init/package_manager_prune/test.toml +++ b/acceptance/cmd/apps/init/package_manager_prune/test.toml @@ -1,4 +1,3 @@ -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] Env.DATABRICKS_APPKIT_TEMPLATE_PATH = "template" Ignore = [ "test-app-pnpm", diff --git a/acceptance/pipelines/history/basic/out.test.toml b/acceptance/pipelines/history/basic/out.test.toml index 0938e678987..18b1a88417e 100644 --- a/acceptance/pipelines/history/basic/out.test.toml +++ b/acceptance/pipelines/history/basic/out.test.toml @@ -1,2 +1 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/pipelines/history/basic/test.toml b/acceptance/pipelines/history/basic/test.toml index 3f23481ca91..b7f74b9b8cc 100644 --- a/acceptance/pipelines/history/basic/test.toml +++ b/acceptance/pipelines/history/basic/test.toml @@ -1,6 +1,5 @@ Cloud = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] RecordRequests = true [[Server]] diff --git a/acceptance/ssh/connect-serverless-feature-disabled/out.test.toml b/acceptance/ssh/connect-serverless-feature-disabled/out.test.toml index c826e1c76b6..44cce516e73 100644 --- a/acceptance/ssh/connect-serverless-feature-disabled/out.test.toml +++ b/acceptance/ssh/connect-serverless-feature-disabled/out.test.toml @@ -2,4 +2,3 @@ Cloud = false GOOS.darwin = false GOOS.linux = true GOOS.windows = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/ssh/connect-serverless-feature-disabled/test.toml b/acceptance/ssh/connect-serverless-feature-disabled/test.toml index 3ed947e3902..6095ba89cb3 100644 --- a/acceptance/ssh/connect-serverless-feature-disabled/test.toml +++ b/acceptance/ssh/connect-serverless-feature-disabled/test.toml @@ -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. diff --git a/acceptance/ssh/connect-serverless-port-forwarding-disabled/out.test.toml b/acceptance/ssh/connect-serverless-port-forwarding-disabled/out.test.toml index c826e1c76b6..44cce516e73 100644 --- a/acceptance/ssh/connect-serverless-port-forwarding-disabled/out.test.toml +++ b/acceptance/ssh/connect-serverless-port-forwarding-disabled/out.test.toml @@ -2,4 +2,3 @@ Cloud = false GOOS.darwin = false GOOS.linux = true GOOS.windows = false -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/ssh/connect-serverless-port-forwarding-disabled/test.toml b/acceptance/ssh/connect-serverless-port-forwarding-disabled/test.toml index 10c3ef353f7..f9021a9896a 100644 --- a/acceptance/ssh/connect-serverless-port-forwarding-disabled/test.toml +++ b/acceptance/ssh/connect-serverless-port-forwarding-disabled/test.toml @@ -7,5 +7,3 @@ RecordRequests = true GOOS.linux = true GOOS.darwin = false GOOS.windows = false - -EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]