Merge pull request #24 from kravvcu/feature/support-hyphens-in-instance-variable-values

fix: permit instance variable values to contain dashes

Author: randombenj

gcasc/instance_variables.py

@@ -96,9 +96,9 @@ def _validate(self, errors):  # type: (ValidationResult) -> ()
                     errors.add("must have at least 8 chars to be masked", path=path)
                 if "\n" in value:
                     errors.add("must be in a single line to be masked", path=path)
-                if not bool(re.match(r"[a-zA-Z0-9+/=@:]+$", value)):
+                if not bool(re.match(r"[a-zA-Z0-9+/=@:\-]+$", value)):
                     errors.add(
-                        "must consist only of characters from Base64 alphabet plus '@', ':'",
+                        "must consist only of characters from Base64 alphabet plus '@', ':', '-'",
                         path=path,
                     )
         return errors

test-requirements.txt

@@ -1,4 +1,7 @@
 pytest>=5.2.4
 pytest-cov>=2.8.1
-mock>=3.0.5
-flake8>=3.7.9
+
+# pin mock version due to some weird issue
+# https://github.com/Roche/gitlab-configuration-as-code/runs/1736343549?check_suite_focus=true
+mock==4.0.2
+flake8>=3.7.9