Remoção de referencias para vendor.*;

Ajustes na injeção de dependencias de classes (SQSEvents, SelfConnectionHealthCheck);
Correção na validação de classe conexão para repositórios mysql;
Adição de métodos extras para formatação de resultados de healthcheck;
Correçẽos de testes de componentes;
Implementação de vários cenários de testes de unidades;
Criação de diversos mocks para testes de unidades;
Adicionado tearDown para reverter alterações em objetos estáticos;

Author: andersoncontreira

examples/lambda_api/lambda_app/database/mysql.py

@@ -2,7 +2,7 @@
 
 from lambda_app.config import get_config
 from lambda_app.logging import get_logger
-from vendor import pymysql
+import pymysql
 
 logger = get_logger()
 

examples/lambda_api/lambda_app/events/aws/sqs.py

@@ -12,16 +12,19 @@
 
 class SQSEvents:
 
-    def __init__(self, logger=None, config=None):
+    def __init__(self, logger=None, config=None, profile=None, session=None):
         # logger
         self.logger = logger if logger is not None else get_logger()
         # configurations
         self.config = config if config is not None else get_config()
         # last_exception
         self.exception = None
+        # profile
+        self.profile = profile if profile is not None else \
+            os.environ['AWS_PROFILE'] if 'AWS_PROFILE' in os.environ else None
         # session
-        self.profile = os.environ['AWS_PROFILE'] if 'AWS_PROFILE' in os.environ else None
-        self.session = boto3.session.Session(profile_name=self.profile)
+        self.session = session if session is not None else \
+            boto3.session.Session(profile_name=self.profile)
 
     def connect(self, retry=False):
         global _RETRY_COUNT, _MAX_RETRY_ATTEMPTS

examples/lambda_api/lambda_app/repositories/mysql/__init__.py

@@ -1,6 +1,6 @@
 from lambda_app.database.mysql import get_connection
 from lambda_app.logging import get_logger
-from vendor import pymysql
+import pymysql
 
 
 class AbstractRepository:
@@ -21,7 +21,9 @@ def _execute(self, sql, params=None):
             self.logger.info("SQL: {}".format(sql))
             self.logger.info("SQL Values: {}".format(params))
 
-        if isinstance(self.connection, pymysql.connections.Connection):
+        # issubclass(connection_mock.__class__, pymysql.connections.Connection)
+        if isinstance(self.connection, pymysql.connections.Connection) \
+                or issubclass(self.connection.__class__, pymysql.connections.Connection):
             # always connect because is treadsafe
             self.connection.connect()
             # with self.connection.cursor() as cursor:
@@ -36,3 +38,5 @@ def _execute(self, sql, params=None):
 
     def _close(self):
         self.connection.close()
+
+

examples/lambda_api/lambda_app/repositories/mysql/product_repository.py

@@ -5,7 +5,7 @@
 from lambda_app.logging import get_logger
 from lambda_app.repositories.mysql import AbstractRepository
 from lambda_app.vos.product import ProductVO
-from vendor import pymysql
+import pymysql
 
 
 class ProductRepository(AbstractRepository):

examples/lambda_api/lambda_app/services/v1/healthcheck/__init__.py

@@ -36,6 +36,18 @@ def unhealthy(description):
     def degraded(description):
         return HealthCheckResult(HealthStatus.DEGRADED, description)
 
+    def __str__(self):
+        return self.to_dict()
+
+    def __repr__(self):
+        return self.to_json()
+
+    def to_dict(self):
+        return {'status': self.status, 'description': self.description}
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
+
 
 class EntrySchema(Schema):
     status = fields.Str(example=HealthStatus.HEALTHY.value)

examples/lambda_api/lambda_app/services/v1/healthcheck/resources.py

@@ -9,20 +9,20 @@
 
 
 class SelfConnectionHealthCheck(AbstractHealthCheck):
-    def __init__(self, logger=None, config=None):
+    def __init__(self, logger=None, config=None, http_client=None):
         super().__init__(logger=logger, config=config)
+        self.http_client = http_client if http_client is not None else requests
 
     def check_health(self):
         result = False
         description = "Unable to connect"
         check_result = HealthCheckResult.unhealthy(description)
-        response = None
         try:
             result = True
             url = os.environ["API_SERVER"] if "API_SERVER" in os.environ else None
             url = url + "/docs"
             self.logger.info("requesting url: {}".format(url))
-            response = requests.get(url)
+            response = self.http_client.get(url)
             if response:
                 if response.status_code == 200:
                     result = True

examples/lambda_api/server.py

@@ -3,4 +3,4 @@
 
 # Não remover do projeto, muito útil para executar o debug via IDE Pycharm
 http_server = WSGIServer(('0.0.0.0', 5000), app)
-http_server.serve_forever()
+http_server.serve_forever()

examples/lambda_api/tests/component/test_lambda_app/services/v1/healthcheck/test_sqs_connection_healthcheck.py

@@ -6,6 +6,8 @@
 from lambda_app.services.v1.healthcheck import HealthStatus, HealthCheckResult
 from lambda_app.services.v1.healthcheck.resources import SQSConnectionHealthCheck
 from tests.component.componenttestutils import BaseComponentTestCase
+from tests.component.helpers.events.aws.sqs_helper import SQSHelper
+from tests.unit.helpers.aws.sqs_helper import get_sqs_event_sample
 from tests.unit.testutils import get_function_name
 
 
@@ -22,19 +24,41 @@ def setUpClass(cls):
         # fixture
         if cls.EXECUTE_FIXTURE:
             logger = get_logger()
-            # logger.info('Fixture: create database')
-            # todo a implementar
+            logger.info('Fixture: create sqs queue')
+
+            queue_url = cls.CONFIG.APP_QUEUE
+            cls.fixture_sqs(logger, queue_url)
+
+    @classmethod
+    def fixture_sqs(cls, logger, queue_url):
+        queue_name = SQSHelper.get_queue_name(queue_url)
+        deleted = SQSHelper.delete_queue(queue_url)
+        if deleted:
+            logger.info(f'Deleting queue name: {queue_name}')
+
+        attributes = {'DelaySeconds': '1'}
+        result = SQSHelper.create_queue(queue_url, attributes)
+        if result is not None:
+            logger.info(f'queue {queue_name} created')
+        else:
+            logger.error(f'queue {queue_name} not created')
+
+        event = get_sqs_event_sample()
+        message = event['Records'][0]
+        SQSHelper.create_message(message, queue_url)
+        logger.info('created message: {}'.format(message))
 
     def setUp(self):
         super().setUp()
-        self.sqs_events = SQSEvents()
         self.config = get_config()
-        self.service = SQSConnectionHealthCheck(self.logger, self.config, self.sqs_events)
+        self.sqs = SQSEvents(logger=self.logger, config=self.config)
+        self.service = SQSConnectionHealthCheck(self.logger, self.config, self.sqs)
 
     def test_check_health(self):
         self.logger.info('Running test: %s', get_function_name(__name__))
 
         result = self.service.check_health()
+        self.logger.info(result.to_dict())
 
         self.assertIsInstance(result, HealthCheckResult)
         self.assertEqual(result.status, HealthStatus.HEALTHY)

examples/lambda_api/tests/component/test_lambda_app/services/v1/test_healthcheck_service.py

@@ -13,6 +13,8 @@
 from tests.component.helpers.events.aws.sqs_helper import SQSHelper
 from tests.unit.helpers.aws.sqs_helper import get_sqs_event_sample
 from tests.unit.testutils import get_function_name
+from lambda_app.database.mysql import get_connection as mysql_get_connection
+from lambda_app.database.redis import get_connection as redis_get_connection
 
 
 class HealthCheckServiceTestCase(BaseComponentTestCase):
@@ -77,18 +79,18 @@ def fixture_table(cls, logger, mysql_connection, table_name):
     def setUp(self):
         super().setUp()
         self.config = get_config()
+        self.mysql_connection = mysql_get_connection()
+        self.redis_connection = redis_get_connection()
         self.service = HealthCheckService(self.logger, self.config)
 
     def test_add_check(self):
         self.logger.info('Running test: %s', get_function_name(__name__))
-        self.service.add_check("MysqlConnection", MysqlConnectionHealthCheck(self.logger, self.config), ["db"])
-
-        # self.assertEqual(len(self.service.entries), 1)
+        self.service.add_check("MysqlConnection", MysqlConnectionHealthCheck(
+            self.logger, self.config, self.mysql_connection), ["db"])
 
         result = self.service.get_result()
-        print(result)
+        self.logger.info(result)
 
-        # self.assertEqual(result["status"], HealthStatus.HEALTHY)
         self.assertIsInstance(result, dict)
         self.assertTrue('status' in result)
 
@@ -97,25 +99,22 @@ def test_add_lambda_check(self):
         self.service.add_check("Lambda test", lambda: HealthCheckResult.healthy("test success"), ["lambda_test"])
 
         result = self.service.get_result()
-        print(result)
+        self.logger.info(result)
 
-        # self.assertEqual(result["status"], HealthStatus.HEALTHY)
         self.assertIsInstance(result, dict)
         self.assertTrue('status' in result)
 
     def test_add_multi_checks(self):
         self.logger.info('Running test: %s', get_function_name(__name__))
         self.service.add_check("self", SelfConnectionHealthCheck(self.logger, self.config), [])
-        self.service.add_check("mysql", MysqlConnectionHealthCheck(self.logger, self.config), ["db"])
-        self.service.add_check("redis", RedisConnectionHealthCheck(self.logger, self.config), ["redis"])
-        # self.service.add_check("SQSConnection", SQSConnectionHealthCheck(self.logger, self.config), ["db"])
-
-        #self.assertEqual(len(self.service.entries), 3)
+        self.service.add_check("mysql", MysqlConnectionHealthCheck(
+            self.logger, self.config, self.mysql_connection), ["db"])
+        self.service.add_check("redis", RedisConnectionHealthCheck(
+            self.logger, self.config, self.redis_connection), ["redis"])
 
         result = self.service.get_result()
-        print(result)
+        self.logger.info(result)
 
-        # self.assertEqual(result["status"], HealthStatus.HEALTHY)
         self.assertIsInstance(result, dict)
         self.assertTrue('status' in result)
 
@@ -126,7 +125,7 @@ def test_get_response(self):
         self.service.add_check("redis", RedisConnectionHealthCheck(self.logger, self.config), ["redis"])
 
         response = self.service.get_response()
-        print(response.data)
+        self.logger.info(response.data)
         self.assertIsNotNone(response.data)
 
 

examples/lambda_api/tests/unit/mocks/database/mysql_mock.py

@@ -1,10 +1,35 @@
+import random
 from time import sleep
 
 from mock import Mock
 import pymysql
+from mock.mock import MagicMock
 
 from pymysql import OperationalError
 
+# ************************
+# Cursor
+# ************************
+# def execute(self, query, args=None):
+#     return True
+iterable = MagicMock(return_value=iter([MagicMock(return_value=1), MagicMock(return_value=2)]))
+cursor_mock = Mock(pymysql.cursors.DictCursor)
+cursor_mock.__iter__ = iterable
+cursor_mock.execute.side_effect = lambda query, args=None: True
+cursor_mock.fetchone.side_effect = lambda: None
+cursor_mock.fetchall.side_effect = lambda: iterable
+# ************************
+# Connect mock
+# ************************
+connect_mock = Mock(pymysql.connect)
+# ************************
+# Connection Mock
+# ************************
+connection_mock = Mock(pymysql.connections.Connection)
+connection_mock.connect.return_value = True
+connection_mock.cursor.return_value = cursor_mock
+connection_mock.insert_id.side_effect = lambda: random.randrange(1, 100)
+
 _CONNECTION = False
 _RETRY_COUNT = 0
 _MAX_RETRY_ATTEMPTS = 3
@@ -15,14 +40,7 @@ def reset():
     _CONNECTION = False
 
 
-cursor_mock = Mock(pymysql.cursors.DictCursor)
-connection_mock = Mock(pymysql.connect)
-connection_mock.connect.return_value = True
-connection_mock.cursor.return_value = cursor_mock
-
-
 def mock_raise_exception():
-    # raise Exception('Connection exception')
     raise OperationalError((1045, "Access denied for user 'undefined'@'192.168.160.1' (using password: YES)"))