Merge pull request #28 from Clariteia/0.0.2

0.0.2

Author: andrea-mucci

HISTORY.md

@@ -3,3 +3,7 @@
 ## 0.0.1 (2021-06-14)
 
 * First release on PyPI.
+
+## 0.0.2 (2021-06-18)
+
+* Bugfix.

minos/api_gateway/rest/__init__.py

@@ -5,7 +5,7 @@
 
 Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
 """
-__version__ = "0.0.1"
+__version__ = "0.0.2"
 
 from .coordinator import (
     MicroserviceCallCoordinator,

minos/api_gateway/rest/coordinator.py

@@ -56,7 +56,7 @@ async def call_microservice(self, data: dict):
 
         req_data = await self.original_req.text()
 
-        url = "http://{host}:{port}/{path}".format(host=data["ip"], port=data["port"], path=data["name"])
+        url = "http://{host}:{port}{path}".format(host=data["ip"], port=data["port"], path=self.original_req.url.path)
 
         try:
             async with aiohttp.ClientSession(headers=self.original_req.headers) as session:

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "minos_apigateway"
-version = "0.0.1"
+version = "0.0.2"
 description = "Python Package containing the main API Gateway implementation used in Minos Microservices."
 readme = "README.md"
 repository = "https://github.com/clariteia/api_gateway"
@@ -47,6 +47,7 @@ sphinx-autodoc-typehints = "^1.12.0"
 sphinxcontrib-apidoc = "^0.3.0"
 sphinx-rtd-theme = "^0.5.2"
 m2r2 = "^0.2.7"
+Flask = "^2.0.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -5,51 +5,31 @@ rest:
         - name: GetOrder
           route: /order/{id}
           method: GET
-          controller: minos.api_gateway.rest.handlers.ApiGatewayHandler
+          controller: tests.handlers.ApiGatewayHandler
           action: get_order
         - name: AddOrder
           route: /order
           method: POST
-          controller: minos.api_gateway.rest.handlers.ApiGatewayHandler
+          controller: tests.handlers.ApiGatewayHandler
           action: post_order
         - name: PutOrder
           route: /order/{id}
           method: PUT
-          controller: minos.api_gateway.rest.handlers.ApiGatewayHandler
+          controller: tests.handlers.ApiGatewayHandler
           action: put_order
         - name: PatchOrder
           route: /order/{id}
           method: PATCH
-          controller: minos.api_gateway.rest.handlers.ApiGatewayHandler
+          controller: tests.handlers.ApiGatewayHandler
           action: patch_order
         - name: DeleteOrder
           route: /order/{id}
           method: DELETE
-          controller: minos.api_gateway.rest.handlers.ApiGatewayHandler
+          controller: tests.handlers.ApiGatewayHandler
           action: delete_order
-        - name: Discovery
-          route: /discover
-          method: GET
-          controller: tests.services.DiscoveryService.Discovery
-          action: discover
-        - name: OrderMicroservice
-          route: /order-microservice
-          method: GET
-          controller: tests.services.OrderMicroservice.Order
-          action: order
-        - name: OrderMicroservice
-          route: /order-microservice
-          method: POST
-          controller: tests.services.OrderMicroservice.Order
-          action: order
-        - name: TestGetOrder
-          route: /test-get-order/{id}
-          method: GET
-          controller: tests.services.TestService.TestService
-          action: test_get_order
 discovery:
     host: localhost
-    port: 55909
+    port: 5567
     path: discover
     endpoints:
         - name: Discover

tests/config.yml

@@ -12,26 +12,26 @@
 
 class ApiGatewayHandler(object):
     async def get_order(self, request: web.Request, config: MinosConfig, **kwargs):
-        coordinator = MicroserviceCallCoordinator(config, request, request.url.host, request.url.port)
+        coordinator = MicroserviceCallCoordinator(config, request)
         response = await coordinator.orchestrate()
         return response
 
     async def post_order(self, request: web.Request, config: MinosConfig, **kwargs):
-        coordinator = MicroserviceCallCoordinator(config, request, request.url.host, request.url.port)
+        coordinator = MicroserviceCallCoordinator(config, request)
         response = await coordinator.orchestrate()
         return response
 
     async def put_order(self, request: web.Request, config: MinosConfig, **kwargs):
-        coordinator = MicroserviceCallCoordinator(config, request, request.url.host, request.url.port)
+        coordinator = MicroserviceCallCoordinator(config, request)
         response = await coordinator.orchestrate()
         return response
 
     async def patch_order(self, request: web.Request, config: MinosConfig, **kwargs):
-        coordinator = MicroserviceCallCoordinator(config, request, request.url.host, request.url.port)
+        coordinator = MicroserviceCallCoordinator(config, request)
         response = await coordinator.orchestrate()
         return response
 
     async def delete_order(self, request: web.Request, config: MinosConfig, **kwargs):
-        coordinator = MicroserviceCallCoordinator(config, request, request.url.host, request.url.port)
+        coordinator = MicroserviceCallCoordinator(config, request)
         response = await coordinator.orchestrate()
         return response

minos/api_gateway/rest/handlers.py renamed to tests/handlers.py

@@ -0,0 +1,49 @@
+import uuid
+from threading import (
+    Thread,
+)
+
+import requests
+from flask import (
+    Flask,
+    jsonify,
+)
+
+
+class MockServer(Thread):
+    def __init__(self, host="http://localhost", port=5000):
+        super().__init__()
+        self.host = host
+        self.port = port
+        self.app = Flask(__name__)
+        self.url = "http://%s:%s" % (self.host, self.port)
+
+        self.app.add_url_rule("/shutdown", view_func=self._shutdown_server)
+
+    def _shutdown_server(self):
+        from flask import (
+            request,
+        )
+
+        if "werkzeug.server.shutdown" not in request.environ:
+            raise RuntimeError("Not running the development server")
+        request.environ["werkzeug.server.shutdown"]()
+        return "Server shutting down..."
+
+    def shutdown_server(self):
+        requests.get("http://%s:%s/shutdown" % (self.host, self.port))
+        self.join()
+
+    def add_callback_response(self, url, callback, methods=("GET",)):
+        # change name of method to mitigate flask exception
+        callback.__name__ = str(uuid.uuid4())
+        self.app.add_url_rule(url, view_func=callback, methods=methods)
+
+    def add_json_response(self, url, serializable, methods=("GET",)):
+        def callback():
+            return jsonify(serializable)
+
+        self.add_callback_response(url, callback, methods=methods)
+
+    def run(self):
+        self.app.run(port=self.port)