Skip to content

Commit 32fa0f3

Browse files
authored
fix: set the default issuer_url column value (#18881)
* fix: set the default issuer_url column value Fixes #18879 Signed-off-by: Mike Fiedler <miketheman@gmail.com>
1 parent bd08930 commit 32fa0f3

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

warehouse/locale/messages.pot

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ msgid "Please review our updated <a href=\"${tos_url}\">Terms of Service</a>."
306306
msgstr ""
307307

308308
#: warehouse/accounts/views.py:1673 warehouse/accounts/views.py:1927
309-
#: warehouse/manage/views/oidc_publishers.py:120
309+
#: warehouse/manage/views/oidc_publishers.py:121
310310
msgid ""
311311
"Trusted publishing is temporarily disabled. See https://pypi.org/help"
312312
"#admin-intervention for details."
@@ -327,20 +327,20 @@ msgid "You can't register more than 3 pending trusted publishers at once."
327327
msgstr ""
328328

329329
#: warehouse/accounts/views.py:1738
330-
#: warehouse/manage/views/oidc_publishers.py:302
331-
#: warehouse/manage/views/oidc_publishers.py:417
332-
#: warehouse/manage/views/oidc_publishers.py:531
333-
#: warehouse/manage/views/oidc_publishers.py:643
330+
#: warehouse/manage/views/oidc_publishers.py:303
331+
#: warehouse/manage/views/oidc_publishers.py:418
332+
#: warehouse/manage/views/oidc_publishers.py:534
333+
#: warehouse/manage/views/oidc_publishers.py:646
334334
msgid ""
335335
"There have been too many attempted trusted publisher registrations. Try "
336336
"again later."
337337
msgstr ""
338338

339339
#: warehouse/accounts/views.py:1748
340-
#: warehouse/manage/views/oidc_publishers.py:315
341-
#: warehouse/manage/views/oidc_publishers.py:430
342-
#: warehouse/manage/views/oidc_publishers.py:544
343-
#: warehouse/manage/views/oidc_publishers.py:656
340+
#: warehouse/manage/views/oidc_publishers.py:316
341+
#: warehouse/manage/views/oidc_publishers.py:431
342+
#: warehouse/manage/views/oidc_publishers.py:547
343+
#: warehouse/manage/views/oidc_publishers.py:659
344344
msgid "The trusted publisher could not be registered"
345345
msgstr ""
346346

@@ -624,29 +624,29 @@ msgstr ""
624624
msgid "Invitation revoked from '${username}'."
625625
msgstr ""
626626

627-
#: warehouse/manage/views/oidc_publishers.py:169
627+
#: warehouse/manage/views/oidc_publishers.py:170
628628
msgid "The trusted publisher could not be constrained"
629629
msgstr ""
630630

631-
#: warehouse/manage/views/oidc_publishers.py:283
631+
#: warehouse/manage/views/oidc_publishers.py:284
632632
msgid ""
633633
"GitHub-based trusted publishing is temporarily disabled. See "
634634
"https://pypi.org/help#admin-intervention for details."
635635
msgstr ""
636636

637-
#: warehouse/manage/views/oidc_publishers.py:398
637+
#: warehouse/manage/views/oidc_publishers.py:399
638638
msgid ""
639639
"GitLab-based trusted publishing is temporarily disabled. See "
640640
"https://pypi.org/help#admin-intervention for details."
641641
msgstr ""
642642

643-
#: warehouse/manage/views/oidc_publishers.py:512
643+
#: warehouse/manage/views/oidc_publishers.py:515
644644
msgid ""
645645
"Google-based trusted publishing is temporarily disabled. See "
646646
"https://pypi.org/help#admin-intervention for details."
647647
msgstr ""
648648

649-
#: warehouse/manage/views/oidc_publishers.py:623
649+
#: warehouse/manage/views/oidc_publishers.py:626
650650
msgid ""
651651
"ActiveState-based trusted publishing is temporarily disabled. See "
652652
"https://pypi.org/help#admin-intervention for details."

warehouse/manage/views/oidc_publishers.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from warehouse.oidc.forms._core import ConstrainEnvironmentForm
2222
from warehouse.oidc.interfaces import TooManyOIDCRegistrations
2323
from warehouse.oidc.models import (
24+
GITLAB_OIDC_ISSUER_URL,
2425
ActiveStatePublisher,
2526
GitHubPublisher,
2627
GitLabPublisher,
@@ -451,6 +452,8 @@ def add_gitlab_oidc_publisher(self):
451452
project=form.project.data,
452453
workflow_filepath=form.workflow_filepath.data,
453454
environment=form.normalized_environment,
455+
# TODO: Support custom issuers here
456+
issuer_url=GITLAB_OIDC_ISSUER_URL,
454457
)
455458

456459
self.request.db.add(publisher)

0 commit comments

Comments
 (0)