Fixing build and auto create file path

Author: JohnPreston

.cicd/buildspec.yml

@@ -98,16 +98,6 @@ phases:
               --amend ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}-amd64     \
               --amend ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}-arm64v8;
             docker manifest push ${PUBLIC_REGISTRY}/ecs-files-composer:latest;
-
-            docker manifest create ${AWS_MARKET_REGISTRY}/ecs-files-composer:latest   \
-              --amend ${AWS_MARKET_REGISTRY}/files-composer:${VERSION}-amd64          \
-              --amend ${AWS_MARKET_REGISTRY}/files-composer:${VERSION}-arm64v8;
-            docker manifest push ${AWS_MARKET_REGISTRY}/files-composer:latest;
-
-            docker manifest create ${AWS_MARKET_REGISTRY}/ecs-files-composer:latest  \
-              --amend ${AWS_MARKET_REGISTRY}/ecs-files-composer:${VERSION}-amd64     \
-              --amend ${AWS_MARKET_REGISTRY}/ecs-files-composer:${VERSION}-arm64v8;
-            docker manifest push ${AWS_MARKET_REGISTRY}/ecs-files-composer:latest;
           fi
 
     finally:

ecs_files_composer/ecs_files_composer.py

@@ -79,11 +79,12 @@ def init_config(
     return config
 
 
-def start_jobs(config):
+def start_jobs(config, override_session=None):
     """
     Starting point to run the files job
 
     :param config:
+    :param override_session:
     :return:
     """
     if not keyisset("files", config):
@@ -96,5 +97,5 @@ def start_jobs(config):
             job.files[file_path] = file_def
             file_def.path = file_path
     for file in job.files.values():
-        file.handler(job.iam_override)
+        file.handler(job.iam_override, override_session)
         LOG.info(f"Tasks for {file.path} completed.")

ecs_files_composer/files_mgmt.py

@@ -5,6 +5,7 @@
 """Main module."""
 
 import base64
+import pathlib
 import subprocess
 import warnings
 from os import path
@@ -30,14 +31,25 @@ class File(FileDef, object):
     def __init__(self, **data: Any):
         super().__init__(**data)
         self.templates_dir = None
+        self.dir_path = None
 
-    def handler(self, iam_override, session_override=None):
+    def set_dir_path(self):
+        if self.path:
+            self.dir_path = path.abspath(path.dirname(self.path))
+
+    def handler(self, iam_override=None, session_override=None):
         """
         Main entrypoint for files to relate
 
         :param ecs_files_composer.input.IamOverrideDef iam_override:
         :param boto3.session.Session session_override:
         """
+        if not self.dir_path:
+            self.set_dir_path()
+        if self.dir_path and not path.exists(self.dir_path):
+            print(f"Creating {self.dir_path} folder")
+            dir_path = pathlib.Path(path.abspath(self.dir_path))
+            dir_path.mkdir(parents=True, exist_ok=True)
         if (
             self.context
             and isinstance(self.context, Context)

pyproject.toml

@@ -67,6 +67,20 @@ force_grid_wrap = 0
 use_parentheses = true
 known_first_party = "kelvin"
 
+[tool.coverage.run]
+source = ["ecs_files_composer"]
+branch = true
+
+[tool.coverage.report]
+ignore_errors = true
+exclude_lines = [
+    "if self.debug:",
+    "pragma: no cover",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:"
+    ]
+
+omit = ["ecs_files_composer/cli.py"]
 
 [tool.tbump]
 github_url = "https://github.com/compose-x/ecs-files-composer"

tests/test_ecs_config_composer.py

@@ -4,9 +4,10 @@
 # Copyright 2020-2021 John Mille<[email protected]>
 
 """Tests for `ecs_files_composer` package."""
-
+import uuid
 from os import path
 
+import boto3.session
 import pytest
 
 from ecs_files_composer import input
@@ -53,7 +54,9 @@ def simple_json_config_with_certs():
     return {
         "files": {
             "/tmp/test_raw.txt": {"content": raw_content},
-            "/tmp/test.txt": {"content": "THIS IS A TEST"},
+            f"/tmp/{str(uuid.uuid1())}/test.txt": {
+                "content": "THIS IS A ${SHELL:-test}\n"
+            },
             "/tmp/dedoded.txt": {
                 "content": "VEhJUyBJUyBFTkRPREVEIE1FU1NBR0U=",
                 "encoding": "base64",
@@ -77,6 +80,8 @@ def test_simple_job_import(simple_json_config):
 
 def test_s3_files_simple(s3_files_config):
     start_jobs(s3_files_config)
+    test_session = boto3.session.Session()
+    start_jobs(s3_files_config, override_session=test_session)
 
 
 def test_simple_cert(simple_json_config_with_certs):