Merge pull request #2 from meliuz/remove-namespace-routes

feat: Permite delete route

terrareg/errors.py

@@ -214,3 +214,8 @@ class DuplicateNamespaceDisplayNameError(TerraregError):
     """A namespace already exists with this display name"""
 
     pass
+
+class NamespaceNotEmptyError(TerraregError):
+    """Namespace cannot be deleted due to containing modules"""
+
+    pass

terrareg/models.py

@@ -19,7 +19,7 @@
 import terrareg.audit_action
 from terrareg.errors import (
     DuplicateNamespaceDisplayNameError, InvalidModuleNameError, InvalidModuleProviderNameError, InvalidNamespaceDisplayNameError, InvalidUserGroupNameError,
-    InvalidVersionError, NamespaceAlreadyExistsError, NoModuleVersionAvailableError,
+    InvalidVersionError, NamespaceAlreadyExistsError, NamespaceNotEmptyError, NoModuleVersionAvailableError,
     InvalidGitTagFormatError, InvalidNamespaceNameError, ReindexingExistingModuleVersionsIsProhibitedError, RepositoryUrlContainsInvalidPortError, RepositoryUrlContainsInvalidTemplateError,
     RepositoryUrlDoesNotContainValidSchemeError,
     RepositoryUrlContainsInvalidSchemeError,
@@ -983,6 +983,18 @@ def get_all_modules(self):
             for module in modules
         ]
 
+    def delete(self):
+        """Delete namespace"""
+        # Check for any modules in the namespace
+        if self.get_all_modules():
+            raise NamespaceNotEmptyError("Namespace cannot be deleted as it contains modules")
+
+        # Delete namespace
+        db = Database.get()
+        delete = sqlalchemy.delete(db.namespace).where(db.namespace.c.id==self.pk)
+        with db.get_connection() as conn:
+            conn.execute(delete)
+
     def create_data_directory(self):
         """Create data directory and data directories of parents."""
         # Check if data directory exists

terrareg/server/api/terrareg_namespace_details.py

@@ -14,6 +14,9 @@ class ApiTerraregNamespaceDetails(ErrorCatchingResource):
     method_decorators = {
         # Limit post methods to users with FULL namespace permissions
         "post": [terrareg.auth_wrapper.auth_wrapper('check_namespace_access',
+            terrareg.user_group_namespace_permission_type.UserGroupNamespacePermissionType.FULL,
+            request_kwarg_map={'namespace': 'namespace'})],
+        "delete": [terrareg.auth_wrapper.auth_wrapper('check_namespace_access',
             terrareg.user_group_namespace_permission_type.UserGroupNamespacePermissionType.FULL,
             request_kwarg_map={'namespace': 'namespace'})]
     }
@@ -47,3 +50,21 @@ def _post(self, namespace):
             "view_href": namespace.get_view_url(),
             "display_name": namespace.display_name
         }
+
+    def _delete(self, namespace):
+        """
+        Delete namespace
+        JSON body:
+         * csrf_token - CSRF token required for sessioned-based authentication
+        """
+        namespace = terrareg.models.Namespace.get(namespace)
+        if namespace is None:
+            return self._get_404_response()
+
+        csrf_token = request.json.get('csrf_token')
+
+        terrareg.csrf.check_csrf_token(csrf_token)
+
+        namespace.delete()
+
+        return {}, 200