refactor: remove logic from the run module

Author: GuillaumeLagrange

src/cli/exec/mod.rs

@@ -1,12 +1,12 @@
 use crate::api_client::CodSpeedAPIClient;
 use crate::binary_installer::ensure_binary_installed;
 use crate::cli::run::show_banner;
-use crate::cli::run::uploader::UploadResult;
 use crate::config::CodSpeedConfig;
 use crate::executor;
 use crate::prelude::*;
 use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
+use crate::upload::UploadResult;
 use clap::Args;
 use std::path::Path;
 

src/cli/exec/poll_results.rs

@@ -1,53 +1,16 @@
 use console::style;
-use tokio::time::{Instant, sleep};
 
-use crate::api_client::{
-    CodSpeedAPIClient, FetchLocalRunReportResponse, FetchLocalRunReportVars, RunStatus,
-};
-use crate::cli::run::helpers::benchmark_display::{
-    POLLING_INTERVAL, RUN_PROCESSING_MAX_DURATION, build_benchmark_table, build_detailed_summary,
-};
-use crate::cli::run::uploader::UploadResult;
+use crate::api_client::CodSpeedAPIClient;
+use crate::cli::run::helpers::benchmark_display::{build_benchmark_table, build_detailed_summary};
 use crate::prelude::*;
+use crate::upload::{UploadResult, poll_run_report};
 
 #[allow(clippy::borrowed_box)]
 pub async fn poll_results(
     api_client: &CodSpeedAPIClient,
     upload_result: &UploadResult,
 ) -> Result<()> {
-    let start = Instant::now();
-    let fetch_local_run_report_vars = FetchLocalRunReportVars {
-        owner: upload_result.owner.clone(),
-        name: upload_result.repository.clone(),
-        run_id: upload_result.run_id.clone(),
-    };
-
-    let response;
-    loop {
-        if start.elapsed() > RUN_PROCESSING_MAX_DURATION {
-            bail!("Polling results timed out");
-        }
-
-        let fetch_result = api_client
-            .fetch_local_run_report(fetch_local_run_report_vars.clone())
-            .await?;
-
-        match fetch_result {
-            FetchLocalRunReportResponse { run, .. }
-                if run.status == RunStatus::Pending || run.status == RunStatus::Processing =>
-            {
-                sleep(POLLING_INTERVAL).await;
-            }
-            response_from_api => {
-                response = response_from_api;
-                break;
-            }
-        }
-    }
-
-    if response.run.status == RunStatus::Failure {
-        bail!("Run failed to be processed, try again in a few minutes");
-    }
+    let response = poll_run_report(api_client, upload_result).await?;
 
     if !response.run.results.is_empty() {
         end_group!();

src/cli/run/helpers/benchmark_display.rs

@@ -2,16 +2,12 @@ use crate::api_client::FetchLocalRunBenchmarkResult;
 use crate::cli::run::helpers;
 use crate::executor::ExecutorName;
 use std::collections::HashMap;
-use std::time::Duration;
 use tabled::settings::object::{Columns, Rows};
 use tabled::settings::panel::Panel;
 use tabled::settings::style::HorizontalLine;
 use tabled::settings::{Alignment, Color, Modify, Style};
 use tabled::{Table, Tabled};
 
-pub const RUN_PROCESSING_MAX_DURATION: Duration = Duration::from_secs(60 * 5); // 5 minutes
-pub const POLLING_INTERVAL: Duration = Duration::from_secs(1);
-
 fn format_with_thousands_sep(n: u64) -> String {
     let s = n.to_string();
     let mut result = String::new();

src/cli/run/mod.rs

@@ -8,18 +8,14 @@ use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
 use crate::run_environment::interfaces::RepositoryProvider;
 use crate::runner_mode::RunnerMode;
+use crate::upload::UploadResult;
 use clap::{Args, ValueEnum};
 use std::path::Path;
 use std::path::PathBuf;
-use uploader::UploadResult;
 
-pub mod check_system;
 pub mod helpers;
-pub(crate) mod poll_results;
-pub mod run_index_state;
-pub(crate) mod uploader;
-
 pub mod logger;
+mod poll_results;
 
 pub(crate) fn show_banner() {
     let banner = format!(

src/cli/run/poll_results.rs

@@ -1,54 +1,17 @@
 use console::style;
-use tokio::time::{Instant, sleep};
 
-use crate::api_client::{
-    CodSpeedAPIClient, FetchLocalRunReportResponse, FetchLocalRunReportVars, RunStatus,
-};
-use crate::cli::run::helpers::benchmark_display::{
-    POLLING_INTERVAL, RUN_PROCESSING_MAX_DURATION, build_benchmark_table,
-};
-use crate::cli::run::uploader::UploadResult;
+use crate::api_client::CodSpeedAPIClient;
+use crate::cli::run::helpers::benchmark_display::build_benchmark_table;
 use crate::prelude::*;
+use crate::upload::{UploadResult, poll_run_report};
 
 #[allow(clippy::borrowed_box)]
 pub async fn poll_results(
     api_client: &CodSpeedAPIClient,
     upload_result: &UploadResult,
     output_json: bool,
 ) -> Result<()> {
-    let start = Instant::now();
-    let fetch_local_run_report_vars = FetchLocalRunReportVars {
-        owner: upload_result.owner.clone(),
-        name: upload_result.repository.clone(),
-        run_id: upload_result.run_id.clone(),
-    };
-
-    let response;
-    loop {
-        if start.elapsed() > RUN_PROCESSING_MAX_DURATION {
-            bail!("Polling results timed out");
-        }
-
-        let fetch_result = api_client
-            .fetch_local_run_report(fetch_local_run_report_vars.clone())
-            .await?;
-
-        match fetch_result {
-            FetchLocalRunReportResponse { run, .. }
-                if run.status == RunStatus::Pending || run.status == RunStatus::Processing =>
-            {
-                sleep(POLLING_INTERVAL).await;
-            }
-            response_from_api => {
-                response = response_from_api;
-                break;
-            }
-        }
-    }
-
-    if response.run.status == RunStatus::Failure {
-        bail!("Run failed to be processed, try again in a few minutes");
-    }
+    let response = poll_run_report(api_client, upload_result).await?;
 
     let report = response
         .run

src/cli/run/uploader/mod.rs

@@ -1,6 +1,6 @@
-use crate::cli::run::check_system::SystemInfo;
 use crate::executor::get_all_executors;
 use crate::prelude::*;
+use crate::system::SystemInfo;
 use std::path::Path;
 
 pub async fn setup(setup_cache_dir: Option<&Path>) -> Result<()> {

src/cli/run/uploader/snapshots/codspeed_runner__cli__run__uploader__upload_metadata__tests__get_metadata_hash-2.snap

@@ -1,10 +1,10 @@
 use super::Config;
-use crate::cli::run::check_system::{self, SystemInfo};
 use crate::cli::run::logger::Logger;
 use crate::config::CodSpeedConfig;
 use crate::prelude::*;
 use crate::run_environment::{self, RunEnvironment};
 use crate::runner_mode::RunnerMode;
+use crate::system::{self, SystemInfo};
 use std::path::PathBuf;
 
 use super::create_profile_folder;
@@ -39,7 +39,7 @@ impl TryFrom<(Config, &CodSpeedConfig)> for ExecutionContext {
     ) -> Result<Self, Self::Error> {
         let provider = run_environment::get_provider(&config)?;
         let system_info = SystemInfo::new()?;
-        check_system::check_system(&system_info)?;
+        system::check_system(&system_info)?;
         let logger = Logger::new(provider.as_ref())?;
 
         let profile_folder = if let Some(profile_folder) = &config.profile_folder {

src/cli/setup.rs

@@ -1,6 +1,6 @@
 use super::run_with_sudo::run_with_sudo;
-use crate::cli::run::check_system::SystemInfo;
 use crate::prelude::*;
+use crate::system::SystemInfo;
 use std::path::Path;
 use std::process::Command;