atk-common 1.58.0__tar.gz → 1.60.0__tar.gz

{atk_common-1.58.0 → atk_common-1.60.0}/PKG-INFO

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

{atk_common-1.58.0 → atk_common-1.60.0}/setup.py

@@ -36,7 +36,7 @@ setup(
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/guides/single-sourcing-package-version/
-    version="1.58.0",  # Required
+    version="1.60.0",  # Required
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:
     # https://packaging.python.org/specifications/core-metadata/#summary

{atk_common-1.58.0 → atk_common-1.60.0}/src/atk_common/__init__.py

@@ -9,7 +9,7 @@ from atk_common.datetime_utils import \
     convert_to_utc, \
     convert_to_utc_image_dt
 from atk_common.db_utils import sql, sql_with_record, convert_none_to_null, date_time_utc_column
-from atk_common.docker_utils import get_current_container_info
+from atk_common.docker_utils import get_current_container_info, set_container_metadata
 from atk_common.env_utils import get_env_value
 from atk_common.error_utils import get_message, create_error_log, get_error_entity, resend_error_entity, handle_error, get_response_error, get_error_type
 from atk_common.http_response_utils import http_response
@@ -34,6 +34,8 @@ __all__ = [
     'sql_with_record',
     'convert_none_to_null',
     'date_time_utc_column',
+    'get_current_container_info',
+    'set_container_metadata',
     'get_env_value',
     'get_message',
     'create_error_log',
@@ -56,5 +58,4 @@ __all__ = [
     'add_log_item_http',
     'decode_message',
     'RabbitMQConsumer',
-    'get_current_container_info',
 ]

{atk_common-1.58.0 → atk_common-1.60.0}/src/atk_common/docker_utils.py

@@ -60,10 +60,11 @@ def get_current_container_info():
         add_log_item("Error getting container data:" + str(e))
         return None
 
-def set_container_metadata(image_name, image_version_env_key):
+def set_container_metadata(image_name_env_key, image_version_env_key):
     data = {}
+    image_name = get_env_value(image_name_env_key)
     data['imageName'] = image_name
-    data['imageVersion'] = get_env_value(image_version_env_key, 'latest')
+    data['imageVersion'] = get_env_value(image_version_env_key)
     data['containerName'] = image_name
     create_container_log(data)
     return data

atk_common-1.60.0/src/atk_common/env_utils.py

@@ -0,0 +1,18 @@
+import os
+from atk_common.log_utils import add_log_item
+
+def val_str(value):
+    if value is None:
+        return 'Empty'
+    if isinstance(value, str):
+        return value
+    return str(value)
+
+def get_env_value(key, abort_on_error=True):
+    val = os.environ.get(key)
+    if val is None and abort_on_error:
+        err_msg = f"Environment variable '{key}' is not set."
+        add_log_item(err_msg)
+        raise ValueError(err_msg)
+    add_log_item(key + ':' + val_str(val))
+    return val

{atk_common-1.58.0 → atk_common-1.60.0}/src/atk_common.egg-info/PKG-INFO

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

atk_common-1.58.0/src/atk_common/env_utils.py

@@ -1,13 +0,0 @@
-import os
-from atk_common.log_utils import add_log_item
-
-def get_env_value(key, default_value):
-    try:
-        if default_value is None:
-            return None
-        val = os.environ[key]
-        add_log_item(key + ':' + val)
-        return val
-    except (Exception) as error:
-        add_log_item(key + ':' + default_value)
-        return default_value