Skip to content

fix: keep the check level when a merged layer does not set one #2872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonyandrewmeyer wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: keep the check level when a merged layer does not set one #2872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c91915
fix: keep the check level when a merged layer does not set one
tonyandrewmeyer Nov 9, 2026
3ff077e
fix: keep the existing override when merging a layer in
tonyandrewmeyer Nov 11, 2026
3ae70da
docs: say why the level and startup cases are separate in Check._merge
tonyandrewmeyer Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ops/pebble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,9 +1260,11 @@ def _merge(self, other: Check):
self._merge_exec(value)
elif name == 'startup' and value == CheckStartup.UNSET:
continue
# Note that CheckLevel.UNSET has a different meaning to
# CheckStartup.UNSET. In the former, it means 'there is no level';
# in the latter it means 'use the default'.
elif name == 'level' and value == CheckLevel.UNSET:
# Like every other field, a level the other layer does not
# set leaves this layer's level alone (which is what Pebble
# does when it combines the layers).
continue
else:
setattr(self, name, value)

Expand Down
13 changes: 13 additions & 0 deletions test/test_pebble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,19 @@ def test_level_raw(self):
check = pebble.Check('chk-http', d)
assert check.level == 'foobar!' # remains a string

def test_merge_keeps_level(self):
base = pebble.Check(
'chk', {'override': 'replace', 'level': 'alive', 'http': {'url': 'http://a/'}}
)
override = pebble.Check('chk', {'override': 'merge', 'period': '5s'})
base._merge(override)
assert base.level == pebble.CheckLevel.ALIVE
assert base.period == '5s'

override = pebble.Check('chk', {'override': 'merge', 'level': 'ready'})
base._merge(override)
assert base.level == pebble.CheckLevel.READY

def test_equality(self):
d: pebble.CheckDict = {
'override': 'replace',
Expand Down
Loading