Repository navigation
fix: merge watch config contexts without duplicates and reject blank names - #618
Open
aryarathoree wants to merge 1 commit into
Open
aryarathoree wants to merge 1 commit into
aryarathoree wants to merge 1 commit into
Conversation
aryarathoree
requested review from
Caesarsage,
Harsh4902,
lbroudoux and
yada
as code owners
November 4, 2026 11:54
Contributor
There was a problem hiding this comment.
Thanks @aryarathoree for addressing the context-loss issue, and thanks @aniket866 for collaborating.
I traced the policy-guards failure to the ignored writes in cmd/login_test.go. These were already fixed on upstream master in [197c2da](197c2da).
This PR branch is based on an earlier commit. Rebasing against the latest upstream/master should bring in that fix. You can then rerun the workflow to verify the result.
Merge contexts without duplicates in WatchConfig.UpsertEntry to prevent existing contexts from being deleted when re-upserting a watched file. Validate that context lists are non-empty and reject blank context names, propagating errors to callers. Fixes microcks#610 Co-authored-by: aniket866 <iamaniketkumarmaner@gmail.com> Signed-off-by: Arya Rathore <aryarathoree@gmail.com>
aryarathoree
force-pushed
the
fix/watch-config-upsert-context-merge
branch
from
November 17, 2026 19:17
5b0adb4 to
c31bbc7
Compare
Contributor
Author
|
@dipak0000812 I've rebased the branch on latest |
This branch was successfully deployed
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
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.
Fixes #610
Summary
This PR addresses the watch configuration context-handling bugs in
WatchConfig.UpsertEntry:entry.Contextis non-empty and contains no blank/whitespace-only context names, returning descriptive errors to callers.UpsertEntryincmd/import.go.pkg/config/localconfig_test.goandpkg/config/config_test.gocovering empty contexts, blank context names, context merging on re-upsert, and deduplication.Co-authored-by: https://github.com/aniket866