fix function names

ls1intum · Dec 17, 2023 · 51ade29 · 51ade29
1 parent f636c4f
commit 51ade29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/cli/generators/cli.py b/cli/generators/cli.py
@@ -1,5 +1,6 @@
 # pylint: disable=duplicate-code
 import os
+import re
 import subprocess
 import tempfile
 import typing
@@ -64,7 +65,7 @@ def add_postfix(self) -> None:
         # to enable sourceing the script, we need to skip execution if we do so
         # for that, we check if the first parameter is sourcing, which is not ever given to the script elsewhere
         self.add_line(indentation=2, line='local _current_lifecycle="${1}"')
-        self.add_line(indentation=4, line='if [[ "${{_current_lifecycle}}" == "aeolus_sourcing" ]]; then')
+        self.add_line(indentation=4, line='if [[ "${_current_lifecycle}" == "aeolus_sourcing" ]]; then')
         self.add_line(indentation=4, line="# just source to use the methods in the subshell, no execution")
         self.add_line(indentation=4, line="return 0")
         self.add_line(indentation=2, line="fi")
@@ -169,9 +170,10 @@ def handle_step(self, name: str, step: ScriptAction, call: bool) -> None:
         self.result.append(f"# step {name}")
         self.result.append(f"# generated from step {original_name}")
         self.result.append(f"# original type was {original_type}")
+        valid_funtion_name: str = re.sub('[^a-zA-Z]+', '', name)
         if call:
-            self.functions.append(name)
-        self.result.append(f"{name} () " + "{")
+            self.functions.append(valid_funtion_name)
+        self.result.append(f"{valid_funtion_name} () " + "{")
         self.add_lifecycle_guards(name=name, exclusions=step.excludeDuring, indentations=2)
 
         self.add_line(indentation=2, line="echo '⚙️ executing " f"{name}'")

diff --git a/cli/test/test_generate.py b/cli/test/test_generate.py
@@ -50,8 +50,10 @@ def test_generate_valid_cli_script(self) -> None:
             result: str = cli.generate()
             self.assertTrue(result.count("#!/usr/bin/env bash") == 1)
             self.assertTrue("set -e" in result)
-            # two comments, one definition, one echo for execution, one echo in the actual action, and one call
-            self.assertTrue(result.count("internal-action") == 5)
+            # two comments, one echo for execution, one echo in the actual action
+            self.assertTrue(result.count("internal-action") == 3)
+            # one call to the function and the function itself
+            self.assertTrue(result.count("internalaction") == 2)
             self.assertTrue(result.count("{") == result.count("}"))
             self.assertTrue(cli.check(content=result))