atk-common 3.5.0__py3-none-any.whl → 3.7.0__py3-none-any.whl

atk_common/classes/docker_handler.py

@@ -8,7 +8,7 @@ class DockerHandler(IDockerHandler):
         self.logger = logger
         self.image_name = image_name
         self.image_version = image_version
-        self.set_container_metadata()
+        self.container_data = self.set_container_metadata()
 
     def get_image_name_and_version(self, tags):
         if tags:
@@ -74,3 +74,6 @@ class DockerHandler(IDockerHandler):
         data['containerName'] = self.image_name
         self.create_container_log(data)
         return data
+
+    def get_container_metadata(self):
+        return self.container_data

atk_common/classes/error_handler.py

@@ -34,7 +34,7 @@ class ErrorHandler(IErrorHandler):
             err_str += ', containerName: <none>'
         self.logger.error(err_str)
 
-    def get_error_entity(self, error, method, error_type, status_code, container_info):
+    def get_error_entity(self, error, method, error_type, status_code):
         data = {}
         data['statusCode'] = status_code
         data['exceptionType'] = str(type(error))
@@ -42,7 +42,7 @@ class ErrorHandler(IErrorHandler):
         data['message'] = self.get_message(error)
         data['method'] = method
         data['timestamp'] = get_utc_date_time_str()
-        data['containerInfo'] = container_info
+        data['containerInfo'] = self.docker_handler.get_container_metadata()
         self.create_error_log(data)
         return Response(
             response=json.dumps(data),

atk_common/classes/http_response_handler.py

@@ -27,7 +27,7 @@ class HttpResponseHandler(IHttpResponseHandler):
     #   If response['status'] == 1 (HTTP): resend received error entity
     #   If response['status'] == 2 (INTERNAL): create new error entity and return as response
     # If http status other value: create new error entity and return as response
-    def http_response(self, method, response, container_info):
+    def http_response(self, method, response):
         if is_http_status_ok(response['statusCode']):
             return Response(
                 response=self._convert_response_data(response['responseMsg']),
@@ -38,5 +38,5 @@ class HttpResponseHandler(IHttpResponseHandler):
         elif is_http_status_internal(response['statusCode']):
             if is_response_http(response):
                 return self.error_handler.resend_error_entity(response['responseMsg'])
-            return self.error_handler.get_error_entity(response['responseMsg'], method, ApiErrorType.INTERNAL, response['statusCode'], container_info)
-        return self.error_handler.get_error_entity(response['responseMsg'], method, ApiErrorType.CONNECTION, response['statusCode'], container_info)
+            return self.error_handler.get_error_entity(response['responseMsg'], method, ApiErrorType.INTERNAL, response['statusCode'])
+        return self.error_handler.get_error_entity(response['responseMsg'], method, ApiErrorType.CONNECTION, response['statusCode'])

atk_common/interfaces/docker_handler_interface.py

@@ -7,3 +7,4 @@ class IDockerHandler(Protocol):
     def create_container_log(container_data) -> None: ...
     def get_current_container_info() -> None: ...
     def set_container_metadata(image_name_env_key, image_version_env_key) -> None: ...
+    def get_container_metadata() -> None: ...

atk_common/interfaces/error_handler_interface.py

@@ -4,7 +4,7 @@ from typing import Protocol
 class IErrorHandler(Protocol):
     def get_message(self, error) -> None: ...
     def create_error_log(self, data) -> None: ...
-    def get_error_entity(self, error, method, error_type, status_code, container_info) -> None: ...
+    def get_error_entity(self, error, method, error_type, status_code) -> None: ...
     def resend_error_entity(self, error_entity) -> None: ...
     def handle_error(self, resp, status) -> None: ...
     def get_response_error(self, resp) -> None: ...

{atk_common-3.5.0.dist-info → atk_common-3.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atk_common
-Version: 3.5.0
+Version: 3.7.0
 Summary: ATK common methods
 Home-page: https://github.com/pypa/atk_common
 Author: Roger

{atk_common-3.5.0.dist-info → atk_common-3.7.0.dist-info}/RECORD

@@ -18,10 +18,10 @@ atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8
 atk_common/response_utils.py,sha256=AxlmwkFoDU5XcFOzBQiuZxAQgswihpKXHSo1T0JJw3Q,556
 atk_common/classes/__init__.py,sha256=O_VHYxAilmoz3i9L6jkwS-JZ4UaTezdhFiA5liNl1lY,532
 atk_common/classes/bo_logger.py,sha256=pEdk4bl0Vr60yWVihT7Fm395lMmO8JBBNeEhtDyIO5c,2250
-atk_common/classes/docker_handler.py,sha256=73WiebIT_RwGgwyvIed_Q5p8Tsb1b22JChBDyUmf1IU,2949
+atk_common/classes/docker_handler.py,sha256=VNJecc2ZWcpwNBa61QTGM_kYrsoZTjktMcFRFGF4xI4,3048
 atk_common/classes/env_handler.py,sha256=h3snKwHwDvfc2dt1vgHasqv8n_vnsI9J2MAr-XM5oow,1283
-atk_common/classes/error_handler.py,sha256=uev5LFh2YIQRZo--es2F84bAz-ndh2G02H2DgvBx3wc,3254
-atk_common/classes/http_response_handler.py,sha256=B83UW-W6pE5BcUaoYcIb1RS-TzZEeZ22vgWmvB7xT30,2176
+atk_common/classes/error_handler.py,sha256=D2oILLc8VeZmd16PuJsjfu7g0Q6kCWazt8FPa3gJamQ,3268
+atk_common/classes/http_response_handler.py,sha256=l8CfntLPRHbB1nfUPPGnmTvQMAM29CVK4THG4FK1_4k,2128
 atk_common/classes/rabbitmq_consumer.py,sha256=jct1UnfP-PU3IeWW2S_9dQ7FxmY0_M8YwZadFMv52j8,2936
 atk_common/enums/__init__.py,sha256=hOSoKWIBUpRFaMN2tNJiel6iGI1MHj229OYnU1J8Jg0,2636
 atk_common/enums/api_error_type_enum.py,sha256=9oW6ZaZ3lhMwR8r2sVNWGliS9C_jV-otiOYdezAuTp0,91
@@ -64,9 +64,9 @@ atk_common/enums/speed_control_stop_reason.py,sha256=pvLS6fpDhsCiIDAmiQBsHctxZnq
 atk_common/enums/test_image_type_enum.py,sha256=HUjxJorehnzRXMNF2uHk2DrAJ3Y_ajQvp0jW-mtlOhU,140
 atk_common/enums/violation_type_enum.py,sha256=01qTHOj-O8bOc-nwIHVnxLosm4cusD_YuqXM3ZsiRRk,86
 atk_common/interfaces/__init__.py,sha256=HynEg28Uy3msO7qd__VxajTasSe9-Evpj9yi3Uw2NTo,508
-atk_common/interfaces/docker_handler_interface.py,sha256=aCJ6cELRlrbZC-sB-RQEpKhChCMEiYNclcfr62YjSCo,411
+atk_common/interfaces/docker_handler_interface.py,sha256=hs71uNcFvSbTqRvcL4XarHx6DONP1J7MrUUz-oO28bM,458
 atk_common/interfaces/env_handler_interface.py,sha256=yrmtTplH5tnuOAs7CW5RtzLMTE5q9sdzTYjiS2naNQQ,300
-atk_common/interfaces/error_handler_interface.py,sha256=H43hSeeThT_7EbNzh-rygAJWNAmyzFetodiXdmqKshU,522
+atk_common/interfaces/error_handler_interface.py,sha256=ErhQ69T3fCYUl6sS5GwiMgW-znapmGcmgWLR2QLNu8c,506
 atk_common/interfaces/http_response_handler_interface.py,sha256=QjDmhVj4AnUyoRtSHk_sfFPI-cto6TV7Mx2_87tiOrs,185
 atk_common/interfaces/logger_interface.py,sha256=36impIkvGZbL5CUMKyaLkYi3jVyin_KRRUqvtyMh05E,381
 atk_common/utils/__init__.py,sha256=IaP851DJXND3OPkjy-OJxpaNG1zkGlg5bHsUg7mqr-I,1768
@@ -80,7 +80,7 @@ atk_common/utils/hash_utils.py,sha256=S_9o89CdI4lUQbVaqc85TDcqyDNuo30_E3VBaOrZKk
 atk_common/utils/http_utils.py,sha256=eSRuQeDgN0ISQdByZqE6cIGXoorcAXz7PEtVntHUKAo,670
 atk_common/utils/internal_response_utils.py,sha256=2X9eLFEy1pO3Aesj1IRXg2yprwNcBDM5_dXaA5vfmMI,694
 atk_common/utils/mq_utils.py,sha256=DmVcXIZHG45p7cQVvgen6OT8QbW_UifFFJGJBybTkJQ,1835
-atk_common-3.5.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-3.7.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
 atk_package/__init__.py,sha256=okIFEefQhQrw6DZg6oCEVWsEdkVCk-57VXBW0IUG_wU,834
 atk_package/datetime_utils.py,sha256=qsVF7l90P1-xukG2tV_jLqG9J_Yfl5wTpyfrdPBlyMo,239
 atk_package/env_utils.py,sha256=bXOrxM3fZUslqfmZt75iphbEJHbG4riJa8XOVzPwIII,313
@@ -93,7 +93,7 @@ atk_package/enums/__init__.py,sha256=EtUr_--MQj1Rc_R0sF_ELXIThmhpfmhDWq3YaK9oQMk
 atk_package/enums/command_status_enum.py,sha256=M2Nln27a_DbzI07-gfytWQk2X087JhkU6Fmard5qVHs,127
 atk_package/enums/speed_control_status_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe4hUn1illIkbo7k4mLfzIM,182
 shared_python_atk_enforcement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atk_common-3.5.0.dist-info/METADATA,sha256=7wB0gmqZQrjR4A6KTFsmVqLkPnnPu_TAlbpt7EBYGEg,1760
-atk_common-3.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atk_common-3.5.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-3.5.0.dist-info/RECORD,,
+atk_common-3.7.0.dist-info/METADATA,sha256=z_2RpVEYqcDqRNOfOY6kNmiGSnIWVZSBjkQZSUehQjg,1760
+atk_common-3.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atk_common-3.7.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-3.7.0.dist-info/RECORD,,