removing unused for-file code

Author: perryqh

src/bin/compare_for_file.rs

@@ -109,7 +109,7 @@ pub fn cli() -> Result<RunResult, RunnerError> {
         Command::Validate => runner::validate(&run_config, vec![]),
         Command::Generate { skip_stage } => runner::generate(&run_config, !skip_stage),
         Command::GenerateAndValidate { skip_stage } => runner::generate_and_validate(&run_config, vec![], !skip_stage),
-        Command::ForFile { name, fast } => runner::for_file(&run_config, &name, fast),
+        Command::ForFile { name, fast: _ } => runner::for_file(&run_config, &name),
         Command::ForTeam { name } => runner::for_team(&run_config, &name),
         Command::DeleteCache => runner::delete_cache(&run_config),
     };

src/cli.rs

@@ -36,37 +36,8 @@ pub struct Runner {
     cache: Cache,
 }
 
-pub fn for_file(run_config: &RunConfig, file_path: &str, fast: bool) -> RunResult {
-    if fast {
-        for_file_from_codeowners(run_config, file_path)
-    } else {
-        //run_with_runner(run_config, |runner| runner.for_file(file_path))
-        for_file_optimized(run_config, file_path)
-    }
-}
-
-fn for_file_from_codeowners(run_config: &RunConfig, file_path: &str) -> RunResult {
-    match team_for_file_from_codeowners(run_config, file_path) {
-        Ok(Some(team)) => {
-            let relative_team_yml_path = team.path.strip_prefix(&run_config.project_root).unwrap_or(&team.path);
-
-            RunResult {
-                info_messages: vec![
-                    format!("Team: {}", team.name),
-                    format!("Team YML: {}", relative_team_yml_path.display()),
-                ],
-                ..Default::default()
-            }
-        }
-        Ok(None) => RunResult {
-            info_messages: vec!["Team: Unowned".to_string(), "Team YML:".to_string()],
-            ..Default::default()
-        },
-        Err(err) => RunResult {
-            io_errors: vec![err.to_string()],
-            ..Default::default()
-        },
-    }
+pub fn for_file(run_config: &RunConfig, file_path: &str) -> RunResult {
+    for_file_optimized(run_config, file_path)
 }
 
 pub fn team_for_file_from_codeowners(run_config: &RunConfig, file_path: &str) -> Result<Option<Team>, Error> {
@@ -289,41 +260,6 @@ impl Runner {
             .output();
     }
 
-    // TODO: remove this once we've verified the fast path is working
-    #[allow(dead_code)]
-    pub fn for_file(&self, file_path: &str) -> RunResult {
-        let relative_file_path = Path::new(file_path)
-            .strip_prefix(&self.run_config.project_root)
-            .unwrap_or(Path::new(file_path));
-        let file_owners = match self.ownership.for_file(relative_file_path) {
-            Ok(file_owners) => file_owners,
-            Err(err) => {
-                return RunResult {
-                    io_errors: vec![err.to_string()],
-                    ..Default::default()
-                };
-            }
-        };
-        let info_messages: Vec<String> = match file_owners.len() {
-            0 => vec![format!("{}", FileOwner::default())],
-            1 => vec![format!("{}", file_owners[0])],
-            _ => {
-                let mut error_messages = vec!["Error: file is owned by multiple teams!".to_string()];
-                for file_owner in file_owners {
-                    error_messages.push(format!("\n{}", file_owner));
-                }
-                return RunResult {
-                    validation_errors: error_messages,
-                    ..Default::default()
-                };
-            }
-        };
-        RunResult {
-            info_messages,
-            ..Default::default()
-        }
-    }
-
     pub fn for_team(&self, team_name: &str) -> RunResult {
         let mut info_messages = vec![];
         let mut io_errors = vec![];

src/runner.rs

@@ -61,24 +61,6 @@ fn test_for_file() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-#[test]
-fn test_fast_for_file() -> Result<(), Box<dyn Error>> {
-    Command::cargo_bin("codeowners")?
-        .arg("--project-root")
-        .arg("tests/fixtures/invalid_project")
-        .arg("--no-cache")
-        .arg("for-file")
-        .arg("--fast")
-        .arg("ruby/app/models/blockchain.rb")
-        .assert()
-        .success()
-        .stdout(predicate::eq(indoc! {"
-            Team: Unowned
-            Team YML:
-        "}));
-    Ok(())
-}
-
 #[test]
 fn test_for_file_multiple_owners() -> Result<(), Box<dyn Error>> {
     Command::cargo_bin("codeowners")?

tests/invalid_project_test.rs

@@ -86,13 +86,15 @@ fn test_fast_for_file() -> Result<(), Box<dyn Error>> {
         .arg("tests/fixtures/valid_project")
         .arg("--no-cache")
         .arg("for-file")
-        .arg("--fast")
         .arg("ruby/app/models/payroll.rb")
         .assert()
         .success()
         .stdout(predicate::eq(indoc! {"
             Team: Payroll
+            Github Team: @PayrollTeam
             Team YML: config/teams/payroll.yml
+            Description:
+            - Owner annotation at the top of the file
         "}));
     Ok(())
 }
@@ -127,13 +129,15 @@ fn test_fast_for_file_full_path() -> Result<(), Box<dyn Error>> {
         .arg(project_root)
         .arg("--no-cache")
         .arg("for-file")
-        .arg("--fast")
         .arg(for_file_absolute_path.to_str().unwrap())
         .assert()
         .success()
         .stdout(predicate::eq(indoc! {"
             Team: Payroll
+            Github Team: @PayrollTeam
             Team YML: config/teams/payroll.yml
+            Description:
+            - Owner annotation at the top of the file
         "}));
     Ok(())
 }
@@ -186,13 +190,16 @@ fn test_fast_for_file_same_team_multiple_ownerships() -> Result<(), Box<dyn Erro
         .arg("tests/fixtures/valid_project")
         .arg("--no-cache")
         .arg("for-file")
-        .arg("--fast")
         .arg("javascript/packages/PayrollFlow/index.tsx")
         .assert()
         .success()
         .stdout(predicate::eq(indoc! {"
             Team: Payroll
+            Github Team: @PayrollTeam
             Team YML: config/teams/payroll.yml
+            Description:
+            - Owner annotation at the top of the file
+            - Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
         "}));
     Ok(())
 }