Skip to content

direct: initialize "remote" in "changes" properly #4451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denik merged 3 commits into from
Feb 5, 2026
Merged

direct: initialize "remote" in "changes" properly #4451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df7eb19
WIP read remoteState
denik Feb 5, 2026
5eb586d
remoteStateComparable
denik Feb 5, 2026
65fb54e
update a test
denik Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions acceptance/bundle/config-remote-sync/config_edits/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Deployment complete!
Detected changes in 1 resource(s):

Resource: resources.jobs.my_job
email_notifications.on_failure: replace
email_notifications.on_failure[0]: replace
max_concurrent_runs: replace
tags['env']: remove
Expand Down
10 changes: 5 additions & 5 deletions bundle/direct/bundle_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (b *DeploymentBundle) CalculatePlan(ctx context.Context, client *databricks
}
}

entry.Changes, err = prepareChanges(ctx, adapter, localDiff, remoteDiff, savedState, remoteState != nil)
entry.Changes, err = prepareChanges(ctx, adapter, localDiff, remoteDiff, savedState, remoteStateComparable)
if err != nil {
logdiag.LogError(ctx, fmt.Errorf("%s: %w", errorPrefix, err))
return false
Expand Down Expand Up @@ -316,17 +316,17 @@ func getMaxAction(m map[string]*deployplan.ChangeDesc) deployplan.ActionType {
return result
}

func prepareChanges(ctx context.Context, adapter *dresources.Adapter, localDiff, remoteDiff []structdiff.Change, oldState any, hasRemote bool) (deployplan.Changes, error) {
func prepareChanges(ctx context.Context, adapter *dresources.Adapter, localDiff, remoteDiff []structdiff.Change, oldState, remoteState any) (deployplan.Changes, error) {
m := make(deployplan.Changes)

for _, ch := range localDiff {
e := deployplan.ChangeDesc{
Old: ch.Old,
New: ch.New,
}
if hasRemote {
// by default, assume e.Remote is the same as config; if not the case it'll be ovewritten below
e.Remote = ch.New
if remoteState != nil {
// We cannot assume e.Remote is the same as config: if the whole struct is missing, there might be diff entry for parent
e.Remote, _ = structaccess.Get(remoteState, ch.Path)
}
m[ch.Path.String()] = &e
}
Expand Down