Add Atlas dependency and fix Atlas initialisation (#30)

search/search_service/proxy/atlas.py

@@ -32,8 +32,9 @@ def __init__(self, *,
                  index: str = None,
                  user: str = '',
                  password: str = '',
+                 client: Atlas = None,
                  page_size: int = 10) -> None:
-        self.atlas = Atlas(host, username=user, password=password)
+        self.atlas = client or Atlas(host, username=user, password=password)
         self.index = index
         self.page_size = page_size
 

search/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 
 
 setup(
@@ -16,7 +16,8 @@
         'Flask-RESTFul==0.3.6',
         'elasticsearch==6.2.0',
         'elasticsearch-dsl==6.1.0',
-        'statsd==3.2.1'
+        'statsd==3.2.1',
+        'atlasclient==0.1.6'
     ],
     python_requires=">=3.6"
 )

search/tests/unit/proxy/test_atlas.py

@@ -1,12 +1,13 @@
 import string
 import unittest
 
-from mock import MagicMock
+from mock import MagicMock, patch
 from typing import List, Callable, Tuple
 
-from search_service import create_app
+from search_service import create_app, config
 from search_service.models.search_result import SearchResult
 from search_service.models.table import Table
+from search_service.proxy import get_proxy_client
 
 
 class TestAtlasProxy(unittest.TestCase):
@@ -174,6 +175,33 @@ def guid_filter(guid: List):
 
         return guid_filter
 
+    def test_setup_client(self) -> None:
+        with self.app_context:
+            from search_service.proxy.atlas import AtlasProxy
+            client = AtlasProxy(
+                host="http://localhost:21000",
+                user="admin",
+                password="admin",
+                page_size=1337
+            )
+            self.assertEqual(client.atlas.base_url, "http://localhost:21000")
+            self.assertEqual(client.atlas.client.request_params['headers']['Authorization'], 'Basic YWRtaW46YWRtaW4=')
+            self.assertEqual(client.page_size, 1337)
+
+    @patch('search_service.proxy._proxy_client', None)
+    def test_setup_config(self) -> None:
+        # Gather all the configuration to create a Proxy Client
+        self.app.config[config.PROXY_ENDPOINT] = "http://localhost:21000"
+        self.app.config[config.PROXY_USER] = "admin"
+        self.app.config[config.PROXY_PASSWORD] = "admin"
+        self.app.config[config.PROXY_CLIENT] = config.PROXY_CLIENTS['ATLAS']
+        self.app.config[config.SEARCH_PAGE_SIZE_KEY] = 1337
+
+        client = get_proxy_client()
+        self.assertEqual(client.atlas.base_url, "http://localhost:21000")
+        self.assertEqual(client.atlas.client.request_params['headers']['Authorization'], 'Basic YWRtaW46YWRtaW4=')
+        self.assertEqual(client.page_size, 1337)
+
     def test_search_normal(self):
         expected = SearchResult(total_results=1,
                                 results=[Table(name=self._qualified('table', 'Table1'),

search/tests/unit/proxy/test_elasticsearch.py

@@ -85,6 +85,7 @@ def test_setup_client(self) -> None:
             self.assertEqual(client.transport.hosts[0]['port'], 9200)
         self.assertEqual(self.es_proxy.index, "random123")
 
+    @patch('search_service.proxy._proxy_client', None)
     def test_setup_config(self) -> None:
         es: ElasticsearchProxy = get_proxy_client()
         a = es.elasticsearch