Skip to content

acc: merge identical terraform/direct request goldens into single files - #6249

Merged
janniklasrose merged 5 commits into
mainfrom
merge-engine-identical-fixtures
Aug 17, 2026
Merged

acc: merge identical terraform/direct request goldens into single files#6249
janniklasrose merged 5 commits into
mainfrom
merge-engine-identical-fixtures

Conversation

@janniklasrose

Copy link
Copy Markdown
Contributor

Changes

Follow-up to @denik's review feedback on #6246: where a test records per-engine golden files (out.X.terraform.* / out.X.direct.*) that are byte-identical — because the operation is engine-independent — merge each pair into a single engine-agnostic out.X.* file and drop the $DATABRICKS_BUNDLE_ENGINE suffix from the script's redirect.

21 pairs across 19 tests are merged. Scope was deliberately limited to files written by a dedicated redirect in the test's own script. Intentionally left per-engine:

  • Files from the shared bundle/resources/permissions/_script and the postgres_projects print_requests() helper — those same lines also emit genuinely per-engine-differing files, so the suffix must stay.
  • Files consumed by the Phase = 1 analyzers user_agent/verify.py and permissions/analyze_requests.py, which parse the engine from the filename (a file without .terraform./.direct. is skipped) — merging would silently drop them from the analysis.

Tests

Acceptance goldens regenerated via ./task test-update; full local TestAccept verify pass is green (the one flaky 60s timeout in permissions/pipelines/update, a test untouched here, passes when run alone). Cloud-only tests are verified by integration CI.

Stacked on #6247. Merge that (and #6246) first.

This pull request and its description were written by Isaac.

## Changes

Bump the pinned Databricks Terraform provider from v1.124.0 to v1.125.0.

Notable schema changes:
- The provider no longer issues a `GET /api/2.0/preview/scim/v2/Me` request during deploy/destroy/plan.

## Tests

Acceptance goldens regenerated via `./task test-update`.

Co-authored-by: Isaac
## Changes

Bump `github.com/databricks/databricks-sdk-go` from v0.166.0 to v0.169.0.

- `secrets-uc` graduated out of Public Preview (help text and bundle schema).
- Pipeline ingestion fanout options promoted from Private Preview to Beta.
- New output-only `resources.jobs.*.trigger_state.pause_status` field.

The SDK's breaking removals (iamv2 `InternalId`, catalog provider credential
fields) and the `bundledeployments` `State` type changes are not referenced by
the CLI, so no code changes were required.

## Tests

Acceptance goldens regenerated via `./task test-update`.

Co-authored-by: Isaac
Several acceptance tests recorded per-engine golden files
(out.X.terraform.* and out.X.direct.*) that are byte-identical because the
operation is engine-independent. Merge each such pair into a single
engine-agnostic out.X.* file and drop the $DATABRICKS_BUNDLE_ENGINE suffix
from the script's redirect.

Only files written by a dedicated redirect in the test's own script are
merged. Files produced by the shared permissions _script or the
postgres_projects print_requests helper (which also emit genuinely
per-engine-differing files), and files consumed by the Phase-1 user_agent
and permissions analyzers (verify.py / analyze_requests.py parse the engine
from the filename), are intentionally left per-engine.

Follow-up to review feedback on #6246.

Co-authored-by: Isaac
Base automatically changed from bump-sdk-0.169.0 to main August 12, 2026 11:47
@eng-dev-ecosystem-bot

eng-dev-ecosystem-bot commented Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Integration test report

Commit: 2dc53d1

Run: 32062053425

Env 🟨​KNOWN 🔄​flaky 💚​RECOVERED 🙈​SKIP ✅​pass 🙈​skip Time
🟨​ aws linux 3 1 4 313 1141 7:27
🟨​ aws windows 3 1 4 315 1139 12:23
🟨​ azure linux 2 1 1 4 306 1143 7:58
🟨​ azure windows 3 1 4 308 1141 12:19
💚​ gcp linux 1 5 307 1143 6:42
🔄​ gcp windows 4 1 5 305 1141 11:14
12 interesting tests: 4 SKIP, 4 flaky, 3 KNOWN, 1 RECOVERED
Test Name aws linux aws windows azure linux azure windows gcp linux gcp windows
💚​ TestAccept 💚​R 💚​R 💚​R 💚​R 💚​R 💚​R
🙈​ TestAccept/bundle/invariant/no_drift 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S
🙈​ TestAccept/bundle/resources/vector_search_endpoints/drift/recreated_same_name 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S
🙈​ TestAccept/bundle/resources/vector_search_indexes/recreate/embedding_dimension 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S
🙈​ TestAccept/ssh/connection 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S
🔄​ TestFsCpFileToFile ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🔄​ TestFsCpFileToFile/uc-volumes_to_dbfs ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🔄​ TestFsCpSourceIsDirectoryButTargetIsFile ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🔄​ TestFsCpSourceIsDirectoryButTargetIsFile/dbfs_to_dbfs ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🟨​ TestFetchRepositoryInfoAPI_FromRepo 🟨​K 🟨​K 🟨​K 🟨​K 🙈​S 🙈​S
🟨​ TestFetchRepositoryInfoAPI_FromRepo/root 🟨​K 🟨​K 🟨​K 🟨​K
🟨​ TestFetchRepositoryInfoAPI_FromRepo/subdir 🟨​K 🟨​K 🔄​f 🟨​K
Top 6 slowest tests (at least 2 minutes):
duration env testname
7:35 gcp windows TestAccept
7:28 aws windows TestAccept
7:23 azure windows TestAccept
4:01 azure linux TestAccept
3:59 aws linux TestAccept
3:53 gcp linux TestAccept

@janniklasrose
janniklasrose requested a review from denik August 12, 2026 12:25

@denik denik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, thanks!

…l-fixtures

# Conflicts:
#	acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt
#	acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt
#	acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt
#	acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt
#	acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt
#	acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt
#	acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
#	acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt
#	acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt
#	acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt
#	acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt
@janniklasrose
janniklasrose added this pull request to the merge queue Aug 17, 2026
Merged via the queue into main with commit dc6cba7 Aug 17, 2026
23 checks passed
@janniklasrose
janniklasrose deleted the merge-engine-identical-fixtures branch August 17, 2026 20:33
@eng-dev-ecosystem-bot

Copy link
Copy Markdown
Collaborator

Integration test report

Commit: dc6cba7

Run: 32066448819

Env 🟨​KNOWN 🔄​flaky 💚​RECOVERED 🙈​SKIP ✅​pass 🙈​skip Time
🟨​ aws linux 3 3 2 1176 954 106:14
🟨​ aws windows 3 4 2 2 1112 973 123:45
🟨​ azure linux 3 3 2 1070 991 101:54
🟨​ azure windows 3 5 2 2 1005 1010 111:55
💚​ gcp linux 3 3 1060 995 100:46
🔄​ gcp windows 3 2 3 997 1014 113:58
17 interesting tests: 11 flaky, 3 KNOWN, 2 SKIP, 1 RECOVERED
Test Name aws linux aws windows azure linux azure windows gcp linux gcp windows
🔄​ TestAccept 💚​R 💚​R 💚​R 🔄​f 💚​R 🔄​f
💚​ TestAccept/bundle/invariant/no_drift 💚​R 💚​R 💚​R 💚​R 💚​R 💚​R
🔄​ TestAccept/bundle/resources/postgres_synced_tables/recreate ✅​p 🔄​f 🙈​s 🙈​s 🙈​s 🙈​s
🔄​ TestAccept/bundle/resources/postgres_synced_tables/recreate/DATABRICKS_BUNDLE_ENGINE=terraform ✅​p 🔄​f
🔄​ TestAccept/bundle/resources/secret_scopes/permissions ✅​p ✅​p ✅​p 🔄​f 🙈​s 🙈​s
🔄​ TestAccept/bundle/resources/secret_scopes/permissions/DATABRICKS_BUNDLE_ENGINE=direct ✅​p ✅​p ✅​p 🔄​f
🔄​ TestAccept/bundle/resources/vector_search_endpoints/drift/recreated_same_name 💚​R 🔄​f 💚​R 💚​R 💚​R 💚​R
🔄​ TestAccept/bundle/resources/vector_search_endpoints/drift/recreated_same_name/DATABRICKS_BUNDLE_ENGINE=direct ✅​p 🔄​f ✅​p ✅​p ✅​p ✅​p
🙈​ TestAccept/bundle/resources/vector_search_indexes/recreate/embedding_dimension 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S
🔄​ TestAccept/bundle/resources/volumes/recreate ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🔄​ TestAccept/bundle/resources/volumes/recreate/DATABRICKS_BUNDLE_ENGINE=direct ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🙈​ TestAccept/ssh/connection 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S 🙈​S
🔄​ TestFsCatOnNonExistentFile ✅​p ✅​p ✅​p 🔄​f ✅​p ✅​p
🔄​ TestFsCatOnNonExistentFile/uc-volumes ✅​p ✅​p ✅​p 🔄​f ✅​p ✅​p
🟨​ TestFetchRepositoryInfoAPI_FromRepo 🟨​K 🟨​K 🟨​K 🟨​K 🙈​S 🙈​S
🟨​ TestFetchRepositoryInfoAPI_FromRepo/root 🟨​K 🟨​K 🟨​K 🟨​K
🟨​ TestFetchRepositoryInfoAPI_FromRepo/subdir 🟨​K 🟨​K 🟨​K 🟨​K
Top 50 slowest tests (at least 2 minutes):
duration env testname
13:09 gcp windows TestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
13:02 gcp linux TestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
11:41 azure linux TestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
9:20 gcp windows TestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:51 gcp linux TestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:50 aws linux TestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:34 aws linux TestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:05 azure linux TestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
8:01 azure windows TestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
7:33 aws windows TestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
7:06 gcp linux TestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
7:01 gcp windows TestAccept/bundle/resources/clusters/deploy/local_ssd_count/DATABRICKS_BUNDLE_ENGINE=direct
7:01 azure windows TestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
6:59 aws windows TestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
6:53 azure linux TestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
6:52 gcp linux TestAccept/bundle/resources/clusters/deploy/local_ssd_count/DATABRICKS_BUNDLE_ENGINE=direct
6:51 azure linux TestAccept/bundle/resources/clusters/deploy/update-after-create/DATABRICKS_BUNDLE_ENGINE=terraform
6:48 aws windows TestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
6:47 gcp linux TestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=direct
6:27 gcp windows TestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:56 aws linux TestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=direct
5:55 gcp linux TestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=terraform
5:48 aws linux TestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:26 azure linux TestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=terraform
5:23 azure linux TestAccept
5:22 gcp linux TestAccept/bundle/resources/apps/lifecycle-started-omitted/DATABRICKS_BUNDLE_ENGINE=direct
5:20 aws linux TestAccept
5:14 aws linux TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
5:11 gcp linux TestAccept/bundle/resources/apps/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:11 azure windows TestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:07 aws linux TestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=terraform
5:06 gcp linux TestAccept
4:48 gcp linux TestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=direct
4:48 gcp windows TestAccept/bundle/resources/apps/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
4:47 azure windows TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
4:30 azure windows TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
4:28 gcp linux TestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=terraform
4:18 gcp windows TestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=terraform
4:17 gcp windows TestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=direct
4:16 gcp windows TestAccept/bundle/resources/apps/lifecycle-started-omitted/DATABRICKS_BUNDLE_ENGINE=direct
4:16 azure linux TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
4:11 gcp linux TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
4:08 azure linux TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
4:01 aws windows TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
4:01 gcp windows TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
3:38 aws windows TestAccept/bundle/resources/apps/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
3:35 gcp windows TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
3:29 azure windows TestAccept/bundle/resources/apps/lifecycle-started-omitted/DATABRICKS_BUNDLE_ENGINE=direct
3:21 gcp linux TestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
3:17 gcp linux TestAccept/bundle/invariant/no_drift/DATABRICKS_BUNDLE_ENGINE=direct/INPUT_CONFIG=cluster.yml.tmpl/READPLAN=

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants