acai-aws 2.2.7__tar.gz → 2.2.9__tar.gz

{acai_aws-2.2.7 → acai_aws-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acai_aws
-Version: 2.2.7
+Version: 2.2.9
 Summary: DRY, configurable, declarative framework for building AWS Lambda APIs and event processors
 Home-page: https://github.com/syngenta/acai-python
 Author: Paul Cruse III

{acai_aws-2.2.7 → acai_aws-2.2.9}/acai_aws/apigateway/resolver/modes/directory.py

@@ -4,11 +4,15 @@ from acai_aws.apigateway.exception import ApiException
 
 class DirectoryModeResolver(BaseModeResolver):
 
+    INIT_FILE = '__init__.py'
+
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.__handler_path = self.importer.clean_path(kwargs['handlers'])
 
     def _get_file_and_import_path(self, request_path):
+        # ensure previous lookups don't leave behind path/dynamic state
+        self.reset()
         split_path = self.get_request_path_as_list(request_path)
         route_path = self.__get_route_path(split_path)
         file_path = self.__handler_path + self.importer.file_separator + route_path
@@ -25,7 +29,7 @@ class DirectoryModeResolver(BaseModeResolver):
             part = split_path[split_index]
             if part == '':
                 possible_directory = None
-                possible_file = '__init__.py'
+                possible_file = self.INIT_FILE
             else:
                 possible_directory = part.replace('-', '_')
                 possible_file = f'{possible_directory}.py'
@@ -44,7 +48,7 @@ class DirectoryModeResolver(BaseModeResolver):
             file_leaf = self.determine_which_file_leaf(file_tree, possible_directory)
             self.__get_import_path_file_tree(split_path, split_index+1, file_leaf)
         else:
-            self.append_import_path('__init__.py')
+            self.append_import_path(self.INIT_FILE)
 
     def __handle_file_path_part(self, possible_file, split_path, split_index, file_tree):
         self.append_import_path(possible_file)
@@ -55,7 +59,7 @@ class DirectoryModeResolver(BaseModeResolver):
         file_part = list(file_tree['__dynamic_files'])[0]
         self.append_import_path(file_part)
         if '.py' not in file_part and split_index+1 == len(split_path):
-            self.append_import_path('__init__.py')
+            self.append_import_path(self.INIT_FILE)
         file_leaf = self.determine_which_file_leaf(file_tree, file_part)
         self.has_dynamic_route = True
         self.dynamic_parts[split_index] = split_path[split_index]

{acai_aws-2.2.7 → acai_aws-2.2.9}/acai_aws/common/logger/common_logger.py

@@ -10,7 +10,8 @@ class CommonLogger:
 
     def __init__(self):
         self.__json = jsonpickle
-        self.__format = os.getenv('LOG_FORMAT', 'JSON')
+        env_format = os.getenv('LOG_FORMAT', 'JSON') or 'JSON'
+        self.__format = env_format.strip().upper()
         self.__log_level = os.getenv('LOG_LEVEL', 'INFO')
         self.__json.set_encoder_options('simplejson', use_decimal=True)
         self.__json.set_preferred_backend('simplejson')

{acai_aws-2.2.7 → acai_aws-2.2.9}/acai_aws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acai_aws
-Version: 2.2.7
+Version: 2.2.9
 Summary: DRY, configurable, declarative framework for building AWS Lambda APIs and event processors
 Home-page: https://github.com/syngenta/acai-python
 Author: Paul Cruse III

{acai_aws-2.2.7 → acai_aws-2.2.9}/tests/acai_aws/apigateway/resolver/modes/test_directory.py

@@ -121,3 +121,10 @@ class DirectoryModeResolverTest(unittest.TestCase):
         file_path, import_path = self.directory_resolver._get_file_and_import_path(request.path)
         self.assertTrue('tests/mocks/apigateway/resolver/directory_handlers/user/_user_id/item/_item_id.py' in file_path)
         self.assertEqual('tests.mocks.apigateway.resolver.directory_handlers.user._user_id.item._item_id', import_path)
+
+    def test_repeated_directory_request_resets_import_path(self):
+        request = Request(self.init_request)
+        first_file_path, first_import_path = self.directory_resolver._get_file_and_import_path(request.path)
+        second_file_path, second_import_path = self.directory_resolver._get_file_and_import_path(request.path)
+        self.assertEqual(first_file_path, second_file_path)
+        self.assertEqual(first_import_path, second_import_path)

{acai_aws-2.2.7 → acai_aws-2.2.9}/tests/acai_aws/common/test_logger.py

@@ -1,4 +1,7 @@
+import io
+import json
 import os
+from contextlib import redirect_stdout
 from unittest import TestCase, mock
 
 from acai_aws.common import logger
@@ -54,6 +57,29 @@ class LoggerTest(TestCase):
         except Exception as error:
             logger.log(level='ERROR', log=error)
 
+    @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_FORMAT': ' inline '})
+    def test_logger_logs_error_inline_with_messy_env(self):
+        logger.log(level='INFO', log={'message': 'inline-format'})
+
+    @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_FORMAT': 'JSON'})
+    def test_logger_json_output(self):
+        buffer = io.StringIO()
+        with redirect_stdout(buffer):
+            logger.log(level='WARN', log={'json': True})
+        log_output = buffer.getvalue().strip()
+        parsed = json.loads(log_output)
+        self.assertEqual('WARN', parsed['level'])
+        self.assertEqual({'json': True}, parsed['log'])
+
+    @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_FORMAT': 'INLINE'})
+    def test_logger_inline_output(self):
+        buffer = io.StringIO()
+        with redirect_stdout(buffer):
+            logger.log(level='INFO', log={'inline': True})
+        log_output = buffer.getvalue().strip()
+        self.assertTrue(log_output.startswith('INFO|'))
+        self.assertIn("inline': True", log_output)
+
     @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local'})
     def test_logger_logs_error_as_object(self):
         try:
@@ -96,4 +122,3 @@ class LoggerTest(TestCase):
     @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_LEVEL': 'ERROR', 'LOG_FORMAT': 'BAD'})
     def test_logger_handles_bad_format(self):
         logger.log(level='INFO', log={'INFO': 'ignore'})
-