Skip to content

fix: allow IdentityDict to be assigned IdentityAccess #2628

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 2 commits into
base: main
Choose a base branch
from
Open

fix: allow IdentityDict to be assigned IdentityAccess #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b22edd
Fix #1977: Improve type hints for Pebble identities
tonyandrewmeyer Jun 24, 2026
7606db5
Merge branch 'main' into rainy/1977-identity-access-typeddict
tonyandrewmeyer Jul 6, 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
2 changes: 1 addition & 1 deletion ops/pebble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
'IdentityDict',
{
# NOTE: ensure <IdentityAccessLiterals> are kept up to date in all locations
'access': Literal['untrusted', 'metrics', 'read', 'admin'],
'access': "IdentityAccess | Literal['untrusted', 'metrics', 'read', 'admin']",
'local': 'NotRequired[LocalIdentityDict]',
'basic': 'NotRequired[BasicIdentityDict]',
},
Expand Down
4 changes: 2 additions & 2 deletions test/test_pebble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4305,7 +4305,7 @@ def test_local_identity_from_dict(self):

def test_local_identity_from_dict_with_access_enum(self):
identity = pebble.Identity.from_dict({
'access': pebble.IdentityAccess.ADMIN, # type: ignore
'access': pebble.IdentityAccess.ADMIN,
'local': {'user-id': 42},
})
assert identity == pebble.Identity(
Expand All @@ -4330,7 +4330,7 @@ def test_basic_identity_from_dict(self):

def test_basic_identity_from_dict_with_access_enum(self):
identity = pebble.Identity.from_dict({
'access': pebble.IdentityAccess.METRICS, # type: ignore
'access': pebble.IdentityAccess.METRICS,
'basic': {'password': 'hashed password'},
})
assert identity == pebble.Identity(
Expand Down
Loading