From cc6a9fadd906c5cc855ead38505b810a91849a18 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 7 Oct 2026 00:43:09 +0200 Subject: [PATCH 1/2] acc: drop tests that only assert the terraform removal error Co-authored-by: Isaac --- .../yaml-sync-empty-grants/databricks.yml | 9 --------- .../deploy/yaml-sync-empty-grants/out.test.toml | 2 -- .../deploy/yaml-sync-empty-grants/output.txt | 6 ------ .../bundle/deploy/yaml-sync-empty-grants/script | 1 - .../deploy/yaml-sync-empty-grants/test.toml | 4 ---- .../app/app.py | 5 ----- .../databricks.yml.tmpl | 11 ----------- .../out.test.toml | 2 -- .../output.txt | 14 -------------- .../lifecycle-started-terraform-error/script | 7 ------- .../lifecycle-started-terraform-error/test.toml | 4 ---- .../databricks.yml.tmpl | 16 ---------------- .../out.test.toml | 2 -- .../output.txt | 14 -------------- .../lifecycle-started-terraform-error/script | 7 ------- .../lifecycle-started-terraform-error/test.toml | 4 ---- .../jobs/unknown-terraform-field/databricks.yml | 17 ----------------- .../jobs/unknown-terraform-field/out.test.toml | 2 -- .../jobs/unknown-terraform-field/output.txt | 6 ------ .../jobs/unknown-terraform-field/script | 1 - .../jobs/unknown-terraform-field/test.toml | 3 --- .../secrets/direct-only/databricks.yml | 14 -------------- .../resources/secrets/direct-only/out.test.toml | 2 -- .../resources/secrets/direct-only/output.txt | 7 ------- .../bundle/resources/secrets/direct-only/script | 2 -- .../resources/secrets/direct-only/test.toml | 6 ------ .../databricks.yml.tmpl | 13 ------------- .../out.test.toml | 3 --- .../output.txt | 14 -------------- .../lifecycle-started-terraform-error/script | 7 ------- .../lifecycle-started-terraform-error/test.toml | 8 -------- acceptance/bundle/select/basic/test.toml | 2 +- .../bundle/select/rejected/databricks.yml | 7 ------- acceptance/bundle/select/rejected/out.test.toml | 2 -- acceptance/bundle/select/rejected/output.txt | 12 ------------ acceptance/bundle/select/rejected/script | 3 --- acceptance/bundle/select/rejected/test.toml | 2 -- .../catalog_requires_direct_mode/databricks.yml | 8 -------- .../catalog_requires_direct_mode/out.test.toml | 2 -- .../catalog_requires_direct_mode/output.txt | 6 ------ .../catalog_requires_direct_mode/script | 1 - .../catalog_requires_direct_mode/test.toml | 5 ----- .../databricks.yml | 7 ------- .../out.test.toml | 1 - .../output.txt | 7 ------- .../cascade-on-destroy-terraform-error/script | 2 -- .../test.toml | 7 ------- 47 files changed, 1 insertion(+), 286 deletions(-) delete mode 100644 acceptance/bundle/deploy/yaml-sync-empty-grants/databricks.yml delete mode 100644 acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml delete mode 100644 acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt delete mode 100644 acceptance/bundle/deploy/yaml-sync-empty-grants/script delete mode 100644 acceptance/bundle/deploy/yaml-sync-empty-grants/test.toml delete mode 100644 acceptance/bundle/resources/apps/lifecycle-started-terraform-error/app/app.py delete mode 100644 acceptance/bundle/resources/apps/lifecycle-started-terraform-error/databricks.yml.tmpl delete mode 100644 acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml delete mode 100644 acceptance/bundle/resources/apps/lifecycle-started-terraform-error/output.txt delete mode 100644 acceptance/bundle/resources/apps/lifecycle-started-terraform-error/script delete mode 100644 acceptance/bundle/resources/apps/lifecycle-started-terraform-error/test.toml delete mode 100644 acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/databricks.yml.tmpl delete mode 100644 acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml delete mode 100644 acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/output.txt delete mode 100644 acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/script delete mode 100644 acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/test.toml delete mode 100644 acceptance/bundle/resources/jobs/unknown-terraform-field/databricks.yml delete mode 100644 acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml delete mode 100644 acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt delete mode 100644 acceptance/bundle/resources/jobs/unknown-terraform-field/script delete mode 100644 acceptance/bundle/resources/jobs/unknown-terraform-field/test.toml delete mode 100644 acceptance/bundle/resources/secrets/direct-only/databricks.yml delete mode 100644 acceptance/bundle/resources/secrets/direct-only/out.test.toml delete mode 100644 acceptance/bundle/resources/secrets/direct-only/output.txt delete mode 100755 acceptance/bundle/resources/secrets/direct-only/script delete mode 100644 acceptance/bundle/resources/secrets/direct-only/test.toml delete mode 100644 acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/databricks.yml.tmpl delete mode 100644 acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml delete mode 100644 acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/output.txt delete mode 100644 acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/script delete mode 100644 acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/test.toml delete mode 100644 acceptance/bundle/select/rejected/databricks.yml delete mode 100644 acceptance/bundle/select/rejected/out.test.toml delete mode 100644 acceptance/bundle/select/rejected/output.txt delete mode 100644 acceptance/bundle/select/rejected/script delete mode 100644 acceptance/bundle/select/rejected/test.toml delete mode 100644 acceptance/bundle/validate/catalog_requires_direct_mode/databricks.yml delete mode 100644 acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml delete mode 100644 acceptance/bundle/validate/catalog_requires_direct_mode/output.txt delete mode 100755 acceptance/bundle/validate/catalog_requires_direct_mode/script delete mode 100644 acceptance/bundle/validate/catalog_requires_direct_mode/test.toml delete mode 100644 acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/databricks.yml delete mode 100644 acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/out.test.toml delete mode 100644 acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/output.txt delete mode 100644 acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/script delete mode 100644 acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/test.toml diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/databricks.yml b/acceptance/bundle/deploy/yaml-sync-empty-grants/databricks.yml deleted file mode 100644 index 87958c8e630..00000000000 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/databricks.yml +++ /dev/null @@ -1,9 +0,0 @@ -bundle: - name: yaml-sync-empty-grants - -resources: - schemas: - schema1: - name: myschema - catalog_name: main - grants: [] diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml b/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml deleted file mode 100644 index a927a5fbc06..00000000000 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = false -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt deleted file mode 100644 index cc39aa21195..00000000000 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt +++ /dev/null @@ -1,6 +0,0 @@ - ->>> musterr [CLI] bundle deploy -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/script b/acceptance/bundle/deploy/yaml-sync-empty-grants/script deleted file mode 100644 index 32f10d10630..00000000000 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/script +++ /dev/null @@ -1 +0,0 @@ -trace musterr $CLI bundle deploy diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/test.toml b/acceptance/bundle/deploy/yaml-sync-empty-grants/test.toml deleted file mode 100644 index 95954d01a98..00000000000 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/test.toml +++ /dev/null @@ -1,4 +0,0 @@ -# The YAML-sync state upload only runs for the terraform engine; no direct-engine variant. -Env.DATABRICKS_BUNDLE_ENABLE_EXPERIMENTAL_YAML_SYNC = "true" - -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/app/app.py b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/app/app.py deleted file mode 100644 index ad1e64f9fb0..00000000000 --- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/app/app.py +++ /dev/null @@ -1,5 +0,0 @@ -import http.server, os - -http.server.HTTPServer( - ("", int(os.environ["DATABRICKS_APP_PORT"])), http.server.SimpleHTTPRequestHandler -).serve_forever() diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/databricks.yml.tmpl b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/databricks.yml.tmpl deleted file mode 100644 index ee78dfc1502..00000000000 --- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/databricks.yml.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -bundle: - name: lifecycle-started-$UNIQUE_NAME - -resources: - apps: - myapp: - name: $UNIQUE_NAME - description: my_app_description - source_code_path: ./app - lifecycle: - started: true diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml deleted file mode 100644 index 0f167effef1..00000000000 --- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = true -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/output.txt deleted file mode 100644 index d2c8acc2224..00000000000 --- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/output.txt +++ /dev/null @@ -1,14 +0,0 @@ - -=== bundle plan fails with lifecycle.started on terraform engine ->>> musterr [CLI] bundle plan -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details - -=== bundle deploy fails with lifecycle.started on terraform engine ->>> musterr [CLI] bundle deploy -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/script b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/script deleted file mode 100644 index d31aef0420d..00000000000 --- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/script +++ /dev/null @@ -1,7 +0,0 @@ -envsubst < databricks.yml.tmpl > databricks.yml - -title "bundle plan fails with lifecycle.started on terraform engine" -trace musterr $CLI bundle plan - -title "bundle deploy fails with lifecycle.started on terraform engine" -trace musterr $CLI bundle deploy diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/test.toml b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/test.toml deleted file mode 100644 index 9b33ec63a79..00000000000 --- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/test.toml +++ /dev/null @@ -1,4 +0,0 @@ -Cloud = true -RecordRequests = false - -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/databricks.yml.tmpl b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/databricks.yml.tmpl deleted file mode 100644 index cd0a5360ab8..00000000000 --- a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/databricks.yml.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -bundle: - name: lifecycle-started-$UNIQUE_NAME - -workspace: - root_path: ~/.bundle/$UNIQUE_NAME - -resources: - clusters: - mycluster: - cluster_name: $UNIQUE_NAME - spark_version: 15.4.x-scala2.12 - node_type_id: $NODE_TYPE_ID - instance_pool_id: $TEST_INSTANCE_POOL_ID - num_workers: 1 - lifecycle: - started: true diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml deleted file mode 100644 index 0f167effef1..00000000000 --- a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = true -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/output.txt deleted file mode 100644 index d2c8acc2224..00000000000 --- a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/output.txt +++ /dev/null @@ -1,14 +0,0 @@ - -=== bundle plan fails with lifecycle.started on terraform engine ->>> musterr [CLI] bundle plan -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details - -=== bundle deploy fails with lifecycle.started on terraform engine ->>> musterr [CLI] bundle deploy -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/script b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/script deleted file mode 100644 index d31aef0420d..00000000000 --- a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/script +++ /dev/null @@ -1,7 +0,0 @@ -envsubst < databricks.yml.tmpl > databricks.yml - -title "bundle plan fails with lifecycle.started on terraform engine" -trace musterr $CLI bundle plan - -title "bundle deploy fails with lifecycle.started on terraform engine" -trace musterr $CLI bundle deploy diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/test.toml b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/test.toml deleted file mode 100644 index 9b33ec63a79..00000000000 --- a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/test.toml +++ /dev/null @@ -1,4 +0,0 @@ -Cloud = true -RecordRequests = false - -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/databricks.yml b/acceptance/bundle/resources/jobs/unknown-terraform-field/databricks.yml deleted file mode 100644 index 10120802bd7..00000000000 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/databricks.yml +++ /dev/null @@ -1,17 +0,0 @@ -bundle: - name: test-bundle - -resources: - jobs: - job: - name: test-job - tasks: - - task_key: test_task - new_cluster: - spark_version: 13.3.x-scala2.12 - num_workers: 2 - # In the SDK jobs schema, but not in the pinned Terraform provider schema. - autotermination_minutes: 60 - python_wheel_task: - package_name: "whl" - entry_point: "run" diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml b/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml deleted file mode 100644 index a927a5fbc06..00000000000 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = false -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt deleted file mode 100644 index cc39aa21195..00000000000 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt +++ /dev/null @@ -1,6 +0,0 @@ - ->>> musterr [CLI] bundle deploy -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/script b/acceptance/bundle/resources/jobs/unknown-terraform-field/script deleted file mode 100644 index 32f10d10630..00000000000 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/script +++ /dev/null @@ -1 +0,0 @@ -trace musterr $CLI bundle deploy diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/test.toml b/acceptance/bundle/resources/jobs/unknown-terraform-field/test.toml deleted file mode 100644 index dd4fe4c5dc3..00000000000 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/test.toml +++ /dev/null @@ -1,3 +0,0 @@ -# The dropped-field warning is terraform-only; the direct engine deploys these fields. -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" -RecordRequests = false diff --git a/acceptance/bundle/resources/secrets/direct-only/databricks.yml b/acceptance/bundle/resources/secrets/direct-only/databricks.yml deleted file mode 100644 index 6edb6f3cf13..00000000000 --- a/acceptance/bundle/resources/secrets/direct-only/databricks.yml +++ /dev/null @@ -1,14 +0,0 @@ -bundle: - name: test-bundle - -variables: - secret_value: - description: "Test secret value" - -resources: - secrets: - secret1: - catalog_name: main - schema_name: default - name: test_secret - value: ${var.secret_value} diff --git a/acceptance/bundle/resources/secrets/direct-only/out.test.toml b/acceptance/bundle/resources/secrets/direct-only/out.test.toml deleted file mode 100644 index a927a5fbc06..00000000000 --- a/acceptance/bundle/resources/secrets/direct-only/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = false -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/secrets/direct-only/output.txt b/acceptance/bundle/resources/secrets/direct-only/output.txt deleted file mode 100644 index 5e9f4e15749..00000000000 --- a/acceptance/bundle/resources/secrets/direct-only/output.txt +++ /dev/null @@ -1,7 +0,0 @@ - -=== Deploy should fail in terraform mode ->>> musterr [CLI] bundle deploy --var secret_value=test-value -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/resources/secrets/direct-only/script b/acceptance/bundle/resources/secrets/direct-only/script deleted file mode 100755 index 23f66958ad1..00000000000 --- a/acceptance/bundle/resources/secrets/direct-only/script +++ /dev/null @@ -1,2 +0,0 @@ -title "Deploy should fail in terraform mode" -trace musterr $CLI bundle deploy --var secret_value=test-value diff --git a/acceptance/bundle/resources/secrets/direct-only/test.toml b/acceptance/bundle/resources/secrets/direct-only/test.toml deleted file mode 100644 index 448108e3764..00000000000 --- a/acceptance/bundle/resources/secrets/direct-only/test.toml +++ /dev/null @@ -1,6 +0,0 @@ -Cloud = false -RecordRequests = false - -Ignore = [".databricks"] - -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/databricks.yml.tmpl b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/databricks.yml.tmpl deleted file mode 100644 index cad38109b8e..00000000000 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/databricks.yml.tmpl +++ /dev/null @@ -1,13 +0,0 @@ -bundle: - name: lifecycle-started-terraform-error-$UNIQUE_NAME - -workspace: - root_path: ~/.bundle/$UNIQUE_NAME - -resources: - sql_warehouses: - mywarehouse: - name: my-warehouse-$UNIQUE_NAME - cluster_size: "Medium" - lifecycle: - started: true diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml deleted file mode 100644 index 403a04639c4..00000000000 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml +++ /dev/null @@ -1,3 +0,0 @@ -Cloud = false -CloudSlow = false -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/output.txt deleted file mode 100644 index d2c8acc2224..00000000000 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/output.txt +++ /dev/null @@ -1,14 +0,0 @@ - -=== bundle plan fails with lifecycle.started on terraform engine ->>> musterr [CLI] bundle plan -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details - -=== bundle deploy fails with lifecycle.started on terraform engine ->>> musterr [CLI] bundle deploy -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/script deleted file mode 100644 index d31aef0420d..00000000000 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/script +++ /dev/null @@ -1,7 +0,0 @@ -envsubst < databricks.yml.tmpl > databricks.yml - -title "bundle plan fails with lifecycle.started on terraform engine" -trace musterr $CLI bundle plan - -title "bundle deploy fails with lifecycle.started on terraform engine" -trace musterr $CLI bundle deploy diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/test.toml b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/test.toml deleted file mode 100644 index c8b17c22ddd..00000000000 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/test.toml +++ /dev/null @@ -1,8 +0,0 @@ -RecordRequests = false - -# This test performs static validation; no need to run on cloud. -Cloud = false - -Ignore = [".databricks", "databricks.yml"] - -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/bundle/select/basic/test.toml b/acceptance/bundle/select/basic/test.toml index 36071e73476..1c81ca40790 100644 --- a/acceptance/bundle/select/basic/test.toml +++ b/acceptance/bundle/select/basic/test.toml @@ -1,7 +1,7 @@ Cloud = true RecordRequests = true # --select is only supported by the direct engine, so this happy-path test runs on -# direct only (the rejection on terraform is covered by bundle/select/rejected). +# direct only. # Also run a variant that deploys a serialized (already filtered) plan via --plan. EnvMatrix.READPLAN = ["", "1"] # databricks.yml and the serialized plans are generated at runtime; the plan JSON diff --git a/acceptance/bundle/select/rejected/databricks.yml b/acceptance/bundle/select/rejected/databricks.yml deleted file mode 100644 index 2c5ff850e63..00000000000 --- a/acceptance/bundle/select/rejected/databricks.yml +++ /dev/null @@ -1,7 +0,0 @@ -bundle: - name: select-rejected - -resources: - jobs: - my_job: - name: my-job diff --git a/acceptance/bundle/select/rejected/out.test.toml b/acceptance/bundle/select/rejected/out.test.toml deleted file mode 100644 index a927a5fbc06..00000000000 --- a/acceptance/bundle/select/rejected/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = false -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/select/rejected/output.txt b/acceptance/bundle/select/rejected/output.txt deleted file mode 100644 index f15371cec50..00000000000 --- a/acceptance/bundle/select/rejected/output.txt +++ /dev/null @@ -1,12 +0,0 @@ - ->>> musterr [CLI] bundle plan --select my_job -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details - ->>> musterr [CLI] bundle deploy --select my_job -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/select/rejected/script b/acceptance/bundle/select/rejected/script deleted file mode 100644 index 39a60ed70e4..00000000000 --- a/acceptance/bundle/select/rejected/script +++ /dev/null @@ -1,3 +0,0 @@ -# --select is only supported by the direct engine; both plan and deploy reject it. -trace musterr $CLI bundle plan --select my_job -trace musterr $CLI bundle deploy --select my_job diff --git a/acceptance/bundle/select/rejected/test.toml b/acceptance/bundle/select/rejected/test.toml deleted file mode 100644 index 53ae4fe379b..00000000000 --- a/acceptance/bundle/select/rejected/test.toml +++ /dev/null @@ -1,2 +0,0 @@ -# --select is rejected on the terraform engine with an actionable error. -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/bundle/validate/catalog_requires_direct_mode/databricks.yml b/acceptance/bundle/validate/catalog_requires_direct_mode/databricks.yml deleted file mode 100644 index d215964bb77..00000000000 --- a/acceptance/bundle/validate/catalog_requires_direct_mode/databricks.yml +++ /dev/null @@ -1,8 +0,0 @@ -bundle: - name: "catalog_validation_test" - -resources: - catalogs: - test_catalog: - name: "test_catalog" - comment: "This should fail in Terraform mode" diff --git a/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml b/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml deleted file mode 100644 index a927a5fbc06..00000000000 --- a/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml +++ /dev/null @@ -1,2 +0,0 @@ -Cloud = false -EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/validate/catalog_requires_direct_mode/output.txt b/acceptance/bundle/validate/catalog_requires_direct_mode/output.txt deleted file mode 100644 index d8e132350f1..00000000000 --- a/acceptance/bundle/validate/catalog_requires_direct_mode/output.txt +++ /dev/null @@ -1,6 +0,0 @@ - ->>> musterr [CLI] bundle plan -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/bundle/validate/catalog_requires_direct_mode/script b/acceptance/bundle/validate/catalog_requires_direct_mode/script deleted file mode 100755 index 9d9604578f1..00000000000 --- a/acceptance/bundle/validate/catalog_requires_direct_mode/script +++ /dev/null @@ -1 +0,0 @@ -trace musterr $CLI bundle plan diff --git a/acceptance/bundle/validate/catalog_requires_direct_mode/test.toml b/acceptance/bundle/validate/catalog_requires_direct_mode/test.toml deleted file mode 100644 index d6ca9e475bf..00000000000 --- a/acceptance/bundle/validate/catalog_requires_direct_mode/test.toml +++ /dev/null @@ -1,5 +0,0 @@ -Cloud = false - -Ignore = [".databricks"] - -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" diff --git a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/databricks.yml b/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/databricks.yml deleted file mode 100644 index 0c4f487853b..00000000000 --- a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/databricks.yml +++ /dev/null @@ -1,7 +0,0 @@ -bundle: - name: test-cascade-on-destroy-tf-error -resources: - pipelines: - my_pipeline: - name: test-pipeline-cascade-tf - cascade_on_destroy: false diff --git a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/out.test.toml b/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/out.test.toml deleted file mode 100644 index 18b1a88417e..00000000000 --- a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/out.test.toml +++ /dev/null @@ -1 +0,0 @@ -Cloud = false diff --git a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/output.txt b/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/output.txt deleted file mode 100644 index 8b323a675b8..00000000000 --- a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/output.txt +++ /dev/null @@ -1,7 +0,0 @@ - -=== pipelines deploy fails with cascade_on_destroy on terraform engine ->>> musterr [CLI] pipelines deploy -Error: the Terraform deployment engine has been removed in Databricks CLI v1.20.0 - -Unset the DATABRICKS_BUNDLE_ENGINE environment variable (or set it to "direct") to deploy with the direct engine; existing Terraform state is migrated automatically. To keep using Terraform, revert to Databricks CLI v1.19.x. -See https://docs.databricks.com/dev-tools/bundles/direct for details diff --git a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/script b/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/script deleted file mode 100644 index 7f78944bc9c..00000000000 --- a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/script +++ /dev/null @@ -1,2 +0,0 @@ -title "pipelines deploy fails with cascade_on_destroy on terraform engine" -trace musterr $CLI pipelines deploy diff --git a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/test.toml b/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/test.toml deleted file mode 100644 index 195857306f6..00000000000 --- a/acceptance/pipelines/destroy/cascade-on-destroy-terraform-error/test.toml +++ /dev/null @@ -1,7 +0,0 @@ -RecordRequests = false - -# Static validation only; no need to run on cloud. -Cloud = false - -# cascade_on_destroy is direct-only; assert the terraform engine rejects it. -Env.DATABRICKS_BUNDLE_ENGINE = "terraform" From 49e004aa76029e9d95eb2c247410bb4705d0ae1f Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 7 Oct 2026 00:55:16 +0200 Subject: [PATCH 2/2] acc: update sql_warehouses file count after test removal Co-authored-by: Isaac --- acceptance/bundle/resources/sql_warehouses/output.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/bundle/resources/sql_warehouses/output.txt b/acceptance/bundle/resources/sql_warehouses/output.txt index 4780f127fc0..2d1738cfe0b 100644 --- a/acceptance/bundle/resources/sql_warehouses/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/output.txt @@ -37,7 +37,7 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default/files... Created sql_warehouses.test_sql_warehouse -Files: 13 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify the create request