fix: ensure we don't allow extra in scopes config #885
Conversation
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
Currently has the root object has "ignore" to allow root keys from the engine, we can't change the default validator Change-Id: I304fd6ef4f6202252842c965f9a59d4376531405
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 👀 Review RequirementsWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 🔎 ReviewsWonderful, this rule succeeded.
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
Contributor
🧪 CI InsightsHere's what we observed from your CI run for 04c0124. 🟢 All jobs passed!But CI Insights is watching 👀 |
There was a problem hiding this comment.
Pull request overview
This PR enhances configuration validation by adding strict field validation to Pydantic models in the scopes configuration. The change prevents users from accidentally providing invalid field names (like includes instead of include) by setting extra="forbid" on all scope-related models.
Key Changes
- Added
extra="forbid"to four Pydantic models:FileFilters,SourceFiles,SourceManual, andScopes - Updated existing test to expect 4 validation errors instead of 3 to reflect stricter validation
- Added new test case to specifically validate the extra field rejection behavior
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| mergify_cli/ci/scopes/config/scopes.py | Adds model_config = pydantic.ConfigDict(extra="forbid") to all scope-related Pydantic models to prevent extra fields in configuration |
| mergify_cli/tests/ci/scopes/test_cli.py | Updates error count expectation from 3 to 4 in existing test and adds new test case test_match_scopes_invalid to verify extra fields are properly rejected |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jd
approved these changes
Dec 11, 2025
Syffe
approved these changes
Dec 11, 2025
mergify
bot
deleted the
devs/sileht/scope-validation/I304fd6ef4f6202252842c965f9a59d4376531405
branch
Contributor
Merge Queue Status✅ The pull request has been merged at 04c0124 This pull request spent 40 minutes 39 seconds in the queue, with no time running CI. Required conditions to merge
|
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.
Currently has the root object has "ignore" to allow root keys from the
engine, we can't change the default validator