Cleanup

Author: ecolternv

src/cli/workflow.py

@@ -1115,8 +1115,6 @@ def _load_workflow_text(workflow_file: str) -> str:
         file_text = file.read()
 
         sections = workflow_utils.parse_workflow_spec(file_text)
-        if 'workflow' not in sections:
-            raise osmo_errors.OSMOUserError('Workflow spec not found.')
         return sections['workflow']
 
 

src/lib/utils/workflow.py

@@ -44,7 +44,7 @@ def parse_workflow_spec(workflow_spec: str) -> Dict[str, str]:
     Each top-level key (e.g. workflow:, resources:, default-values:) becomes an entry in the
     returned dict. The value is the full raw text block for that section, including the key line
     itself, with no YAML parsing applied. Raises OSMOUserError if any top-level key appears more
-    than once.
+    than once, or if no workflow section is present.
     """
     section_pattern = re.compile(
         r'^([a-zA-Z][a-zA-Z0-9_-]*):(.*?)(?=^[a-zA-Z][a-zA-Z0-9_-]*:|\Z)',
@@ -58,4 +58,6 @@ def parse_workflow_spec(workflow_spec: str) -> Dict[str, str]:
             raise osmo_errors.OSMOUserError(
                 f'Duplicate top-level key "{key}" found in the workflow spec.')
         sections[key] = raw_block
+    if 'workflow' not in sections:
+        raise osmo_errors.OSMOUserError('Workflow spec not found.')
     return sections

src/utils/job/app.py

@@ -293,6 +293,4 @@ def update_status(self, database: connectors.PostgresConnector, status: AppStatu
 
 def validate_app_content(app_content: str):
     """ Validate the app content """
-    sections = workflow_utils.parse_workflow_spec(app_content)
-    if 'workflow' not in sections:
-        raise osmo_errors.OSMOUserError('Workflow spec not found.')
+    workflow_utils.parse_workflow_spec(app_content)

src/utils/job/workflow.py

@@ -791,12 +791,10 @@ def load_template_with_variables(self) -> str:
             if unknown_sections:
                 raise osmo_errors.OSMOUserError(
                     f'Unknown top-level keys in workflow spec: {sorted(unknown_sections)}')
-            if 'workflow' not in sections:
-                raise osmo_errors.OSMOUserError('Workflow spec not found.')
             file_text = sections['workflow']
             template_data: Dict[str, Any] = {}
             if 'default-values' in sections:
-                template_data = yaml.safe_load(sections['default-values'])['default-values']
+                template_data = yaml.safe_load(sections['default-values'])['default-values'] or {}
 
             # Get CLI set values
             for data in self.set_variables: