From fe431ff9ad22d027a59d866e45c4e40d93d8ce57 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Fri, 21 Apr 2023 16:09:58 -0600 Subject: [PATCH 1/2] README, oidc-exchange: remove beta references Signed-off-by: William Woodruff --- README.md | 9 --------- oidc-exchange.py | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index 4d5a191..5fb19c4 100644 --- a/README.md +++ b/README.md @@ -67,15 +67,6 @@ settings page of your project on GitHub. See [Creating & using secrets]. ### Trusted publishing -> **IMPORTANT**: This functionality is in beta, and will not work for you -> unless you're a member of the PyPI trusted publishing beta testers' group. -> For more information, see [warehouse#12965]. - -> **NOTE**: Trusted publishing is sometimes referred to by its -> underlying technology -- OpenID Connect, or OIDC for short. -> If you see references to "OIDC publishing" in the context of PyPI, -> this is what they're referring to. - This action supports PyPI's [trusted publishing] implementation, which allows authentication to PyPI without a manually configured API token or username/password combination. To perform diff --git a/oidc-exchange.py b/oidc-exchange.py index 07579d0..3259d1f 100644 --- a/oidc-exchange.py +++ b/oidc-exchange.py @@ -96,7 +96,7 @@ def assert_successful_audience_call(resp: requests.Response, domain: str): match resp.status_code: case HTTPStatus.FORBIDDEN: # This index supports OIDC, but forbids the client from using - # it (either because it's disabled, limited to a beta group, etc.) + # it (either because it's disabled, ratelimited, etc.) die( f"audience retrieval failed: repository at {domain} has trusted publishing disabled", ) From c008c2f40abc7b85467b393f3b78e67391ffa7f8 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Sat, 22 Apr 2023 07:27:01 -0600 Subject: [PATCH 2/2] README: re-add OIDC note Signed-off-by: William Woodruff --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 5fb19c4..db79713 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,11 @@ settings page of your project on GitHub. See [Creating & using secrets]. ### Trusted publishing +> **NOTE**: Trusted publishing is sometimes referred to by its +> underlying technology -- OpenID Connect, or OIDC for short. +> If you see references to "OIDC publishing" in the context of PyPI, +> this is what they're referring to. + This action supports PyPI's [trusted publishing] implementation, which allows authentication to PyPI without a manually configured API token or username/password combination. To perform