Better parameter for context

Author: JohnPreston

ecs_files_composer/cli.py

@@ -61,11 +61,10 @@ def main():
         default=False,
     )
     parser.add_argument(
-        "--with-jinja",
-        help="Whether the source config should be rendered with Jinja2",
-        action="store_true",
+        "--context",
+        help="Indicate which context to use (valid: jinja2|plain). Default is jinja2",
         required=False,
-        default=False,
+        default="jinja2",
     )
     parser.add_argument("_", nargs="*")
     args = parser.parse_args()
@@ -77,37 +76,37 @@ def main():
         config = init_config(
             env_var="ECS_CONFIG_CONTENT",
             decode_base64=bool(environ.get("DECODE_BASE64", False)),
-            with_jinja=bool(environ.get("WITH_JINJA", False)),
+            context=environ.get("context", "jinja2"),
         )
     elif args.env_var:
         config = init_config(
             env_var=args.env_var,
             decode_base64=args.decode_base64,
-            with_jinja=args.with_jinja,
+            context=args.context,
         )
     elif args.file_path:
         config = init_config(
             file_path=args.file_path,
             decode_base64=args.decode_base64,
-            with_jinja=args.with_jinja,
+            context=args.context,
         )
     elif args.ssm_config:
         config = init_config(
             ssm_parameter=args.ssm_config,
             decode_base64=args.decode_base64,
-            with_jinja=args.with_jinja,
+            context=args.context,
         )
     elif args.s3_config:
         config = init_config(
             s3_config=args.s3_config,
             decode_base64=args.decode_base64,
-            with_jinja=args.with_jinja,
+            context=args.context,
         )
     elif args.secret_config:
         config = init_config(
             secret_config=args.secret_config,
             decode_base64=args.decode_base64,
-            with_jinja=args.with_jinja,
+            context=args.context,
         )
     else:
         raise parser.error(

ecs_files_composer/ecs_files_composer.py

@@ -29,7 +29,7 @@ def init_config(
     role_arn=None,
     external_id=None,
     decode_base64=False,
-    with_jinja=False,
+    context=None,
 ):
     """
     Function to initialize the configuration
@@ -94,8 +94,8 @@ def init_config(
     }
     if decode_base64:
         initial_config["encoding"] = "base64"
-    if with_jinja:
-        initial_config["context"] = "jinja2"
+    if context:
+        initial_config["context"] = context
     start_jobs(jobs_input_def)
     with open(config_path, "r") as config_fd:
         try: