Merge branch 'dev' into feature/middleware-api-controller

Signed-off-by: Keshav Dayal <115068840+keshxvdayal@users.noreply.github.com>

Author: keshxvdayal

.gitignore

@@ -227,9 +227,3 @@ tests/output/*
 *.modified.yaml
 .netrc
 .idea/*
-
-# Security: Exclude all private key files
-*.pem
-*.key
-*.p12
-*.pfx

pro_tes/config.yaml

@@ -47,17 +47,6 @@ db:
           indexes:
             - keys:
                 id: 1
-        middlewares:
-          indexes:
-            - keys:
-                name: 1
-              options:
-                "unique": True
-                "sparse": True
-            - keys:
-                source.entry_point: 1
-              options:
-                "unique": True
 
 # API configuration
 # Cf. https://foca.readthedocs.io/en/latest/modules/foca.models.html#foca.models.config.APIConfig
@@ -82,16 +71,6 @@ api:
         options:
           swagger_ui: True
           serve_spec: True
-    - path:
-        - api/middleware_management.yaml
-      add_operation_fields:
-        x-openapi-router-controller: pro_tes.api.middlewares.controllers
-      connexion:
-        strict_validation: True
-        validate_responses: True
-        options:
-          swagger_ui: True
-          serve_spec: True
 
 # Logging configuration
 # Cf. https://foca.readthedocs.io/en/latest/modules/foca.models.html#foca.models.config.LogConfig

pro_tes/exceptions.py

@@ -49,97 +49,73 @@ class TesUriError(ValueError):
     """Raised when TES URI cannot be parsed."""
 
 
-class MiddlewareNotFound(NotFound):
-    """Raised when middleware with given ID was not found."""
-
-
-class MiddlewareDuplicateName(BadRequest):
-    """Raised when middleware name already exists."""
-
-
-class MiddlewareDuplicateEntryPoint(BadRequest):
-    """Raised when middleware entry_point already exists."""
-
-
 exceptions = {
     Exception: {
         "message": "An unexpected error occurred.",
-        "code": 500,
+        "code": "500",
     },
     BadRequest: {
         "message": "The request is malformed.",
-        "code": 400,
+        "code": "400",
     },
     BadRequestProblem: {
         "message": "The request is malformed.",
-        "code": 400,
+        "code": "400",
     },
     ExtraParameterProblem: {
         "message": "The request is malformed.",
-        "code": 400,
+        "code": "400",
     },
     ValidationError: {
         "message": "The request is malformed.",
-        "code": 400,
+        "code": "400",
     },
     TesUriError: {
         "message": "TES URI cannot be parsed",
-        "code": 400,
+        "code": "400",
         },
     InputUriError: {
         "message": "Input URI cannot be parsed.",
-        "code": 400,
+        "code": "400",
     },
     Unauthorized: {
         "message": " The request is unauthorized.",
-        "code": 401,
+        "code": "401",
     },
     Forbidden: {
         "message": "The requester is not authorized to perform this action.",
-        "code": 403,
+        "code": "403",
     },
     NotFound: {
         "message": "The requested resource wasn't found.",
-        "code": 404,
+        "code": "404",
     },
     TaskNotFound: {
         "message": "The requested task wasn't found.",
-        "code": 404,
+        "code": "404",
     },
     InternalServerError: {
         "message": "An unexpected error occurred.",
-        "code": 500,
+        "code": "500",
     },
     IdsUnavailableProblem: {
         "message": "No/few unique task identifiers available.",
-        "code": 500,
+        "code": "500",
     },
     NoTesInstancesAvailable: {
         "message": "No valid TES instances available.",
-        "code": 500,
+        "code": "500",
     },
     MiddlewareException: {
         "message": "Middleware could not be applied.",
-        "code": 500,
+        "code": "500",
     },
     InvalidMiddleware: {
         "message": "Middleware is invalid.",
-        "code": 500,
+        "code": "500",
     },
     IPDistanceCalculationError: {
         "message": "IP distance calculation failed.",
-        "code": 500,
-    },
-    MiddlewareNotFound: {
-        "message": "Middleware with given ID was not found.",
-        "code": 404,
-    },
-    MiddlewareDuplicateName: {
-        "message": "Middleware name already exists.",
-        "code": 400,
-    },
-    MiddlewareDuplicateEntryPoint: {
-        "message": "Middleware entry_point already exists.",
-        "code": 400,
+        "code": "500",
     },
 }