Moved rest_template as services

Author: avara1986

pyms/rest_template/rest_template.py pyms/flask/services/requests.pypyms/rest_template/rest_template.py renamed to pyms/flask/services/requests.py

@@ -4,14 +4,20 @@
 import requests
 from flask import current_app
 
+from pyms.flask.services.driver import DriverService
+
 DATA = 'data'
 
 
-class Request(object):
+class Service(DriverService):
+    service = "requests"
+    default_values = {
+        "data": ""
+    }
 
-    def __init__(self):
+    def __init__(self, service, *args, **kwargs):
         """Initialization for trace headers propagation"""
-        self._tracer = current_app.tracer
+        super().__init__(service, *args, **kwargs)
 
     def insert_trace_headers(self, headers):
         """Inject trace headers if enabled.
@@ -20,6 +26,7 @@ def insert_trace_headers(self, headers):
 
         :rtype: dict
         """
+        self._tracer = current_app.tracer
         try:
             # FLASK https://github.com/opentracing-contrib/python-flask
             span = self._tracer.get_span()
@@ -69,7 +76,7 @@ def get(self, url, path_params=None, params=None, headers=None, **kwargs):
         :rtype: requests.Response
         """
 
-        full_url = Request._build_url(url, path_params)
+        full_url = self._build_url(url, path_params)
         headers = self._get_headers(headers)
         current_app.logger.info("Get with url {}, params {}, headers {}, kwargs {}".
                                 format(full_url, params, headers, kwargs))
@@ -94,7 +101,10 @@ def get_for_object(self, url, path_params=None, params=None, headers=None, **kwa
         response = self.get(url, path_params=path_params, params=params, headers=headers, **kwargs)
 
         try:
-            return response.json().get(DATA, {})
+            data = response.json()
+            if self.config.data:
+                data = data.get(self.config.data, {})
+            return data
         except ValueError:
             current_app.logger.warning("Response.content is not a valid json {}".format(response.content))
             return {}
@@ -113,7 +123,7 @@ def post(self, url, path_params=None, data=None, json=None, headers=None, **kwar
         :rtype: requests.Response
         """
 
-        full_url = Request._build_url(url, path_params)
+        full_url = self._build_url(url, path_params)
         headers = self._get_headers(headers)
         current_app.logger.info("Post with url {}, data {}, json {}, headers {}, kwargs {}".format(full_url, data, json,
                                                                                                    headers, kwargs))
@@ -158,7 +168,7 @@ def put(self, url, path_params=None, data=None, headers=None, **kwargs):
         :rtype: requests.Response
         """
 
-        full_url = Request._build_url(url, path_params)
+        full_url = self._build_url(url, path_params)
         headers = self._get_headers(headers)
         current_app.logger.info("Put with url {}, data {}, headers {}, kwargs {}".format(full_url, data, headers,
                                                                                          kwargs))
@@ -200,7 +210,7 @@ def delete(self, url, path_params=None, headers=None, **kwargs):
         :rtype: requests.Response
         """
 
-        full_url = Request._build_url(url, path_params)
+        full_url = self._build_url(url, path_params)
         headers = self._get_headers(headers)
         current_app.logger.info("Delete with url {}, headers {}, kwargs {}".format(full_url, headers, kwargs))
         response = requests.delete(full_url, headers=headers, **kwargs)

tests/config-tests.yml

@@ -1,4 +1,6 @@
 pyms:
+  requests:
+    data: data
   swagger:
     path: ""
     file: "swagger.yaml"

tests/tests_rest_template.py

@@ -8,7 +8,6 @@
 
 from pyms.constants import CONFIGMAP_FILE_ENVIRONMENT
 from pyms.flask.app import Microservice
-from pyms.rest_template.rest_template import Request
 
 
 class RequestTests(unittest.TestCase):
@@ -22,7 +21,7 @@ def setUp(self):
         ms = Microservice(service="my-ms", path=__file__)
         self.app = ms.create_app()
         with self.app.app_context():
-            self.request = Request()
+            self.request = ms.requests
 
     @requests_mock.Mocker()
     def test_get(self, mock_request):