refactor cicd api to correct layout

Author: dogboat

dojo/api_v2/serializers.py

@@ -49,7 +49,6 @@
     App_Analysis,
     BurpRawRequestResponse,
     Check_List,
-    CICDInfrastructure,
     Development_Environment,
     Dojo_User,
     DojoMeta,
@@ -812,12 +811,6 @@ class Meta:
         fields = "__all__"
 
 
-class CICDInfrastructureSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = CICDInfrastructure
-        fields = "__all__"
-
-
 class ToolTypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tool_Type

dojo/api_v2/views.py

@@ -86,7 +86,6 @@
     App_Analysis,
     BurpRawRequestResponse,
     Check_List,
-    CICDInfrastructure,
     Development_Environment,
     Dojo_User,
     DojoMeta,
@@ -2210,19 +2209,6 @@ def get_queryset(self):
 
 
 # Authorization: configuration
-class CICDInfrastructureViewSet(
-    DojoModelViewSet,
-):
-    serializer_class = serializers.CICDInfrastructureSerializer
-    queryset = CICDInfrastructure.objects.none()
-    filter_backends = (DjangoFilterBackend,)
-    filterset_fields = ["id", "name", "infrastructure_type"]
-    permission_classes = (permissions.UserHasConfigurationPermissionSuperuser,)
-
-    def get_queryset(self):
-        return CICDInfrastructure.objects.all().order_by("id")
-
-
 class ToolTypesViewSet(
     DojoModelViewSet,
 ):

dojo/cicd_infrastructure/api/__init__.py

@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from dojo.models import CICDInfrastructure
+
+
+class CICDInfrastructureSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = CICDInfrastructure
+        fields = "__all__"

dojo/cicd_infrastructure/api/serializers.py

@@ -0,0 +1,6 @@
+from dojo.cicd_infrastructure.api.views import CICDInfrastructureViewSet
+
+
+def add_cicd_infrastructure_urls(router):
+    router.register(r"cicd_infrastructure", CICDInfrastructureViewSet, basename="cicd_infrastructure")
+    return router

dojo/cicd_infrastructure/api/urls.py

@@ -0,0 +1,20 @@
+from django_filters.rest_framework import DjangoFilterBackend
+
+from dojo.api_v2.views import DojoModelViewSet
+from dojo.authorization import api_permissions as permissions
+from dojo.cicd_infrastructure.api.serializers import CICDInfrastructureSerializer
+from dojo.models import CICDInfrastructure
+
+
+# Authorization: configuration
+class CICDInfrastructureViewSet(
+    DojoModelViewSet,
+):
+    serializer_class = CICDInfrastructureSerializer
+    queryset = CICDInfrastructure.objects.none()
+    filter_backends = (DjangoFilterBackend,)
+    filterset_fields = ["id", "name", "infrastructure_type"]
+    permission_classes = (permissions.UserHasConfigurationPermissionSuperuser,)
+
+    def get_queryset(self):
+        return CICDInfrastructure.objects.all().order_by("id")

dojo/cicd_infrastructure/api/views.py

@@ -16,7 +16,6 @@
     AppAnalysisViewSet,
     BurpRawRequestResponseViewSet,
     CeleryViewSet,
-    CICDInfrastructureViewSet,
     ConfigurationPermissionViewSet,
     DevelopmentEnvironmentViewSet,
     DojoMetaViewSet,
@@ -62,6 +61,7 @@
 from dojo.asset.urls import urlpatterns as asset_urls
 from dojo.banner.urls import urlpatterns as banner_urls
 from dojo.benchmark.urls import urlpatterns as benchmark_urls
+from dojo.cicd_infrastructure.api.urls import add_cicd_infrastructure_urls
 from dojo.cicd_infrastructure.urls import urlpatterns as cicd_infrastructure_urls
 from dojo.components.urls import urlpatterns as component_urls
 from dojo.development_environment.urls import urlpatterns as dev_env_urls
@@ -154,7 +154,6 @@
 v2_api.register(r"tests", TestsViewSet, basename="test")
 v2_api.register(r"test_types", TestTypesViewSet, basename="test_type")
 v2_api.register(r"test_imports", TestImportViewSet, basename="test_imports")
-v2_api.register(r"cicd_infrastructure", CICDInfrastructureViewSet, basename="cicd_infrastructure")
 v2_api.register(r"tool_configurations", ToolConfigurationsViewSet, basename="tool_configuration")
 v2_api.register(r"tool_product_settings", ToolProductSettingsViewSet, basename="tool_product_settings")
 v2_api.register(r"tool_types", ToolTypesViewSet, basename="tool_type")
@@ -173,6 +172,7 @@
 v2_api.register(r"celery", CeleryViewSet, basename="celery")
 # V3
 add_asset_urls(v2_api)
+add_cicd_infrastructure_urls(v2_api)
 add_organization_urls(v2_api)
 
 ur = []