fix(file): file condition bug with searchpattern and matchpattern#7619
Merged
olblak merged 1 commit intoupdatecli:mainfrom Jan 30, 2026
Merged
fix(file): file condition bug with searchpattern and matchpattern#7619olblak merged 1 commit intoupdatecli:mainfrom
olblak merged 1 commit intoupdatecli:mainfrom
Conversation
olblak
changed the title
Signed-off-by: Olblak <me@olblak.com>
olblak
force-pushed
the
fix/file/matchpattern
branch
from
38bacc3 to
a4c6f63
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request fixes a bug in the file condition logic when using searchpattern: true with matchpattern. The issue was that the check for empty files (when all files are filtered out) was placed incorrectly in the code, making it unreachable. This PR moves the check to the correct location, ensuring consistent behavior between file conditions and targets.
Changes:
- Fixed the file condition check placement to properly detect when all files are filtered out by
matchpattern - Added e2e test coverage for the failing scenario with
searchpatternand non-matchingmatchpattern - Removed unnecessary blank lines for cleaner formatting
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| pkg/plugins/resources/file/condition.go | Moved the empty files check inside the file deletion block to properly detect when all files are filtered out, fixing the bug where conditions would incorrectly succeed when all files failed to match the content pattern |
| e2e/updatecli.d/success.d/file/noscm.yaml | Added test case for condition with searchpattern and matchpattern that filters out all files, demonstrating the fix works correctly |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
olblak
changed the title
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.
While reviewing #7614 I realize that the condition file match pattern was also broken
Note that #7614 should be merged first
Test
To test this pull request, you can run the following commands:
go build -o bin/updatecli . ./bin/updatecli diff --config e2e/updatecli.d/success.d/file/noscm.yamlAdditional Information
Checklist
Tradeoff
Potential improvement