Repository navigation
fix: keep the check level when a merged layer does not set one - #2872
Open
tonyandrewmeyer wants to merge 3 commits into
Open
tonyandrewmeyer wants to merge 3 commits into
tonyandrewmeyer wants to merge 3 commits into
Conversation
Combining check layers cleared the level when the overriding layer did not set one. Pebble only copies the level when the other layer's is non-empty, as for every other field, so this affected Harness and Scenario plan rendering rather than real Pebble. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
benhoyt
approved these changes
Nov 9, 2026
Service, Check and LogTarget _merge copied the new layer's override onto the existing entry. Pebble's Merge methods never touch Override, so a combined plan keeps the override of the layer that introduced the entry (replace, usually), where ops showed merge. Harness and Scenario plans now match. The tests that expected the copied override now expect Pebble's. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
CheckLevel.UNSET and CheckStartup.UNSET look the same in the merge but mean different things, which the comment this branch replaced used to say. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 15, 2026
This branch has not been 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 two places where combining layers in Harness and Scenario didn't match what Pebble does:
Check.Mergeininternals/plan/plan.goonly copiesLevelwhen the other layer's is non-empty).overrideinto the combined plan. Pebble'sMergemethods never touchOverride, so the combined plan keeps the override of the layer that first added the entry.Neither affects real Pebble, only the plan that Harness and Scenario build from the layers. Several existing tests expected the copied
override, so they now expect the base layer's one instead (or nooverrideat all, where the base layer didn't set one).Fixes #2894