Skip to content

direct: make migration ignore direct-only resources - #6261

Merged
denik merged 3 commits into
mainfrom
denik/migrate-direct-resource
Aug 13, 2026
Merged

direct: make migration ignore direct-only resources#6261
denik merged 3 commits into
mainfrom
denik/migrate-direct-resource

Conversation

@denik

@denikdenik commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Why

With a terraform state, adding a direct-only resource (instance pool, catalog, ...) and opting in via engine: direct made bundle deploy fail in pre-deploy checks, so the state never migrated and there was no way forward.

Such resources are new by definition, since terraform could never deploy them. When the direct engine is requested but the state is still terraform, they are now skipped by this run (bundle plan reports them as skip) and created by the next deploy, which runs on the migrated state.

The flag lives on bundle.Bundle, so bundle destroy skips them as well — terraform never created them, so there is nothing to destroy. Without the opt-in nothing changes: direct-only resources are still rejected.

Tests

Three acceptance tests, one per migration path: bundle deployment migrate (which already ignored them), engine: direct, and DATABRICKS_BUNDLE_ENGINE=direct.

@eng-dev-ecosystem-bot

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

Copy link
Copy Markdown
Collaborator

Integration test report

Commit: e0d19d0

Run: 31695727721

Env🔄​flaky💚​RECOVERED🙈​SKIP✅​pass🙈​skipTime
💚​aws linux4428611395:11
💚​aws windows4428811375:11
🔄​azure linux24428311395:37
💚​azure windows4428711375:19
💚​gcp linux1528611395:03
💚​gcp windows1528811375:21
10 interesting tests: 4 RECOVERED, 4 SKIP, 2 flaky
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
🔄​TestFsCpDirToDirWithOverwriteFlag✅​p✅​p🔄​f✅​p✅​p✅​p
🔄​TestFsCpDirToDirWithOverwriteFlag/uc-volumes_to_uc-volumes✅​p✅​p🔄​f✅​p✅​p✅​p
💚​TestFetchRepositoryInfoAPI_FromRepo💚​R💚​R💚​R💚​R🙈​S🙈​S
💚​TestFetchRepositoryInfoAPI_FromRepo/root💚​R💚​R💚​R💚​R
💚​TestFetchRepositoryInfoAPI_FromRepo/subdir💚​R💚​R💚​R💚​R
Top 6 slowest tests (at least 2 minutes):
durationenvtestname
5:10gcp windowsTestAccept
5:09azure windowsTestAccept
5:02aws windowsTestAccept
3:02azure linuxTestAccept
2:58aws linuxTestAccept
2:50gcp linuxTestAccept

@@ -0,0 +1,57 @@
package mutator_test

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.

Do we need this? This seems to be covered by acceptance tests anyway and we agreed not to unit tests mutators

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

no, good point.

@denik
denik added this pull request to the merge queueAug 13, 2026
@denik
denik removed this pull request from the merge queue due to a manual request Aug 13, 2026
@denikdenik changed the title direct: make migration ignore direct-only only resourcesdirect: make migration ignore direct-only resourcesAug 13, 2026
@denik
denik added this pull request to the merge queueAug 13, 2026
Merged via the queue into main with commit d4341aeAug 13, 2026
24 checks passed
@denik
denik deleted the denik/migrate-direct-resource branch August 13, 2026 12:18
denik added a commit that referenced this pull request Aug 13, 2026
The direct-only migration tests from #6261 landed on main while this branch was in
review, so their goldens still carried the old "Deploying resources..." output.
denik added a commit that referenced this pull request Aug 13, 2026
The direct-only migration tests from #6261 landed on main while this branch was in
review, so their goldens still carried the old "Deploying resources..." output.
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.

3 participants

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