From 5b22eddd2fd46b1d656b63fb0e2f42313b70a17f Mon Sep 17 00:00:00 2001 From: Tony Meyer Date: Wed, 24 Jun 2026 15:12:38 +0000 Subject: [PATCH] Fix #1977: Improve type hints for Pebble identities --- ops/pebble.py | 2 +- test/test_pebble.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ops/pebble.py b/ops/pebble.py index dfe4abfc1..bc82d4a23 100644 --- a/ops/pebble.py +++ b/ops/pebble.py @@ -180,7 +180,7 @@ 'IdentityDict', { # NOTE: ensure 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]', }, diff --git a/test/test_pebble.py b/test/test_pebble.py index d2a3ada4a..4b271af0b 100644 --- a/test/test_pebble.py +++ b/test/test_pebble.py @@ -4278,7 +4278,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( @@ -4303,7 +4303,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(