atk-common 1.58.0__py3-none-any.whl → 1.60.0__py3-none-any.whl

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/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/env_utils.py

@@ -1,13 +1,18 @@
 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
+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.dist-info → atk_common-1.60.0.dist-info}/METADATA

@@ -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.dist-info → atk_common-1.60.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-atk_common/__init__.py,sha256=yQ23thqIxTAn4Ijk7nn5COYqB7hEU3ITYkscIY4lyoU,2158
+atk_common/__init__.py,sha256=mKQGfrr7s2-P4qSkk3NAGZ-nlmogn0JJtGIWEyA7MaI,2213
 atk_common/datetime_utils.py,sha256=0SC5-Nai4RJH9B0VzvGKUQts_QeRXGb7tJLlsh73LJw,3556
 atk_common/db_utils.py,sha256=odUtXcS7Mumw5eGyVyVimL_U_lP7TqMX9v8nWO5nMvg,902
-atk_common/docker_utils.py,sha256=WFQGXOpV3XlgGBkQ8wCr300CPDyyaT5ov43AO3UL0Ok,2454
-atk_common/env_utils.py,sha256=66v-S0vlkJNaun6ay1XcOGRtYJb4Ce4odJsWxuaHsQc,373
+atk_common/docker_utils.py,sha256=Z7BGCV5IX-O38jLSTDBN8k617zMsYDHL3VWdhoBXVfs,2504
+atk_common/env_utils.py,sha256=YDeIhKMNLuw_zsBGjMrlQGl6IT3QKf_GIRA8uPeZIT4,513
 atk_common/error_utils.py,sha256=kO-VQlajD8SO9MBxj8MHZRTK_uBXgPa09hy6pfjqZBY,2622
 atk_common/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk8,112
 atk_common/hash_utils.py,sha256=S_9o89CdI4lUQbVaqc85TDcqyDNuo30_E3VBaOrZKko,1047
@@ -52,7 +52,7 @@ atk_common/enums/speed_control_status_type_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe
 atk_common/enums/speed_control_stop_reason.py,sha256=pvLS6fpDhsCiIDAmiQBsHctxZnq-Dl2BOgJOxQnT5Hc,200
 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-1.58.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-1.60.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
 atk_package/__init__.py,sha256=NcsmwFadivgIeWV0-5ACZxqmfo4EzTkJX0r4N6DFAdg,820
 atk_package/datetime_utils.py,sha256=qsVF7l90P1-xukG2tV_jLqG9J_Yfl5wTpyfrdPBlyMo,239
 atk_package/env_utils.py,sha256=bXOrxM3fZUslqfmZt75iphbEJHbG4riJa8XOVzPwIII,313
@@ -65,7 +65,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-1.58.0.dist-info/METADATA,sha256=WF-qrgzmIVvyFjf45l6LycXR5sfYYF3tw7KzgCg0dKM,1761
-atk_common-1.58.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atk_common-1.58.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.58.0.dist-info/RECORD,,
+atk_common-1.60.0.dist-info/METADATA,sha256=jzQN40D-3XiZxU8FekkTujTW_40YgLtRSXrKeiW5kQ4,1761
+atk_common-1.60.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atk_common-1.60.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-1.60.0.dist-info/RECORD,,