Revert "Auto stash before merge of "feature/business-logic-interface" and...

Revert "Auto stash before merge of "feature/business-logic-interface" and "origin/feature/business-logic-interface""

This reverts commit 8f59badf.

src/data-hub/role-stage-discovery-microservice/app/configs/swagger.yml

@@ -6,7 +6,7 @@ info:
 
 # Import security definitions from global security definition
 securityDefinitions:
-  $ref: '../../../../modules/security/security.yml#securityDefinitions'
+  $ref: '../security/security.yml#securityDefinitions'
 
 consumes:
   - "application/json"
@@ -37,6 +37,8 @@ paths:
   /layers:
     post:
         operationId: "routes.layers.post"
+        security:
+          - JwtRegular: []
         tags:
           - "Layers"
         summary: "Add a new layer [TODO: or overwrite an existing one]"
@@ -54,6 +56,8 @@ paths:
                 description: "Invalid input"
     get:
         operationId: "routes.layers.get"
+        security:
+          - JwtRegular: []
         tags:
             - "Layers"
         summary: "Get all layer data"
@@ -67,6 +71,8 @@ paths:
   /layers/{name}:
     get:
         operationId: "routes.layers.get_by_name"
+        security:
+          - JwtRegular: []
         tags:
             - "Layers"
         summary: "Get single layer data"
@@ -87,6 +93,8 @@ paths:
   /layers/{name}/nodes:
     get:
         operationId: "routes.layers.get_nodes"
+        security:
+          - JwtRegular: []
         tags:
             - "Layers"
         summary: "Get all individual nodes for the layer"
@@ -105,6 +113,8 @@ paths:
                 description: "Layer not found"
     post:
         operationId: "routes.layers.post_nodes"
+        security:
+          - JwtRegular: []
         tags:
             - "Layers"
         summary: "Adds a single or multiple nodes to the layer"
@@ -129,6 +139,8 @@ paths:
   /layers/{name}/clusters:
     get:
         operationId: "routes.clustersets.get_by_name"
+        security:
+          - JwtRegular: []
         tags:
             - "Layers"
         summary: "Get all clusters for the layer"
@@ -149,6 +161,8 @@ paths:
   /layers/{name}/timeslices:
     get:
         operationId: "routes.timeslices.get_by_name"
+        security:
+          - JwtRegular: []
         tags:
             - "Layers"
         summary: "Get all timeslices for the layer"
@@ -172,6 +186,8 @@ paths:
   /rfc/run:
     post:
         operationId: "routes.functions.run_agi_clustering_and_graph_creation"
+        security:
+          - JwtRegular: []
         tags:
             - "Remote function calls"
         summary: "Insert locations from AGI, create clusters for starting time and location layers, create graphs for the location clusters"
@@ -186,6 +202,8 @@ paths:
   /connectedClusters:
     get:
       operationId: "routes.connClusters.get_conn_clusters"
+      security:
+        - JwtRegular: []
       tags:
           - "Connected"
       summary: "Get connected Clusters data"
@@ -199,6 +217,8 @@ paths:
   /clusterSimilarity:
     get:
       operationId: "routes.similarity.get_similarity"
+      security:
+        - JwtRegular: []
       tags:
           - "Similarity"
       summary: "Get data of the similarity between clusters."
@@ -224,6 +244,8 @@ paths:
   /clusterRunArray:
     get:
       operationId: "routes.connRun.get_connected_run"
+      security:
+        - JwtRegular: []
       tags:
           - "RunId"
       summary: "Get RunId"

src/data-hub/role-stage-discovery-microservice/app/main.py

@@ -35,4 +35,4 @@ context = (os.path.normpath(f'{certificate_path}/articonf1.crt'), os.path.normpa
 
 # start app
 if __name__ == '__main__':    
-    app.run(host='0.0.0.0', port=5000) 
+    app.run(host='0.0.0.0', port=5000, ssl_context=context)