Take project name into account when checking for duplicate pending publishers (#18396)

* Take project name into account when checking for duplicate pending publishers

* Fix a bad test

* Update translations

Author: di

tests/unit/accounts/test_views.py

@@ -4447,7 +4447,7 @@ def test_add_pending_oidc_publisher_invalid_form(
                         "organization": "some-org",
                         "project": "some-project",
                         "actor": "some-user",
-                        "project_name": "some-other-project-name",
+                        "project_name": "some-project-name",
                     }
                 ),
             ),

warehouse/accounts/views.py

@@ -1814,6 +1814,7 @@ def add_pending_google_oidc_publisher(self):
                 sub=form.sub.data,
             ),
             make_existence_filters=lambda form: dict(
+                project_name=form.project_name.data,
                 email=form.email.data,
                 sub=form.sub.data,
             ),
@@ -1840,6 +1841,7 @@ def add_pending_github_oidc_publisher(self):
                 environment=form.normalized_environment,
             ),
             make_existence_filters=lambda form: dict(
+                project_name=form.project_name.data,
                 repository_name=form.repository.data,
                 repository_owner=form.normalized_owner,
                 workflow_filename=form.workflow_filename.data,
@@ -1867,6 +1869,7 @@ def add_pending_activestate_oidc_publisher(self):
                 actor_id=form.actor_id,
             ),
             make_existence_filters=lambda form: dict(
+                project_name=form.project_name.data,
                 organization=form.organization.data,
                 activestate_project_name=form.project.data,
                 actor_id=form.actor_id,
@@ -1893,6 +1896,7 @@ def add_pending_gitlab_oidc_publisher(self):
                 environment=form.normalized_environment,
             ),
             make_existence_filters=lambda form: dict(
+                project_name=form.project_name.data,
                 namespace=form.namespace.data,
                 project=form.project.data,
                 workflow_filepath=form.workflow_filepath.data,

warehouse/locale/messages.pot

@@ -301,7 +301,7 @@ msgstr ""
 msgid "Please review our updated <a href=\"${tos_url}\">Terms of Service</a>."
 msgstr ""
 
-#: warehouse/accounts/views.py:1669 warehouse/accounts/views.py:1911
+#: warehouse/accounts/views.py:1669 warehouse/accounts/views.py:1915
 #: warehouse/manage/views/__init__.py:1409
 msgid ""
 "Trusted publishing is temporarily disabled. See https://pypi.org/help"
@@ -348,12 +348,12 @@ msgstr ""
 msgid "Registered a new pending publisher to create "
 msgstr ""
 
-#: warehouse/accounts/views.py:1924 warehouse/accounts/views.py:1937
-#: warehouse/accounts/views.py:1944
+#: warehouse/accounts/views.py:1928 warehouse/accounts/views.py:1941
+#: warehouse/accounts/views.py:1948
 msgid "Invalid publisher ID"
 msgstr ""
 
-#: warehouse/accounts/views.py:1951
+#: warehouse/accounts/views.py:1955
 msgid "Removed trusted publisher for project "
 msgstr ""