use relative instead of absolute paths when displaying team mismatch error messages

Author: mzruya

src/ownership.rs

@@ -1,4 +1,4 @@
-use std::rc::Rc;
+use std::sync::Arc;
 use tracing::{debug, instrument};
 
 mod file_generator;
@@ -19,7 +19,7 @@ use self::{
 };
 
 pub struct Ownership {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 pub struct Entry {
@@ -36,7 +36,9 @@ impl Entry {
 
 impl Ownership {
     pub fn build(project: Project) -> Self {
-        Self { project: Rc::new(project) }
+        Self {
+            project: Arc::new(project),
+        }
     }
 
     #[instrument(level = "debug", skip_all)]

src/ownership/mapper/package_mapper.rs

@@ -1,24 +1,24 @@
-use std::rc::Rc;
+use std::sync::Arc;
 
 use super::Entry;
 use super::{Mapper, OwnerMatcher};
 use crate::project::{Package, PackageType, Project};
 use itertools::Itertools;
 
 pub struct RubyPackageMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 pub struct JavascriptPackageMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 struct PackageMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 impl RubyPackageMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }
@@ -38,7 +38,7 @@ impl Mapper for RubyPackageMapper {
 }
 
 impl JavascriptPackageMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }
@@ -58,7 +58,7 @@ impl Mapper for JavascriptPackageMapper {
 }
 
 impl PackageMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }

src/ownership/mapper/team_file_mapper.rs

@@ -1,17 +1,17 @@
 use std::collections::HashMap;
 use std::path::PathBuf;
-use std::rc::Rc;
+use std::sync::Arc;
 
 use super::Entry;
 use super::{Mapper, OwnerMatcher};
 use crate::project::Project;
 
 pub struct TeamFileMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 impl TeamFileMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }

src/ownership/mapper/team_gem_mapper.rs

@@ -1,15 +1,15 @@
-use std::rc::Rc;
+use std::sync::Arc;
 
 use super::Entry;
 use super::{Mapper, OwnerMatcher};
 use crate::project::Project;
 
 pub struct TeamGemMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 impl TeamGemMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }

src/ownership/mapper/team_glob_mapper.rs

@@ -1,15 +1,15 @@
-use std::rc::Rc;
+use std::sync::Arc;
 
 use super::Entry;
 use super::{Mapper, OwnerMatcher};
 use crate::project::Project;
 
 pub struct TeamGlobMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 impl TeamGlobMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }

src/ownership/mapper/team_yml_mapper.rs

@@ -1,17 +1,17 @@
 use std::collections::HashMap;
 use std::path::PathBuf;
-use std::rc::Rc;
+use std::sync::Arc;
 
 use super::Entry;
 use super::{Mapper, OwnerMatcher};
 use crate::project::Project;
 
 pub struct TeamYmlMapper {
-    project: Rc<Project>,
+    project: Arc<Project>,
 }
 
 impl TeamYmlMapper {
-    pub fn build(project: Rc<Project>) -> Self {
+    pub fn build(project: Arc<Project>) -> Self {
         Self { project }
     }
 }

src/ownership/validator.rs

@@ -1,13 +1,10 @@
+use crate::project::{Project, ProjectFile};
 use core::fmt;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::fmt::Display;
-use std::path::Path;
-
 use std::path::PathBuf;
-use std::rc::Rc;
-
-use crate::project::{Project, ProjectFile};
+use std::sync::Arc;
 
 use error_stack::Context;
 use itertools::Itertools;
@@ -20,7 +17,7 @@ use super::file_generator::FileGenerator;
 use super::mapper::{Mapper, OwnerMatcher};
 
 pub struct Validator {
-    pub project: Rc<Project>,
+    pub project: Arc<Project>,
     pub mappers: Vec<Box<dyn Mapper>>,
     pub file_generator: FileGenerator,
 }
@@ -76,6 +73,8 @@ impl Validator {
     }
 
     fn invalid_team_annotation(&self, team_names: &HashSet<&String>) -> Vec<Error> {
+        let project = self.project.clone();
+
         self.project
             .files
             .par_iter()
@@ -84,7 +83,7 @@ impl Validator {
                     if !team_names.contains(owner) {
                         return Some(Error::InvalidTeam {
                             name: owner.clone(),
-                            path: file.path.clone(),
+                            path: project.relative_path(&file.path).to_owned(),
                         });
                     }
                 }
@@ -102,7 +101,7 @@ impl Validator {
                 if !team_names.contains(&package.owner) {
                     Some(Error::InvalidTeam {
                         name: package.owner.clone(),
-                        path: package.path.clone(),
+                        path: self.project.relative_path(&package.path).to_owned(),
                     })
                 } else {
                     None
@@ -142,20 +141,20 @@ impl Validator {
 
     fn file_to_owners(&self) -> Vec<(&ProjectFile, Vec<Owner>)> {
         let owner_matchers: Vec<OwnerMatcher> = self.mappers.iter().flat_map(|mapper| mapper.owner_matchers()).collect();
+        let project = self.project.clone();
 
-        let files: Vec<(&ProjectFile, &Path)> = self
-            .project
+        self.project
             .files
-            .iter()
-            .filter(|file| !self.project.skip_file(file))
-            .map(|file| (file, self.project.relative_path(&file.path)))
-            .collect();
-
-        files
             .par_iter()
-            .map(|(project_file, relative_path)| {
+            .filter_map(|project_file| {
                 let mut owners_and_source: HashMap<&String, Vec<String>> = HashMap::new();
 
+                if project.skip_file(project_file) {
+                    return None;
+                }
+
+                let relative_path = project.relative_path(&project_file.path);
+
                 for owner_matcher in &owner_matchers {
                     let owner = owner_matcher.owner_for(relative_path);
 
@@ -174,7 +173,7 @@ impl Validator {
                     })
                     .collect_vec();
 
-                (*project_file, owners)
+                Some((project_file, owners))
             })
             .collect()
     }