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_projectsprint_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 mainAugust 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🙈​skipTime
🟨​aws linux31431311417:27
🟨​aws windows314315113912:23
🟨​azure linux211430611437:58
🟨​azure windows314308114112:19
💚​gcp linux1530711436:42
🔄​gcp windows415305114111:14
12 interesting tests: 4 SKIP, 4 flaky, 3 KNOWN, 1 RECOVERED
Test Nameaws linuxaws windowsazure linuxazure windowsgcp linuxgcp 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):
durationenvtestname
7:35gcp windowsTestAccept
7:28aws windowsTestAccept
7:23azure windowsTestAccept
4:01azure linuxTestAccept
3:59aws linuxTestAccept
3:53gcp linuxTestAccept

@denikdenik 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 queueAug 17, 2026
Merged via the queue into main with commit dc6cba7Aug 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🙈​skipTime
🟨​aws linux3321176954106:14
🟨​aws windows34221112973123:45
🟨​azure linux3321070991101:54
🟨​azure windows352210051010111:55
💚​gcp linux331060995100:46
🔄​gcp windows3239971014113:58
17 interesting tests: 11 flaky, 3 KNOWN, 2 SKIP, 1 RECOVERED
Test Nameaws linuxaws windowsazure linuxazure windowsgcp linuxgcp 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):
durationenvtestname
13:09gcp windowsTestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
13:02gcp linuxTestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
11:41azure linuxTestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
9:20gcp windowsTestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:51gcp linuxTestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:50aws linuxTestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:34aws linuxTestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
8:05azure linuxTestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
8:01azure windowsTestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
7:33aws windowsTestAccept/bundle/resources/clusters/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
7:06gcp linuxTestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
7:01gcp windowsTestAccept/bundle/resources/clusters/deploy/local_ssd_count/DATABRICKS_BUNDLE_ENGINE=direct
7:01azure windowsTestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
6:59aws windowsTestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
6:53azure linuxTestAccept/bundle/resources/apps/lifecycle-started/DATABRICKS_BUNDLE_ENGINE=direct
6:52gcp linuxTestAccept/bundle/resources/clusters/deploy/local_ssd_count/DATABRICKS_BUNDLE_ENGINE=direct
6:51azure linuxTestAccept/bundle/resources/clusters/deploy/update-after-create/DATABRICKS_BUNDLE_ENGINE=terraform
6:48aws windowsTestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
6:47gcp linuxTestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=direct
6:27gcp windowsTestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:56aws linuxTestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=direct
5:55gcp linuxTestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=terraform
5:48aws linuxTestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:26azure linuxTestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=terraform
5:23azure linuxTestAccept
5:22gcp linuxTestAccept/bundle/resources/apps/lifecycle-started-omitted/DATABRICKS_BUNDLE_ENGINE=direct
5:20aws linuxTestAccept
5:14aws linuxTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
5:11gcp linuxTestAccept/bundle/resources/apps/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:11azure windowsTestAccept/bundle/resources/clusters/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
5:07aws linuxTestAccept/bundle/config-remote-sync/multiple_resources/DATABRICKS_BUNDLE_ENGINE=terraform
5:06gcp linuxTestAccept
4:48gcp linuxTestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=direct
4:48gcp windowsTestAccept/bundle/resources/apps/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
4:47azure windowsTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
4:30azure windowsTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
4:28gcp linuxTestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=terraform
4:18gcp windowsTestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=terraform
4:17gcp windowsTestAccept/bundle/resources/apps/inline_config/DATABRICKS_BUNDLE_ENGINE=direct
4:16gcp windowsTestAccept/bundle/resources/apps/lifecycle-started-omitted/DATABRICKS_BUNDLE_ENGINE=direct
4:16azure linuxTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
4:11gcp linuxTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
4:08azure linuxTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
4:01aws windowsTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
4:01gcp windowsTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
3:38aws windowsTestAccept/bundle/resources/apps/lifecycle-started-toggle/DATABRICKS_BUNDLE_ENGINE=direct
3:35gcp windowsTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=direct
3:29azure windowsTestAccept/bundle/resources/apps/lifecycle-started-omitted/DATABRICKS_BUNDLE_ENGINE=direct
3:21gcp linuxTestAccept/bundle/deploy/spark-jar-task/DATABRICKS_BUNDLE_ENGINE=terraform
3:17gcp linuxTestAccept/bundle/invariant/no_drift/DATABRICKS_BUNDLE_ENGINE=direct/INPUT_CONFIG=cluster.yml.tmpl/READPLAN=

Sign up for freeto 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

@janniklasrose@eng-dev-ecosystem-bot@denik@andrewnester