Improvements

* Remove deprecated certbot-aws lib
* Support flatdict notation to retrieve value from ecs metadata
* Added hostname function

Author: JohnPreston

Makefile

@@ -93,13 +93,13 @@ dist: clean ## builds source and wheel package
 	poetry build
 	ls -l dist
 
-install: clean conform ## install the package to the active Python's site-packages
-	pip install . --use-pep517
+install: clean data-model conform ## install the package to the active Python's site-packages
+	pip install . || (poetry install && pip install .)
 
-conform:	data-model
-	isort --profile black ecs_files_composer
-	black ecs_files_composer tests
+conform:
+	isort --profile black ecs_files_composer || poetry run isort --profile black ecs_files_composer
+	black ecs_files_composer tests || poetry run black ecs_files_composer tests
 	find ecs_files_composer -name "*.json" -type f  -exec sed -i '1s/^\xEF\xBB\xBF//' {} +
 
 data-model:
-	datamodel-codegen
+	datamodel-codegen || poetry run datamodel-codegen

ecs_files_composer/input.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  ecs-files-input.json
-#   timestamp: 2022-11-16T09:12:19+00:00
+#   timestamp: 2022-11-23T12:21:00+00:00
 
 from __future__ import annotations
 

ecs_files_composer/jinja2_filters/__init__.py

@@ -11,6 +11,7 @@
 import requests
 import yaml
 from boto3.session import Session
+from flatdict import FlatDict, FlatterDict
 
 from .aws_filters import msk_bootstrap
 
@@ -91,7 +92,14 @@ def from_metadata_to_flat_keys(metadata):
     return new_metadata
 
 
-def get_property(metadata, property_key):
+def get_property(metadata, property_key, separator: str = None):
+    if separator is None:
+        separator = r"::"
+    metadata_mapping = FlatterDict(metadata)
+    metadata_mapping.set_delimiter(separator)
+    if property_key in metadata_mapping:
+        return metadata_mapping[property_key]
+
     metadata_mapping = from_metadata_to_flat_keys(metadata)
     property_re = re.compile(property_key)
     for key, value in metadata_mapping.items():
@@ -170,13 +178,32 @@ def from_ssm_json(parameter_name: str) -> dict:
         return {}
 
 
+def hostname(alternative_value: str = None) -> str:
+    try:
+        import platform
+
+        return str(platform.node())
+    except Exception as error:
+        print("Error with platform", error)
+        try:
+            import socket
+
+            return str(socket.gethostname())
+        except Exception as error:
+            print("Error with socket", error)
+            pass
+    if alternative_value:
+        return alternative_value
+
+
 JINJA_FUNCTIONS = {
     "ecs_container_metadata": ecs_container_metadata,
     "ecs_task_metadata": ecs_task_metadata,
     "env_var": env_var,
     "from_ssm": from_ssm,
     "from_ssm_json": from_ssm_json,
     "msk_bootstrap": msk_bootstrap,
+    "hostname": hostname,
 }
 
 JINJA_FILTERS = {"to_yaml": to_yaml, "to_json": to_json, "env_override": env_override}