Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 0 additions & 11 deletions tests/unit/oidc/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 0 additions & 7 deletions warehouse/oidc/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
] = {
Expand Down