Skip to content

acc: remove terraform leftovers from acceptance scripts - #6957

Merged
denik merged 2 commits into
mainfrom
denik/tf-cleanup-acc-script-leftovers
Oct 7, 2026
Merged

denik merged 2 commits into
mainfrom
denik/tf-cleanup-acc-script-leftovers

Conversation

@denik

@denik denik commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

Removes dead Terraform leftovers in acceptance scripts and test.toml files: the bundle.tf.json branch in pipelines/zero-value-fields, the stale local_ssd_count Badness note, and the unused terraform.tfstate replacement in bad_ref_string_to_int. In postgres_projects/recreate, the "terraform doesn't delete it" cleanup is replaced by an assertion that the old project is already gone after recreate (not found locally, soft-deleted with delete_time on cloud); it passes, so there is no leak on direct. Other grep hits (state/, migrate/, config-remote-sync/terraform_state, tfstate helpers) are live migration coverage and kept.

This pull request and its description were written by Isaac.

Co-authored-by: Isaac <no-reply@databricks.com>
@github-actions github-actions Bot added the DABs DABs related issues label Oct 6, 2026
@eng-dev-ecosystem-bot

eng-dev-ecosystem-bot commented Oct 6, 2026 •

Copy link
Copy Markdown
Collaborator

Integration test report

Commit: 136fb02

Run: 37545169412

Env 🔄​flaky ✅​pass 🙈​skip Time
✅​ aws linux 279 19 5:53
🔄​ aws windows 2 279 17 4:02
✅​ azure linux 275 20 6:19
✅​ azure windows 277 18 4:38
✅​ gcp linux 279 19 11:55
✅​ gcp windows 281 17 10:31
Test Name aws windows
🔄​ TestFilerWorkspaceNotebook 🔄​f
🔄​ TestFilerWorkspaceNotebook/sqlNb.sql 🔄​f
Top 10 slowest tests (at least 2 minutes):
duration env testname
7:41 gcp linux TestAccept/bundle/resources/clusters/deploy/local_ssd_count/DMS=
7:20 gcp windows TestAccept/bundle/resources/clusters/deploy/local_ssd_count/DMS=true
7:20 gcp windows TestAccept/bundle/resources/clusters/deploy/local_ssd_count/DMS=
7:09 gcp linux TestAccept/bundle/resources/clusters/deploy/local_ssd_count/DMS=true
4:13 gcp linux TestAccept
3:57 aws linux TestAccept
3:51 azure linux TestAccept
3:09 azure windows TestAccept
3:07 gcp windows TestAccept
3:05 aws windows TestAccept

The cloud soft-deletes projects (get returns delete_time), while the
testserver returns not found.

Co-authored-by: Isaac <no-reply@databricks.com>
@denik
denik marked this pull request as ready for review October 7, 2026 06:36
@denik
denik requested review from a team as code owners October 7, 2026 06:36
@denik
denik requested a review from janniklasrose October 7, 2026 07:32
@denik
denik added this pull request to the merge queue Oct 7, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 7, 2026
@denik
denik added this pull request to the merge queue Oct 7, 2026
Merged via the queue into main with commit 67f2380 Oct 7, 2026
25 checks passed
@denik
denik deleted the denik/tf-cleanup-acc-script-leftovers branch October 7, 2026 07:56
janniklasrose added a commit that referenced this pull request Oct 9, 2026
Follow-up to the review thread on #6957.

`title` printed `\n=== <label>` with no trailing newline, relying on a
following `trace` (which prepends `\n`) to terminate the header line.
When a `title` was instead followed by non-`trace` output the header got
mashed onto the next line (e.g. `=== Recorded request bodies{`), and
authors worked around the missing newline inconsistently: a bare `echo`
after the title, or a literal `\n` appended to the label.

Make `title` self-contained by printing its own trailing newline. To
keep the common `title`+`trace` output tight (no blank line between the
header and the command), `trace` drops its leading newline when it
directly follows a `title`; a `trace` after any intervening output still
gets its usual separator. This is tracked with an `_after_title` flag
that `title` sets, `trace` reads and clears, and a `DEBUG` trap clears
before any other top-level command. The trap needs `set -T` because the
main script runs in a subshell, and a `FUNCNAME` guard keeps it from
firing inside the helpers themselves.

Remove the now-redundant workarounds (bare `echo`/`echo ""` after a
title, trailing `\n` in labels) and regenerate the acceptance goldens.

Co-authored-by: Isaac <no-reply@databricks.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

DABs DABs related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants