diff --git a/acceptance/bundle/resource_deps/bad_ref_string_to_int/test.toml b/acceptance/bundle/resource_deps/bad_ref_string_to_int/test.toml index e66a9af3b05..96416f814ae 100644 --- a/acceptance/bundle/resource_deps/bad_ref_string_to_int/test.toml +++ b/acceptance/bundle/resource_deps/bad_ref_string_to_int/test.toml @@ -1,7 +1,3 @@ RecordRequests = false Env.DATABRICKS_CACHE_ENABLED = 'false' - -[[Repls]] -Old = 'terraform.tfstate' -New = 'resources.json' diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/test.toml b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/test.toml index 8598058b9e8..3ef0b0c1bc8 100644 --- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/test.toml +++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/test.toml @@ -1,4 +1,3 @@ -Badness = "In terraform, local_ssd_count field is not sent to backend" Cloud = true RecordRequests = true diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/script b/acceptance/bundle/resources/pipelines/zero-value-fields/script index 4e434e92bf9..9d0e88df7e7 100644 --- a/acceptance/bundle/resources/pipelines/zero-value-fields/script +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/script @@ -1,6 +1,2 @@ trace $CLI bundle deploy print_requests.py --nostamp //api/2.0/pipelines > out.requests.txt 2>&1 - -if [ -f .databricks/bundle/default/terraform/bundle.tf.json ]; then - jq .resource.databricks_pipeline .databricks/bundle/default/terraform/bundle.tf.json > out.tf.json -fi diff --git a/acceptance/bundle/resources/postgres_projects/recreate/output.txt b/acceptance/bundle/resources/postgres_projects/recreate/output.txt index c731c8a3f2f..eb9d70a8a15 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_projects/recreate/output.txt @@ -73,5 +73,8 @@ All files and directories at the following location will be deleted: /Workspace/ Destroy: 1 deleted +=== Old project is gone after recreate +Old project is deleted + >>> [CLI] bundle destroy --auto-approve No active deployment found to destroy! diff --git a/acceptance/bundle/resources/postgres_projects/recreate/script b/acceptance/bundle/resources/postgres_projects/recreate/script index e4fd06727dc..3d539655db2 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/script +++ b/acceptance/bundle/resources/postgres_projects/recreate/script @@ -45,5 +45,9 @@ trace $CLI bundle destroy --auto-approve print_requests.py --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.destroy.txt -# Clean up any orphaned old project (terraform doesn't delete it on recreation) -$CLI postgres delete-project $project_id_1 2>/dev/null || true +title "Old project is gone after recreate" +echo +# Local testserver returns not found; the cloud soft-deletes and returns the project with delete_time set. +errcode $CLI postgres get-project $project_id_1 &> old_project.tmp +grep -q -e 'not found' -e '"delete_time"' old_project.tmp && echo "Old project is deleted" || echo "Old project still exists" +rm old_project.tmp