Change url and session to be property on AWSClient

Author: jamesfneyer

conf/test_settings.py

@@ -69,3 +69,9 @@
 
 
 SIMPLE_JWT['VERIFYING_KEY'] = SIMPLE_JWT['PRIVATE_KEY'].public_key()
+
+URL_SHORTENER_HOST = 'not-really-aws.com'
+URL_SHORTENER_URL = 'not-really-aws.com'
+
+IOT_AWS_HOST = 'not-really-aws.com'
+IOT_GATEWAY_STAGE = 'test'

src/shipchain_common/aws.py

@@ -30,6 +30,13 @@
 
 
 class AWSClient:
+    @property
+    def url(self):
+        raise NotImplementedError
+
+    @property
+    def session(self):
+        raise NotImplementedError
 
     METHOD_POST = 'post'
     METHOD_PUT = 'put'
@@ -121,6 +128,8 @@ def _get_generic_endpoint_for_metric(self, http_method, endpoint):
 
 
 class URLShortenerClient(AWSClient):
+    url = settings.URL_SHORTENER_URL
+    session = requests.session()
 
     def __init__(self):
         aws_auth = BotoAWSRequestsAuth(
@@ -129,8 +138,6 @@ def __init__(self):
             aws_service='execute-api'
         )
 
-        self.url = settings.URL_SHORTENER_URL
-        self.session = requests.session()
         self.session.headers = {'content-type': 'application/json'}
         self.session.auth = aws_auth
 

src/shipchain_common/iot.py

@@ -27,6 +27,8 @@
 
 
 class AWSIoTClient(AWSClient):
+    url = f'https://{settings.IOT_AWS_HOST}/{settings.IOT_GATEWAY_STAGE}'
+    session = requests.session()
 
     def __init__(self):
         aws_auth = BotoAWSRequestsAuth(
@@ -35,8 +37,6 @@ def __init__(self):
             aws_service='execute-api'
         )
 
-        self.url = f'https://{settings.IOT_AWS_HOST}/{settings.IOT_GATEWAY_STAGE}'
-        self.session = requests.session()
         self.session.headers = {'content-type': 'application/json'}
         self.session.auth = aws_auth
 

tests/test_aws.py

@@ -2,34 +2,18 @@
 from unittest import mock
 
 import requests
-from aws_requests_auth.boto_utils import BotoAWSRequestsAuth
-from django.conf import settings
 
 from src.shipchain_common.exceptions import AWSIoTError
 from src.shipchain_common.aws import URLShortenerClient
 from src.shipchain_common.test_utils import mocked_rpc_response
 
 
-@pytest.fixture(scope='module')
-def iot_settings():
-    settings.URL_SHORTENER_HOST = 'not-really-aws.com'
-    settings.URL_SHORTENER_URL = 'not-really-aws.com'
-
-
 @pytest.fixture()
-def aws_url_client(iot_settings):
+def aws_url_client():
     return URLShortenerClient()
 
 
-class FakeBotoAWSRequestsAuth(BotoAWSRequestsAuth):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def get_aws_request_headers_handler(self, r):
-        return {}
-
-
-def test_init(iot_settings, aws_url_client):
+def test_init(aws_url_client):
     assert aws_url_client.session.auth.aws_host == 'not-really-aws.com'
     assert aws_url_client.session.auth.aws_region == 'us-east-1'
     assert aws_url_client.session.auth.service == 'execute-api'

tests/test_iot.py

@@ -2,36 +2,19 @@
 from unittest import mock
 
 import requests
-from aws_requests_auth.boto_utils import BotoAWSRequestsAuth
-from django.conf import settings
 
 from src.shipchain_common.exceptions import AWSIoTError
 from src.shipchain_common.iot import AWSIoTClient
 from src.shipchain_common.test_utils import mocked_rpc_response
 
 
-@pytest.fixture(scope='module')
-def iot_settings():
-    settings.IOT_AWS_HOST = 'not-really-aws.com'
-    settings.IOT_GATEWAY_STAGE = 'test'
-
-
 @pytest.fixture()
-def aws_iot_client(iot_settings):
+def aws_iot_client():
     return AWSIoTClient()
 
 
-class FakeBotoAWSRequestsAuth(BotoAWSRequestsAuth):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def get_aws_request_headers_handler(self, r):
-        return {}
-
-
-def test_init(iot_settings, aws_iot_client):
+def test_init(aws_iot_client):
 
-    assert settings.IOT_GATEWAY_STAGE == 'test'
     assert aws_iot_client.session.auth.aws_host == 'not-really-aws.com'
     assert aws_iot_client.session.auth.aws_region == 'us-east-1'
     assert aws_iot_client.session.auth.service == 'execute-api'