Skip to content

config-remote-sync: skip changes nested inside a variable reference - #6308

Open
ilyakuz-db wants to merge 2 commits into
mainfrom
configsync-skip-var-ref-parent
Open

config-remote-sync: skip changes nested inside a variable reference#6308
ilyakuz-db wants to merge 2 commits into
mainfrom
configsync-skip-var-ref-parent

Conversation

@ilyakuz-db

Copy link
Copy Markdown
Contributor

Changes

config-remote-sync now skips a change whose parent field in the YAML is a variable reference (e.g. spark_conf: ${var.spark_conf}) instead of failing the whole run. Such skips are recorded in the existing skipped-changes telemetry.

Why

A nested key or index cannot be written into a scalar ${var} node, so the write-back aborted the entire sync and dropped every other detected change. Skipping only the unwritable change lets the rest apply.

Tests

Added an acceptance test: a remotely-added key under a ${var} field is skipped while an unrelated edit still syncs.

@github-actions

github-actions Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

Approval status: pending

/acceptance/bundle/ - needs approval

5 files changed
Suggested: @pietern
Also eligible: @denik, @andrewnester, @anton-107, @janniklasrose, @lennartkats-db, @shreyas-goenka

/bundle/ - needs approval

Files: bundle/configsync/patch_test.go, bundle/configsync/resolve.go, bundle/configsync/variables.go
Suggested: @pietern
Also eligible: @denik, @andrewnester, @anton-107, @janniklasrose, @lennartkats-db, @shreyas-goenka

/cmd/bundle/ - needs approval

Files: cmd/bundle/config_remote_sync.go
Suggested: @pietern
Also eligible: @denik, @andrewnester, @anton-107, @janniklasrose, @lennartkats-db, @shreyas-goenka

Any maintainer (@andrewnester, @anton-107, @denik, @pietern, @shreyas-goenka, @simonfaltum, @renaudhartert-db, @janniklasrose, @lennartkats-db, @rugpanov, @rclarey) can approve all areas.
See OWNERS for ownership rules.

@eng-dev-ecosystem-bot

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

Copy link
Copy Markdown
Collaborator

Integration test report

Commit: 597126c

Run: 32143322669

Env 🟨​KNOWN 🔄​flaky 💚​RECOVERED 🙈​SKIP ✅​pass 🙈​skip Time
🟨​ aws linux 3 1 4 286 1152 9:16
🟨​ aws windows 3 1 4 288 1150 7:14
🟨​ azure linux 3 1 4 285 1152 9:34
🟨​ azure windows 3 1 4 287 1150 7:42
💚​ gcp linux 1 5 286 1152 6:57
🔄​ gcp windows 1 1 5 287 1150 7:40
9 interesting tests: 4 SKIP, 3 KNOWN, 1 RECOVERED, 1 flaky
Test Name aws linux aws windows azure linux azure windows gcp linux gcp 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
🔄​ TestSyncNestedFolderDoesntFailOnNonEmptyDirectory ✅​p ✅​p ✅​p ✅​p ✅​p 🔄​f
🟨​ TestFetchRepositoryInfoAPI_FromRepo 🟨​K 🟨​K 🟨​K 🟨​K 🙈​S 🙈​S
🟨​ TestFetchRepositoryInfoAPI_FromRepo/root 🟨​K 🟨​K 🟨​K 🟨​K
🟨​ TestFetchRepositoryInfoAPI_FromRepo/subdir 🟨​K 🟨​K 🟨​K 🟨​K
Top 7 slowest tests (at least 2 minutes):
duration env testname
5:38 gcp windows TestAccept
5:32 aws windows TestAccept
5:30 azure windows TestAccept
3:56 aws linux TestAccept
3:51 gcp linux TestAccept
3:49 azure linux TestAccept
2:23 gcp windows TestFilerWorkspaceFilesExtensionsReadDir

@ilyakuz-db
ilyakuz-db requested a review from denik August 18, 2026 14:02
Sign up for free to 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.

2 participants