From 35a67c71b4a608f493a43253ded0f8f10fdd48ed Mon Sep 17 00:00:00 2001 From: Mike Fiedler Date: Thu, 16 Oct 2025 17:10:12 -0400 Subject: [PATCH] chore: remove unused mapping The usage of `OIDC_ISSUER_URLS` was replaced in #15148 and is no longer needed. Signed-off-by: Mike Fiedler --- tests/unit/oidc/test_utils.py | 11 ----------- warehouse/oidc/utils.py | 7 ------- 2 files changed, 18 deletions(-) diff --git a/tests/unit/oidc/test_utils.py b/tests/unit/oidc/test_utils.py index d46cf73d387d..94f7d69248c3 100644 --- a/tests/unit/oidc/test_utils.py +++ b/tests/unit/oidc/test_utils.py @@ -303,17 +303,6 @@ def test_oidc_context_principals(): def test_oidc_maps_consistent(): - # Our various mappings should have equivalent cardinalities. - assert len(utils.OIDC_ISSUER_URLS) == len(utils.OIDC_ISSUER_SERVICE_NAMES) - assert len(utils.OIDC_ISSUER_URLS) == len(utils.OIDC_ISSUER_ADMIN_FLAGS) - assert len(utils.OIDC_ISSUER_URLS) == len(utils.OIDC_PUBLISHER_CLASSES) - - for iss in utils.OIDC_ISSUER_URLS: - # Each issuer should be present in each mapping. - assert iss in utils.OIDC_ISSUER_SERVICE_NAMES - assert iss in utils.OIDC_ISSUER_ADMIN_FLAGS - assert iss in utils.OIDC_PUBLISHER_CLASSES - for class_map in utils.OIDC_PUBLISHER_CLASSES.values(): # The class mapping for pending and non-pending publisher models # should be distinct. diff --git a/warehouse/oidc/utils.py b/warehouse/oidc/utils.py index 8dd02e5168c0..1220cdd26368 100644 --- a/warehouse/oidc/utils.py +++ b/warehouse/oidc/utils.py @@ -46,13 +46,6 @@ ACTIVESTATE_OIDC_ISSUER_URL: AdminFlagValue.DISALLOW_ACTIVESTATE_OIDC, } -OIDC_ISSUER_URLS = { - GITHUB_OIDC_ISSUER_URL, - GITLAB_OIDC_ISSUER_URL, - GOOGLE_OIDC_ISSUER_URL, - ACTIVESTATE_OIDC_ISSUER_URL, -} - OIDC_PUBLISHER_CLASSES: dict[ str, dict[bool, type[OIDCPublisher | PendingOIDCPublisher]] ] = {