Make config-remote-sync patching logic more generic#4400
Merged
ilyakuz-db merged 11 commits intomainfrom Jan 30, 2026
Merged
Conversation
ilyakuz-db
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
ilyakuz-db
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
Collaborator
|
Commit: b694b69
18 interesting tests: 9 KNOWN, 5 SKIP, 4 RECOVERED
Top 50 slowest tests (at least 2 minutes):
|
ilyakuz-db
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
ilyakuz-db
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
ilyakuz-db
commented
Jan 30, 2026
|
|
||
| // normalizeValue converts values to plain Go types suitable for YAML patching | ||
| // by using SDK marshaling which properly handles ForceSendFields and other annotations. | ||
| func normalizeValue(v any) (any, error) { |
Contributor
Author
There was a problem hiding this comment.
This is moved as is from patch.go
Will check if it's needed and can it be replaced with dyn in following PRs
ilyakuz-db
commented
Jan 30, 2026
|
|
||
| type resolvedChanges map[string]*deployplan.ChangeDesc | ||
| // ApplyChangesToYAML generates YAML files for the given field changes. | ||
| func ApplyChangesToYAML(ctx context.Context, b *bundle.Bundle, fieldChanges []FieldChange) ([]FileChange, error) { |
Contributor
Author
There was a problem hiding this comment.
This was simplified to reduce nesting level, also bundle-specific logic was moved to diff.go and resolve.go
ilyakuz-db
commented
Jan 30, 2026
| } | ||
|
|
||
| // ResolveChanges resolves selectors and computes field path candidates for each change. | ||
| func ResolveChanges(ctx context.Context, b *bundle.Bundle, configChanges Changes) ([]FieldChange, error) { |
Contributor
Author
There was a problem hiding this comment.
All path resolution is handled here now, I will update this to traverse path nodes in following PRs
denik
approved these changes
Jan 30, 2026
Contributor
denik
left a comment
denik
left a comment
There was a problem hiding this comment.
Could you make PR description more concrete? Which functions/types were moved, which were changed, which replaced by something newer.
ilyakuz-db
requested review from
andrewnester,
anton-107,
pietern and
shreyas-goenka
as code owners
Contributor
Author
Elaborated a bit |
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.
Changes
Split the config-remote-sync command into 3 separate phases. Previously, some DAB-specific logic was embedded in the patcher, now it
Detect (diff.go) - Compare states, handle server-side and CLI defaults. Convert value to the internal struct. Compute which operation type should be applied to the config
Resolve (resolve.go) - Determine file locations and field paths. Replace [task_key=foo] selectors
Patch (patch.go) - Now only handles YAML modifications, doesn't hold any config-specific logic
Changes:
resolve.gopatch.gotoresolve.goWhy
Preparation before the next PR, where I plan to properly handle CLI defaults
Tests