Repository navigation
bundle: drop EngineSetting, validate the engine setting instead of resolving it - #6959
Merged
Merged
Conversation
Collaborator
Integration test reportCommit: b1ec06a
Top 6 slowest tests (at least 2 minutes):
|
EngineSetting.Source and SourceDefault had no readers. PullResourcesState only used the requested engine to pick the engine for a new deployment, which is always direct now. The direct-engine guard before backing up a lingering remote terraform state is always true at that point (deploy migrates first, or the state is already direct). TerraformConfigFileName had no references. Co-authored-by: Isaac <no-reply@databricks.com>
denik
force-pushed
the
denik/tf-cleanup-engine-setting
branch
from
October 6, 2026 23:13
3eb831d to
8ac5795
Compare
The direct engine is the only one, so a valid engine setting needs no resolution: drop the EngineSetting type and return only an error. The migration telemetry source (via_config / via_env / via_default) is read from bundle.engine and DATABRICKS_BUNDLE_ENGINE where it is recorded, so Deploy and CommitMigration no longer carry the engine setting. Co-authored-by: Isaac <no-reply@databricks.com>
denik
marked this pull request as ready for review
October 7, 2026 07:27
janniklasrose
approved these changes
Oct 7, 2026
andreamatt
pushed a commit
to andreamatt/databricks-cli
that referenced
this pull request
Oct 9, 2026
…ricks#6961) Fixes a flake in `bundle/apps/job_permissions`. On the direct engine the job permissions and the app (which grants the job permission) can be deployed in either order, so `CAN_MANAGE_RUN` after the first deploy is order-dependent. The script used to drop the direct variant of that output, but databricks#6877 renamed the terraform variant to the generic `out.after_first_deploy.txt`, so the flaky result is now compared (seen on databricks#6959's `task test (linux, direct)`). The second-deploy check, which is what databricks#4309 covers, is unchanged. This pull request and its description were written by Isaac. --------- Co-authored-by: Isaac <no-reply@databricks.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The direct engine is the only one, so the resolved engine setting is always direct.
ResolveEngineSettingbecomesValidateEngineSetting, which only returns an error, and theEngineSettingtype is removed. The migration telemetry source (via_config/via_env/via_default) is now read frombundle.engineandDATABRICKS_BUNDLE_ENGINEwhere it is recorded, soDeployandCommitMigrationno longer take an engine argument.Also removes the engine parameter of
PullResourcesState, an always-trueIsDirect()check before backing up a leftover remote Terraform state, and the unusedterraform.TerraformConfigFileName. No behaviour change.This pull request and its description were written by Isaac.