torizon-templates-utils 0.0.11__py3-none-any.whl → 1.1.0__py3-none-any.whl

torizon_templates_utils/tasks.py

@@ -13,6 +13,12 @@ from torizon_templates_utils.colors import print, Color
 
 T = TypeVar('T')
 
+REPLACE_WHITELIST = [
+    "torizon_",
+    "docker_",
+    "inputBox-"
+]
+
 def replace_tasks_input():
     for file in Path('.').rglob('*.json'):
         print(file, flush=True)
@@ -23,9 +29,9 @@ def replace_tasks_input():
                 with open(file, 'r') as f:
                     content = f.read()
 
-                content = content.replace("input:dockerLogin", "command:docker_login")
-                content = content.replace("input:dockerImageRegistry", "command:docker_registry")
-                content = content.replace("input:dockerPsswd", "command:docker_password")
+                content = content.replace("input:dockerLogin", "command:docker_login.__change__")
+                content = content.replace("input:dockerImageRegistry", "command:inputBox-docker_registry.__change__")
+                content = content.replace("input:dockerPsswd", "command:docker_password.__change__")
 
                 with open(file, 'w') as f:
                     f.write(content)
@@ -476,8 +482,8 @@ class TaskRunner:
             self.__can_receive_interactive_input = True
 
         # environment configs
-        if "DOCKER_PSSWD" in os.environ:
-            os.environ["config:docker_password"] = os.environ["DOCKER_PSSWD"]
+        if "DOCKER_PASSWORD" in os.environ:
+            os.environ["config:docker_password"] = os.environ["DOCKER_PASSWORD"]
 
         if "GITLAB_CI" in os.environ:
             self.__gitlab_ci = True
@@ -570,7 +576,42 @@ class TaskRunner:
 
         for value in env:
             if "${command:torizon_" in value:
+                # here is not needed to clean the torizon_<prop>.<project_name>
+                # because this will be handled on the cmd args check
                 value = value.replace("${command:torizon_", "${config:torizon_")
+
+            ret.append(value)
+
+        return ret
+
+
+    def __check_input_boxes(self, env: List[str]) -> List[str]:
+        ret: List[str] = []
+
+        for value in env:
+            value = value.replace("${command:inputBox-", "${config:")
+            ret.append(value)
+
+        return ret
+
+
+    def __check_cmd_args(self, env: List[str]) -> List[str]:
+        ret: List[str] = []
+
+        for value in env:
+            for whitelisted_start in REPLACE_WHITELIST:
+                if value.startswith("${command:" + whitelisted_start) or value.startswith("${config:" + whitelisted_start):
+
+                    if "." in value:
+                        value_p1, value_p2 = value.split(".", 1)
+                        ret_p2 = value_p2.split("}", 1)
+
+                        if len(ret_p2) > 1:
+                            value = f"{value_p1}}}{ret_p2[1]}"
+                        else:
+                            value = f"{value_p1}}}"
+                    break
+
             ret.append(value)
 
         return ret
@@ -827,7 +868,9 @@ class TaskRunner:
 
             if _env_value:
                 expvalue = [_env_value]
+                expvalue = self.__check_cmd_args(expvalue)
                 expvalue = self.__check_workspace_folder(expvalue)
+                expvalue = self.__check_input_boxes(expvalue)
                 expvalue = self.__check_torizon_inputs(expvalue)
                 expvalue = self.__check_docker_inputs(expvalue)
                 expvalue = self.__check_tcb_inputs(expvalue)
@@ -888,7 +931,9 @@ class TaskRunner:
         _cmd = _task.command
 
         # the cmd itself can use the mechanism to replace stuff
+        _cmd = self.__check_cmd_args([_cmd])[0]
         _cmd = self.__check_workspace_folder([_cmd])[0]
+        _cmd = self.__check_input_boxes([_cmd])[0]
         _cmd = self.__check_torizon_inputs([_cmd])[0]
         _cmd = self.__check_docker_inputs([_cmd])[0]
         _cmd = self.__check_tcb_inputs([_cmd])[0]
@@ -916,7 +961,9 @@ class TaskRunner:
         # FIXME:    The scape args was in the powershell implementation
         #           but when used on Python it generates weird behavior
         # _args = self.__scape_args(_args)
+        _args = self.__check_cmd_args(_args)
         _args = self.__check_workspace_folder(_args)
+        _args = self.__check_input_boxes(_args)
         _args = self.__check_torizon_inputs(_args)
         _args = self.__check_docker_inputs(_args)
         _args = self.__check_tcb_inputs(_args)
@@ -924,9 +971,12 @@ class TaskRunner:
         _args = self.__check_vscode_env(_args)
         _args = self.__check_config(_args)
         _args = self.__check_workspace_folder(_args)
+
+        if _shell:
+            _args = self.__check_long_args(_args)
+
         # FIXME:    These was in the powershell implementation
         #           but when used on Python it generates weird behavior
-        # _args = self.__check_long_args(_args)
         # _args = self.__quoting_special_chars(_args)
 
         # if in gitlab ci env we need to replace the DOCKER_HOST

{torizon_templates_utils-0.0.11.dist-info → torizon_templates_utils-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: torizon_templates_utils
-Version: 0.0.11
+Version: 1.1.0
 Summary: Package with utilities for Torizon Templates scripts
 Author-email: Matheus Castello <matheus.castello@toradex.com>
 Project-URL: Homepage, https://github.com/torizon/vscode-torizon-templates

{torizon_templates_utils-0.0.11.dist-info → torizon_templates_utils-1.1.0.dist-info}/RECORD

@@ -5,8 +5,8 @@ torizon_templates_utils/colors.py,sha256=Y1FZ0HtKvXfLGYTDclsXubtZCQ-epuch5Dgk1DJ
 torizon_templates_utils/debug.py,sha256=OfdKSdN1kypuJnV_WcPa9bvonjyDvXvA3QTmc1iKyjw,556
 torizon_templates_utils/errors.py,sha256=Wkk0AeCx0KQW-Qlu_5A6GYaGUkaJU79Mok8lZuZKHjM,1425
 torizon_templates_utils/network.py,sha256=SFZivQumv-pVL0vglYCW3JS6WWCUG8asoMdgljeJZ24,1703
-torizon_templates_utils/tasks.py,sha256=lDRIF9EXA-cjzLqWYmcf717M4pu6LkJYY5fYbuSu80Y,34597
-torizon_templates_utils-0.0.11.dist-info/METADATA,sha256=PmYKN9vm5QHKexPGflu7Jm8fVnZLpK1iKEd-4a8e_Vw,977
-torizon_templates_utils-0.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-torizon_templates_utils-0.0.11.dist-info/top_level.txt,sha256=qlOkS1ASF5C-kSfpbiWbVHJFgmQ0RN6iunmLArNt6zc,24
-torizon_templates_utils-0.0.11.dist-info/RECORD,,
+torizon_templates_utils/tasks.py,sha256=nUaivwvFnmpRvqr7rV2Vmrckui_sSoIYpzxSvKOw4rs,36168
+torizon_templates_utils-1.1.0.dist-info/METADATA,sha256=_3L-q3N1QO6pQt2M8-iM1-DUy4x9RvvuBaMLYVjigtQ,976
+torizon_templates_utils-1.1.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+torizon_templates_utils-1.1.0.dist-info/top_level.txt,sha256=qlOkS1ASF5C-kSfpbiWbVHJFgmQ0RN6iunmLArNt6zc,24
+torizon_templates_utils-1.1.0.dist-info/RECORD,,

{torizon_templates_utils-0.0.11.dist-info → torizon_templates_utils-1.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any