Skip to content

direct: simplify old state inference when no local diff exists #4485

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

Open
pietern wants to merge 2 commits into
base: main
Choose a base branch
from
Open

direct: simplify old state inference when no local diff exists #4485

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e312c44
direct: simplify old state inference when no local diff exists
pietern Feb 10, 2026
61c309e
Merge branch 'main' into direct-fix-infer-old-state
rauchy Feb 10, 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
12 changes: 4 additions & 8 deletions bundle/direct/bundle_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,11 @@ func prepareChanges(ctx context.Context, adapter *dresources.Adapter, localDiff,
for _, ch := range remoteDiff {
entry := m[ch.Path.String()]
if entry == nil {
// we have difference for remoteState but not difference for localState
// from remoteDiff we can find out remote value (ch.Old) and new config value (ch.New) but we don't know oldState value
oldStateVal, err := structaccess.Get(oldState, ch.Path)
var notFound *structaccess.NotFoundError
if err != nil && !errors.As(err, &notFound) {
log.Debugf(ctx, "Constructing diff: accessing %q on %T: %s", ch.Path, oldState, err)
}
// We have a difference for remoteState but not for localState.
Copy link
Contributor

@denik denik Feb 10, 2026

Choose a reason for hiding this comment

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

We don't know that, we can have a difference recorded at different levels.

For example, old->new diff for 'field' and new->remote diff for 'field.subfield'.

See also #4451

It looks like we make the same assumption below for Remote.

// No local diff means oldState == newConfig for this field,
// so ch.New (from newConfig) is also the oldState value.
m[ch.Path.String()] = &deployplan.ChangeDesc{
Old: oldStateVal,
Old: ch.New,
New: ch.New,
Remote: ch.Old,
}
Expand Down