This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new a9ba41d Fix function order in the POST keys module
a9ba41d is described below
commit a9ba41d48fde13b9de170d744340e6ae56d062e2
Author: Sean B. Palmer <[email protected]>
AuthorDate: Tue Dec 2 15:00:42 2025 +0000
Fix function order in the POST keys module
---
atr/post/keys.py | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/atr/post/keys.py b/atr/post/keys.py
index 0876cf6..9a1728f 100644
--- a/atr/post/keys.py
+++ b/atr/post/keys.py
@@ -78,21 +78,6 @@ async def add(session: web.Committer, add_openpgp_key_form:
shared.keys.AddOpenP
return await session.redirect(get.keys.keys)
[email protected]("/keys")
[email protected](shared.keys.KeysForm)
-async def keys(session: web.Committer, keys_form: shared.keys.KeysForm) ->
web.WerkzeugResponse:
- """Handle forms on the keys management page."""
- match keys_form:
- case shared.keys.DeleteOpenPGPKeyForm() as delete_openpgp_form:
- return await _delete_openpgp_key(session, delete_openpgp_form)
-
- case shared.keys.DeleteSSHKeyForm() as delete_ssh_form:
- return await _delete_ssh_key(session, delete_ssh_form)
-
- case shared.keys.UpdateCommitteeKeysForm() as update_committee_form:
- return await _update_committee_keys(session, update_committee_form)
-
-
@post.committer("/keys/details/<fingerprint>")
@post.form(shared.keys.UpdateKeyCommitteesForm)
async def details(
@@ -157,6 +142,21 @@ async def import_selected_revision(
)
[email protected]("/keys")
[email protected](shared.keys.KeysForm)
+async def keys(session: web.Committer, keys_form: shared.keys.KeysForm) ->
web.WerkzeugResponse:
+ """Handle forms on the keys management page."""
+ match keys_form:
+ case shared.keys.DeleteOpenPGPKeyForm() as delete_openpgp_form:
+ return await _delete_openpgp_key(session, delete_openpgp_form)
+
+ case shared.keys.DeleteSSHKeyForm() as delete_ssh_form:
+ return await _delete_ssh_key(session, delete_ssh_form)
+
+ case shared.keys.UpdateCommitteeKeysForm() as update_committee_form:
+ return await _update_committee_keys(session, update_committee_form)
+
+
@post.committer("/keys/ssh/add")
@post.form(shared.keys.AddSSHKeyForm)
async def ssh_add(session: web.Committer, add_ssh_key_form:
shared.keys.AddSSHKeyForm) -> web.WerkzeugResponse:
@@ -247,6 +247,19 @@ async def _delete_ssh_key(session: web.Committer,
delete_form: shared.keys.Delet
return await session.redirect(get.keys.keys, success="SSH key deleted
successfully")
+async def _fetch_keys_from_url(keys_url: str) -> str:
+ """Fetch KEYS file content from a URL."""
+ try:
+ async with aiohttp.ClientSession() as session:
+ async with session.get(keys_url, allow_redirects=True) as response:
+ response.raise_for_status()
+ return await response.text()
+ except aiohttp.ClientResponseError as e:
+ raise base.ASFQuartException(f"Unable to fetch keys from remote
server: {e.status} {e.message}", errorcode=502)
+ except aiohttp.ClientError as e:
+ raise base.ASFQuartException(f"Network error while fetching keys:
{e}", errorcode=503)
+
+
async def _update_committee_keys(
session: web.Committer, update_form: shared.keys.UpdateCommitteeKeysForm
) -> web.WerkzeugResponse:
@@ -264,16 +277,3 @@ async def _update_committee_keys(
await quart.flash(f"Error regenerating the KEYS file for the
{committee_name} committee.", "error")
return await session.redirect(get.keys.keys)
-
-
-async def _fetch_keys_from_url(keys_url: str) -> str:
- """Fetch KEYS file content from a URL."""
- try:
- async with aiohttp.ClientSession() as session:
- async with session.get(keys_url, allow_redirects=True) as response:
- response.raise_for_status()
- return await response.text()
- except aiohttp.ClientResponseError as e:
- raise base.ASFQuartException(f"Unable to fetch keys from remote
server: {e.status} {e.message}", errorcode=502)
- except aiohttp.ClientError as e:
- raise base.ASFQuartException(f"Network error while fetching keys:
{e}", errorcode=503)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
