Merge "Allow hyphens in Workflow and ad-hoc action names"

mistral/tests/resources/workbook/v2/workbook_schema_test.yaml

@@ -16,6 +16,9 @@ actions:
     actionversionaction:
         base: std.noop
 
+    action-action:
+        base: std.noop
+
 workflows:
 
   workflowversion:
@@ -41,3 +44,9 @@ workflows:
     tasks:
       task1:
         workflow: workflowversion
+
+  workflow-with-hyphen:
+    description: Workflow name containing -
+    tasks:
+      task1:
+        action: action-action

mistral/tests/unit/workbook/v2/test_workbook.py

@@ -412,6 +412,7 @@ class WorkbookSpecValidation(base.WorkbookSpecValidationTestCase):
             "versionworkflow",
             "workflowversionworkflow",
             "version_workflow",
+            "version-workflow",
         )
 
         for valid in valid_names:

mistral/workbook/v2/workbook.py

@@ -18,7 +18,7 @@ from mistral.workbook.v2 import base
 from mistral.workbook.v2 import workflows as wf
 
 # We want to match any single word that isn't exactly "version"
-NON_VERSION_WORD_REGEX = "^(?!version$)\w+$"
+NON_VERSION_WORD_REGEX = "^(?!version$)[\w-]+$"
 
 
 class WorkbookSpec(base.BaseSpec):