Fixed files recast

Author: JohnPreston

ecs_files_composer/cli.py

@@ -65,6 +65,13 @@ def main():
         required=False,
         default="jinja2",
     )
+    parser.add_argument(
+        "--override-init-folder",
+        dest="init_folder",
+        required=False,
+        type=str,
+        default="",
+    )
     parser.add_argument("_", nargs="*")
     args = parser.parse_args()
     print("Arguments: " + str(args._))
@@ -82,30 +89,35 @@ def main():
             env_var=args.env_var,
             decode_base64=args.decode_base64,
             context=args.context,
+            override_folder=args.init_folder,
         )
     elif args.file_path:
         config = init_config(
             file_path=args.file_path,
             decode_base64=args.decode_base64,
             context=args.context,
+            override_folder=args.init_folder,
         )
     elif args.ssm_config:
         config = init_config(
             ssm_parameter=args.ssm_config,
             decode_base64=args.decode_base64,
             context=args.context,
+            override_folder=args.init_folder,
         )
     elif args.s3_config:
         config = init_config(
             s3_config=args.s3_config,
             decode_base64=args.decode_base64,
             context=args.context,
+            override_folder=args.init_folder,
         )
     elif args.secret_config:
         config = init_config(
             secret_config=args.secret_config,
             decode_base64=args.decode_base64,
             context=args.context,
+            override_folder=args.init_folder,
         )
     else:
         raise parser.error(

ecs_files_composer/ecs_files_composer.py

@@ -38,6 +38,7 @@ def init_config(
     external_id=None,
     decode_base64=False,
     context=None,
+    override_folder: str = None,
 ):
     """
     Function to initialize the configuration
@@ -95,8 +96,11 @@ def init_config(
     if not initial_config:
         raise ImportError("Failed to import a configuration content")
     LOG.debug(initial_config)
-    temp_dir = TemporaryDirectory()
-    config_path = f"{temp_dir.name}/init.conf"
+    if not override_folder:
+        temp_dir = TemporaryDirectory()
+        config_path = f"{temp_dir.name}/init.conf"
+    else:
+        config_path = f"{override_folder}/init.conf"
     jobs_input_def = {
         "files": {config_path: initial_config},
         "IamOverride": iam_override,
@@ -123,7 +127,8 @@ def init_config(
 def process_files(job: Model, override_session=None) -> None:
     files: list = []
     for file_path, file in job.files.items():
-        file_redef = File(**file.dict())
+        config = json.loads(file.json(by_alias=True))
+        file_redef = File(**config)
         file_redef.path = file_path
         files.append(file_redef)
     for file in files:

ecs_files_composer/files_mgmt.py

@@ -32,11 +32,6 @@ class File(FileDef):
     def __init__(self, **data: Any):
         super().__init__(**data)
         self.templates_dir = None
-        self.dir_path = 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):
         """
@@ -45,9 +40,7 @@ def handler(self, iam_override=None, session_override=None):
         :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):
+        if 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)
@@ -74,6 +67,10 @@ def handler(self, iam_override=None, session_override=None):
         if self.commands and self.commands.post:
             self.exec_post_commands()
 
+    @property
+    def dir_path(self) -> str:
+        return path.abspath(path.dirname(self.path))
+
     def handle_sources(self, iam_override=None, session_override=None):
         """
         Handles files from external sources
@@ -190,8 +187,7 @@ def render_jinja(self):
             template = jinja_env.get_template(path.basename(self.path))
             self.content = template.render(env=os.environ)
             self.write_content(is_template=False)
-        except jinja2.exceptions.TemplateNotFound as error:
-            LOG.exception(error)
+        except jinja2.exceptions.TemplateNotFound:
             LOG.error(listdir(self.templates_dir.name))
             raise
 

ecs_files_composer/input.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  ecs-files-input.json
-#   timestamp: 2022-07-28T00:59:13+00:00
+#   timestamp: 2022-07-28T09:25:01+00:00
 
 from __future__ import annotations