Using proper temp dir and external_id variable

Author: JohnPreston

ecs_files_composer/certbot_aws_store.py

@@ -12,12 +12,18 @@
 if TYPE_CHECKING:
     from .input import Model
 
+from os import makedirs, path
+
 from certbot_aws_store.certificate import AcmeCertificate
 
 from ecs_files_composer.common import LOG
 
 
 def handle_certbot_store_certificates(job: Model) -> None:
+    """
+    Pulls certificates from certbot-aws-store to local filesystem
+    If the path does not exist, creates a new directory for download.
+    """
     if not job.certbot_store:
         return
     for _hostname, _definition in job.certbot_store.items():
@@ -29,9 +35,13 @@ def handle_certbot_store_certificates(job: Model) -> None:
             if _definition.table_region_name
             else None,
         )
+        if not path.exists(_definition.storage_path):
+            makedirs(_definition.storage_path, exist_ok=True)
         try:
             certificate.pull(_definition.storage_path)
             LOG.info("Successfully pulled certificates for %s", _hostname)
         except Exception as error:
-            print(error)
-            print("Failed to download certificate from certbot-aws-store", _hostname)
+            LOG.exceptions(error)
+            LOG.error(
+                "Failed to download certificate from certbot-aws-store", _hostname
+            )

ecs_files_composer/ecs_files_composer.py

@@ -13,6 +13,7 @@
 import json
 import uuid
 from os import environ, path
+from tempfile import TemporaryDirectory
 
 import yaml
 from compose_x_common.compose_x_common import keyisset
@@ -56,7 +57,7 @@ def init_config(
     iam_override = {"SessionName": "FilesComposerInit"}
     if ssm_parameter or s3_config or secret_config:
         role_arn = environ.get("CONFIG_IAM_ROLE_ARN", role_arn)
-        external_id = environ.get("CONFIG_IAM_EXTERNAL_ID", None)
+        external_id = environ.get("CONFIG_IAM_EXTERNAL_ID", external_id)
         if role_arn:
             iam_override.update({"RoleArn": role_arn})
         if external_id:
@@ -90,11 +91,12 @@ def init_config(
     elif env_var:
         initial_config = {"content": environ.get(env_var, None)}
     else:
-        raise Exception("No input source was provided")
+        raise ValueError("No input source was provided")
     if not initial_config:
         raise ImportError("Failed to import a configuration content")
     LOG.debug(initial_config)
-    config_path = f"/tmp/{str(uuid.uuid1())}/init_config.conf"
+    temp_dir = TemporaryDirectory()
+    config_path = f"{temp_dir.name}/init_config.conf"
     jobs_input_def = {
         "files": {config_path: initial_config},
         "IamOverride": iam_override,