Implement PEP 752

Author: dstufft

tests/common/db/organizations.py

@@ -14,8 +14,10 @@
 
 import factory
 import faker
+import packaging.utils
 
 from warehouse.organizations.models import (
+    Namespace,
     Organization,
     OrganizationApplication,
     OrganizationInvitation,
@@ -186,3 +188,18 @@ class Meta:
     role_name = TeamProjectRoleType.Owner
     project = factory.SubFactory(ProjectFactory)
     team = factory.SubFactory(TeamFactory)
+
+
+class NamespaceFactory(WarehouseFactory):
+    class Meta:
+        model = Namespace
+
+    is_approved = True
+    created = factory.Faker(
+        "date_time_between_dates", datetime_start=datetime.datetime(2008, 1, 1)
+    )
+    name = factory.Faker("pystr", max_chars=12)
+    normalized_name = factory.LazyAttribute(
+        lambda o: packaging.utils.canonicalize_name(o.name)
+    )
+    owner = factory.SubFactory(OrganizationFactory)

tests/conftest.py

@@ -59,7 +59,7 @@
 from warehouse.oidc.interfaces import IOIDCPublisherService
 from warehouse.oidc.utils import ACTIVESTATE_OIDC_ISSUER_URL, GITHUB_OIDC_ISSUER_URL
 from warehouse.organizations import services as organization_services
-from warehouse.organizations.interfaces import IOrganizationService
+from warehouse.organizations.interfaces import INamespaceService, IOrganizationService
 from warehouse.packaging import services as packaging_services
 from warehouse.packaging.interfaces import IProjectService
 from warehouse.subscriptions import services as subscription_services
@@ -153,6 +153,7 @@ def pyramid_services(
     email_service,
     metrics,
     organization_service,
+    namespace_service,
     subscription_service,
     token_service,
     user_service,
@@ -171,6 +172,7 @@ def pyramid_services(
     services.register_service(email_service, IEmailSender, None, name="")
     services.register_service(metrics, IMetricsService, None, name="")
     services.register_service(organization_service, IOrganizationService, None, name="")
+    services.register_service(namespace_service, INamespaceService, None, name="")
     services.register_service(subscription_service, ISubscriptionService, None, name="")
     services.register_service(token_service, ITokenService, None, name="password")
     services.register_service(token_service, ITokenService, None, name="email")
@@ -484,6 +486,11 @@ def organization_service(db_session):
     return organization_services.DatabaseOrganizationService(db_session)
 
 
+@pytest.fixture
+def namespace_service(db_session):
+    return organization_services.DatabaseNamespaceService(db_session)
+
+
 @pytest.fixture
 def billing_service(app_config):
     stripe.api_base = app_config.registry.settings["billing.api_base"]

tests/unit/api/test_simple.py

@@ -22,6 +22,11 @@
 from warehouse.packaging.utils import API_VERSION, _valid_simple_detail_context
 
 from ...common.db.accounts import UserFactory
+from ...common.db.organizations import (
+    NamespaceFactory,
+    OrganizationFactory,
+    OrganizationProjectFactory,
+)
 from ...common.db.packaging import (
     AlternateRepositoryFactory,
     FileFactory,
@@ -221,6 +226,7 @@ def test_no_files_no_serial(self, db_request, content_type, renderer_override):
             "files": [],
             "versions": [],
             "alternate-locations": [],
+            "namespace": None,
         }
         context = _update_context(context, content_type, renderer_override)
         assert simple.simple_detail(project, db_request) == context
@@ -253,6 +259,92 @@ def test_no_files_with_serial(self, db_request, content_type, renderer_override)
             "files": [],
             "versions": [],
             "alternate-locations": sorted(al.url for al in als),
+            "namespace": None,
+        }
+        context = _update_context(context, content_type, renderer_override)
+        assert simple.simple_detail(project, db_request) == context
+
+        assert db_request.response.headers["X-PyPI-Last-Serial"] == str(je.id)
+        assert db_request.response.content_type == content_type
+        _assert_has_cors_headers(db_request.response.headers)
+
+        if renderer_override is not None:
+            assert db_request.override_renderer == renderer_override
+
+    @pytest.mark.parametrize(
+        ("content_type", "renderer_override"),
+        CONTENT_TYPE_PARAMS,
+    )
+    def test_with_namespaces_authorized(
+        self, db_request, content_type, renderer_override
+    ):
+        db_request.accept = content_type
+        org = OrganizationFactory.create()
+        namespace = NamespaceFactory.create(owner=org)
+        project = ProjectFactory.create(name=f"{namespace.name}-foo")
+        OrganizationProjectFactory.create(organization=org, project=project)
+        db_request.matchdict["name"] = project.normalized_name
+        user = UserFactory.create()
+        je = JournalEntryFactory.create(name=project.name, submitted_by=user)
+        als = [
+            AlternateRepositoryFactory.create(project=project),
+            AlternateRepositoryFactory.create(project=project),
+        ]
+
+        context = {
+            "meta": {"_last-serial": je.id, "api-version": API_VERSION},
+            "name": project.normalized_name,
+            "files": [],
+            "versions": [],
+            "alternate-locations": sorted(al.url for al in als),
+            "namespace": {
+                "prefix": namespace.normalized_name,
+                "open": namespace.is_open,
+                "authorized": True,
+            },
+        }
+        context = _update_context(context, content_type, renderer_override)
+        assert simple.simple_detail(project, db_request) == context
+
+        assert db_request.response.headers["X-PyPI-Last-Serial"] == str(je.id)
+        assert db_request.response.content_type == content_type
+        _assert_has_cors_headers(db_request.response.headers)
+
+        if renderer_override is not None:
+            assert db_request.override_renderer == renderer_override
+
+    @pytest.mark.parametrize(
+        ("content_type", "renderer_override"),
+        CONTENT_TYPE_PARAMS,
+    )
+    def test_with_namespaces_not_authorized(
+        self, db_request, content_type, renderer_override
+    ):
+        db_request.accept = content_type
+        org = OrganizationFactory.create()
+        namespace = NamespaceFactory.create(owner=org)
+        project = ProjectFactory.create(name=f"{namespace.name}-foo")
+        project2 = ProjectFactory.create(name=f"{namespace.name}-foo2")
+        OrganizationProjectFactory.create(organization=org, project=project2)
+        db_request.matchdict["name"] = project.normalized_name
+        user = UserFactory.create()
+        je = JournalEntryFactory.create(name=project.name, submitted_by=user)
+        als = [
+            AlternateRepositoryFactory.create(project=project),
+            AlternateRepositoryFactory.create(project=project),
+        ]
+
+        context = {
+            "meta": {"_last-serial": je.id, "api-version": API_VERSION},
+            "name": project.normalized_name,
+            "files": [],
+            "versions": [],
+            "alternate-locations": sorted(al.url for al in als),
+            "namespace": {
+                "prefix": namespace.normalized_name,
+                "open": namespace.is_open,
+                "authorized": False,
+            },
         }
         context = _update_context(context, content_type, renderer_override)
         assert simple.simple_detail(project, db_request) == context
@@ -305,6 +397,7 @@ def test_with_files_no_serial(self, db_request, content_type, renderer_override)
                 for f in files
             ],
             "alternate-locations": [],
+            "namespace": None,
         }
         context = _update_context(context, content_type, renderer_override)
         assert simple.simple_detail(project, db_request) == context
@@ -357,6 +450,7 @@ def test_with_files_with_serial(self, db_request, content_type, renderer_overrid
                 for f in files
             ],
             "alternate-locations": [],
+            "namespace": None,
         }
         context = _update_context(context, content_type, renderer_override)
         assert simple.simple_detail(project, db_request) == context
@@ -454,6 +548,7 @@ def test_with_files_with_version_multi_digit(
                 for f in files
             ],
             "alternate-locations": [],
+            "namespace": None,
         }
         context = _update_context(context, content_type, renderer_override)
         assert simple.simple_detail(project, db_request) == context
@@ -486,6 +581,7 @@ def test_with_files_quarantined_omitted_from_index(
             "files": [],
             "versions": [],
             "alternate-locations": [],
+            "namespace": None,
         }
         context = _update_context(context, content_type, renderer_override)
 
@@ -606,6 +702,7 @@ def route_url(route, **kw):
                 for f in files
             ],
             "alternate-locations": [],
+            "namespace": None,
         }
         context = _update_context(context, content_type, renderer_override)
 

tests/unit/manage/test_forms.py

@@ -1108,3 +1108,34 @@ def test_validate(self, pyramid_request, name, errors):
         # NOTE(jleightcap): testing with Regexp validators returns raw LazyString
         # objects in the error dict's values. Just assert on keys.
         assert list(form.errors.keys()) == errors
+
+
+class TestRequestOrganizationNamespaceForm:
+
+    @pytest.mark.parametrize(
+        ("name", "errors", "existing"),
+        [
+            ("", ["name"], False),
+            (" namespace ", ["name"], False),
+            (".namespace", ["name"], False),
+            ("namespace-", ["name"], False),
+            ("namespace", ["name"], True),
+            ("namespace", [], False),
+        ],
+    )
+    def test_validate(self, pyramid_request, name, errors, existing):
+        pyramid_request.POST = MultiDict({"name": name})
+        namespace_service = pretend.stub(
+            get_namespace=lambda name: pretend.stub() if existing else None,
+        )
+
+        form = forms.RequestOrganizationNamespaceForm(
+            pyramid_request.POST,
+            namespace_service=namespace_service,
+        )
+
+        assert form.namespace_service is namespace_service
+        assert not form.validate() if errors else form.validate(), str(form.errors)
+        # NOTE(jleightcap): testing with Regexp validators returns raw LazyString
+        # objects in the error dict's values. Just assert on keys.
+        assert list(form.errors.keys()) == errors

tests/unit/manage/views/test_organizations.py

@@ -22,6 +22,7 @@
 
 from tests.common.db.accounts import EmailFactory, UserFactory
 from tests.common.db.organizations import (
+    NamespaceFactory,
     OrganizationEventFactory,
     OrganizationFactory,
     OrganizationInvitationFactory,
@@ -3017,3 +3018,93 @@ def test_raises_404_with_out_of_range_page(self, db_request):
 
         with pytest.raises(HTTPNotFound):
             assert org_views.manage_organization_history(organization, db_request)
+
+
+class TestManageOrganizationNamespaces:
+    @pytest.mark.usefixtures("_enable_organizations")
+    def test_manage_organization_namespaces(
+        self,
+        db_request,
+        pyramid_user,
+        organization_service,
+        monkeypatch,
+    ):
+        organization = OrganizationFactory.create()
+        organization.namespaces = [NamespaceFactory.create()]
+
+        db_request.POST = MultiDict()
+
+        view = org_views.ManageOrganizationNamespacesViews(organization, db_request)
+        result = view.manage_organization_namespaces()
+        form = result["request_organization_namespace_form"]
+
+        assert view.request == db_request
+        assert view.organization_service == organization_service
+        assert result == {
+            "organization": organization,
+            "request_organization_namespace_form": form,
+        }
+
+    @pytest.mark.usefixtures("_enable_organizations")
+    def test_request_namespace(
+        self,
+        db_request,
+        pyramid_user,
+        namespace_service,
+        monkeypatch,
+    ):
+        organization = OrganizationFactory.create()
+        organization.namespaces = [NamespaceFactory.create()]
+
+        db_request.POST = MultiDict({"name": "my-ns"})
+
+        OrganizationRoleFactory.create(
+            organization=organization, user=db_request.user, role_name="Owner"
+        )
+
+        def request_namespace(name, *args, **kwargs):
+            ns = NamespaceFactory.create(name=name)
+            organization.namespaces.append(ns)
+            return ns
+
+        monkeypatch.setattr(namespace_service, "request_namespace", request_namespace)
+
+        view = org_views.ManageOrganizationNamespacesViews(organization, db_request)
+        result = view.request_organization_namespace()
+
+        assert isinstance(result, HTTPSeeOther)
+        assert result.headers["Location"] == db_request.path
+        assert len(organization.namespaces) == 2
+        assert organization.namespaces[-1].name == "my-ns"
+
+    @pytest.mark.usefixtures("_enable_organizations")
+    def test_request_namespace_invalid(
+        self,
+        db_request,
+        pyramid_user,
+        namespace_service,
+        monkeypatch,
+    ):
+        organization = OrganizationFactory.create()
+        organization.namespaces = [NamespaceFactory.create()]
+
+        OrganizationRoleFactory.create(
+            organization=organization, user=db_request.user, role_name="Owner"
+        )
+
+        db_request.POST = MultiDict({"name": organization.namespaces[0].name})
+
+        view = org_views.ManageOrganizationNamespacesViews(organization, db_request)
+        result = view.request_organization_namespace()
+        form = result["request_organization_namespace_form"]
+
+        assert view.request == db_request
+        assert view.namespace_service == namespace_service
+        assert result == {
+            "organization": organization,
+            "request_organization_namespace_form": form,
+        }
+        assert form.name.errors == [
+            "This namespace has already been requested. Choose a different namespace."
+        ]
+        assert len(organization.namespaces) == 1

tests/unit/organizations/test_init.py

@@ -15,8 +15,11 @@
 from celery.schedules import crontab
 
 from warehouse import organizations
-from warehouse.organizations.interfaces import IOrganizationService
-from warehouse.organizations.services import database_organization_factory
+from warehouse.organizations.interfaces import INamespaceService, IOrganizationService
+from warehouse.organizations.services import (
+    database_namespace_factory,
+    database_organization_factory,
+)
 from warehouse.organizations.tasks import (
     delete_declined_organizations,
     update_organization_invitation_status,
@@ -36,6 +39,7 @@ def test_includeme():
 
     assert config.register_service_factory.calls == [
         pretend.call(database_organization_factory, IOrganizationService),
+        pretend.call(database_namespace_factory, INamespaceService),
     ]
 
     assert config.add_periodic_task.calls == [