fixed issues

Author: ndbroadbent

src/commands/generate.rs

@@ -1,6 +1,7 @@
 use anyhow::{Context, Result};
 use std::path::PathBuf;
 
+#[allow(clippy::collapsible_if)]
 /// Generate CI configs from cigen.yml
 pub fn generate_command(file: Option<String>, output: Option<String>) -> Result<()> {
     // Find cigen.yml

src/loader.rs

@@ -255,14 +255,6 @@ fn resolve_job_dependencies(jobs: &mut HashMap<String, Job>) {
     }
 }
 
-fn should_prefix_job(config: &WorkflowConfig, stage: &str) -> bool {
-    if stage == "default" {
-        config.default_stage_prefix
-    } else {
-        config.stage_prefix
-    }
-}
-
 fn load_workflow_config(workflow_path: &Path) -> Result<WorkflowConfig> {
     for candidate in ["config.yml", "config.yaml"] {
         let candidate_path = workflow_path.join(candidate);

src/orchestrator/convert.rs

@@ -373,6 +373,7 @@ mod tests {
                 artifacts: vec![],
                 extra: HashMap::new(),
                 workflow: None,
+                stage: None,
             },
         );
 

src/orchestrator/dag.rs

@@ -250,7 +250,7 @@ fn expand_matrix_job(
     // But if we have "ci/rspec", stage="ci". "ci_rspec".
     // If we have "deploy/pre_release", stage="deploy_us". "deploy_us_pre_release".
     // So we just want the file stem.
-    let base_short_name = job_id.split('/').last().unwrap_or(job_id);
+    let base_short_name = job_id.split('/').next_back().unwrap_or(job_id);
 
     // Sanitize base name (replace / with _ just in case, though split should handle it)
     let base_clean_name = base_short_name.replace('/', "_");
@@ -327,7 +327,7 @@ fn expand_matrix_job(
 
                 let mut substituted_job = job.clone();
                 for need in substituted_job.needs.iter_mut() {
-                    *need = substitute_matrix_in_string(need, &row);
+                    *need = substitute_matrix_in_string(need, row);
                 }
 
                 instances.push(ConcreteJob {
@@ -472,6 +472,7 @@ mod tests {
             artifacts: vec![],
             extra: HashMap::new(),
             workflow: None,
+            stage: None,
         }
     }
 
@@ -686,7 +687,12 @@ mod tests {
 
         let result = JobDAG::build(&config);
         assert!(result.is_err());
-        assert!(result.unwrap_err().to_string().contains("doesn't exist"));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("no matching job instance exists")
+        );
     }
 
     #[test]

src/orchestrator/mod.rs

@@ -5,6 +5,3 @@ mod workflow;
 
 pub use dag::{ConcreteJob, JobDAG};
 pub use workflow::{FileFragment, GenerationResult, MergeStrategy, WorkflowOrchestrator};
-
-use crate::schema::CigenConfig;
-use std::collections::HashMap;

src/schema/job.rs

@@ -292,12 +292,16 @@ matrix:
 "#;
 
         let job: Job = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(job.matrix.len(), 2);
 
-        if let Some(MatrixDimension::List(values)) = job.matrix.get("ruby") {
-            assert_eq!(values, &vec!["3.2", "3.3"]);
-        } else {
-            panic!("Expected ruby matrix dimension");
+        match job.matrix {
+            Some(JobMatrix::Dimensions(dims)) => {
+                assert_eq!(dims.len(), 2);
+                assert_eq!(
+                    dims.get("ruby").unwrap(),
+                    &vec!["3.2".to_string(), "3.3".to_string()]
+                );
+            }
+            _ => panic!("Expected dimensions matrix"),
         }
     }
 

tests/circleci_job_status.rs

@@ -167,14 +167,16 @@ fn circleci_job_status_steps_for_rails_fixture() {
     let jobs = load_jobs_map(&output.path().join(".circleci/main.yml"));
 
     for job_id in &with_sources {
-        let job_value = jobs.get(job_id).unwrap_or_else(|| {
-            panic!("expected job {job_id} in generated main.yml");
+        let sanitized_id = job_id.replace(['/', '\\'], "_");
+        let job_value = jobs.get(&sanitized_id).unwrap_or_else(|| {
+            panic!("expected job {sanitized_id} (from {job_id}) in generated main.yml");
         });
         assert_has_job_status_steps(job_id, job_value);
     }
 
     for job_id in &without_sources {
-        if let Some(job_value) = jobs.get(job_id) {
+        let sanitized_id = job_id.replace(['/', '\\'], "_");
+        if let Some(job_value) = jobs.get(&sanitized_id) {
             assert_absent_job_status_steps(job_id, job_value);
         }
     }
@@ -197,14 +199,16 @@ fn circleci_job_status_steps_for_docspring_config() {
     let jobs = load_jobs_map(&output.path().join(".circleci/main.yml"));
 
     for job_id in &with_sources {
-        let job_value = jobs.get(job_id).unwrap_or_else(|| {
-            panic!("expected job {job_id} in generated main.yml");
+        let sanitized_id = job_id.replace(['/', '\\'], "_");
+        let job_value = jobs.get(&sanitized_id).unwrap_or_else(|| {
+            panic!("expected job {sanitized_id} (from {job_id}) in generated main.yml");
         });
         assert_has_job_status_steps(job_id, job_value);
     }
 
     for job_id in &without_sources {
-        if let Some(job_value) = jobs.get(job_id) {
+        let sanitized_id = job_id.replace(['/', '\\'], "_");
+        if let Some(job_value) = jobs.get(&sanitized_id) {
             assert_absent_job_status_steps(job_id, job_value);
         }
     }

tests/schema_parsing.rs

@@ -1,5 +1,5 @@
 /// Tests for parsing example cigen.yml configs
-use cigen::schema::CigenConfig;
+use cigen::schema::{CigenConfig, JobMatrix};
 use std::fs;
 
 #[test]
@@ -32,9 +32,13 @@ fn test_parse_rails_app_example() {
 
     // Check test job has matrix
     let test_job = &config.jobs["test"];
-    assert!(!test_job.matrix.is_empty());
-    assert!(test_job.matrix.contains_key("ruby"));
-    assert!(test_job.matrix.contains_key("arch"));
+    if let Some(JobMatrix::Dimensions(dims)) = &test_job.matrix {
+        assert!(!dims.is_empty());
+        assert!(dims.contains_key("ruby"));
+        assert!(dims.contains_key("arch"));
+    } else {
+        panic!("Expected Dimensions matrix for test job");
+    }
 
     // Check services
     assert_eq!(test_job.services.len(), 2);
@@ -105,7 +109,11 @@ jobs:
     let config = CigenConfig::from_yaml(yaml).unwrap();
     let test_job = &config.jobs["test"];
 
-    assert_eq!(test_job.matrix.len(), 2);
-    assert!(test_job.matrix.contains_key("ruby"));
-    assert!(test_job.matrix.contains_key("node"));
+    if let Some(JobMatrix::Dimensions(dims)) = &test_job.matrix {
+        assert_eq!(dims.len(), 2);
+        assert!(dims.contains_key("ruby"));
+        assert!(dims.contains_key("node"));
+    } else {
+        panic!("Expected Dimensions matrix for test job");
+    }
 }