diff --git a/.gitlab-ci-local-variables.yml b/.gitlab-ci-local-variables.yml new file mode 100644 index 0000000000000000000000000000000000000000..ccf211b131fd4289066c4363a3f599677a23082e --- /dev/null +++ b/.gitlab-ci-local-variables.yml @@ -0,0 +1,4 @@ +--- + +DEBUG: 'true' +TEST_OPTIONS: '--help' \ No newline at end of file diff --git a/src/diagnosis/container_analysis.rs b/src/diagnosis/container_analysis.rs index ba95504bef3d1ba2c98eb951848fe68f37642071..d5155f010688af59a62cf7ab6f4e97a8a124c561 100644 --- a/src/diagnosis/container_analysis.rs +++ b/src/diagnosis/container_analysis.rs @@ -120,11 +120,7 @@ impl ReportJob for ContainerAnalysisJob { gitlab::api::paged(endpoint, Pagination::All).query(&self.gitlab); match query { Err(e) => self.into_report( - vec![ReportStatus::ERROR(format!( - "{} {}", - fl!("error"), - e.to_string() - ))], + vec![ReportStatus::ERROR(format!("{} {}", fl!("error"), e))], vec![], ), Ok(containers) => { diff --git a/src/diagnosis/package_analysis.rs b/src/diagnosis/package_analysis.rs index 6f8073fc4c8d6add51de8706710543f4df7eabe6..f3faddb911a97b7097cf64e603a6a4ec07be88a4 100644 --- a/src/diagnosis/package_analysis.rs +++ b/src/diagnosis/package_analysis.rs @@ -99,11 +99,9 @@ impl ReportJob for PackageAnalysisJob { let query: Result<Vec<GitlabPackage>, _> = gitlab::api::paged(endpoint, Pagination::All).query(&self.gitlab); match query { - Err(e) => self.default_report(ReportStatus::ERROR(format!( - "{} {}", - fl!("error"), - e.to_string() - ))), + Err(e) => { + self.default_report(ReportStatus::ERROR(format!("{} {}", fl!("error"), e))) + } Ok(mut packages) => { packages.sort_by(|a, b| b.created_at.partial_cmp(&a.created_at).unwrap()); let mut savable_bytes = 0; diff --git a/src/diagnosis/pipeline_analysis.rs b/src/diagnosis/pipeline_analysis.rs index 06a1e5d600afe8047387c791f72a13b70132bbdb..46ad7f819505e4ada752b5f0a1d87ddc7eb7da1d 100644 --- a/src/diagnosis/pipeline_analysis.rs +++ b/src/diagnosis/pipeline_analysis.rs @@ -32,7 +32,7 @@ impl Reportable for PipelineAnalysisReport { } impl PipelineAnalysisJob { - fn to_report( + fn into_report( self, report_status: Vec<ReportStatus>, pipelines: Vec<GitlabPipeline>, @@ -54,7 +54,7 @@ impl ReportJob for PipelineAnalysisJob { pending_msg: fl!("pipeline-analysing"), job: std::thread::spawn(move || { if !self.project.jobs_enabled { - return self.to_report(vec![ReportStatus::NA(fl!("no-cicd"))], vec![]); + return self.into_report(vec![ReportStatus::NA(fl!("no-cicd"))], vec![]); } let endpoint = gitlab::api::projects::pipelines::Pipelines::builder() @@ -64,19 +64,15 @@ impl ReportJob for PipelineAnalysisJob { let query: Result<Vec<GitlabPipeline>, _> = gitlab::api::paged(endpoint, Pagination::All).query(&self.gitlab); match query { - Err(e) => self.to_report( - vec![ReportStatus::ERROR(format!( - "{} {}", - fl!("error"), - e.to_string() - ))], + Err(e) => self.into_report( + vec![ReportStatus::ERROR(format!("{} {}", fl!("error"), e))], vec![], ), Ok(mut pipelines) => { let days = self.days; let ref_date = Local::now() - Duration::days(days as i64); pipelines.sort_by(|a, b| a.created_at.partial_cmp(&b.created_at).unwrap()); - self.to_report( + self.into_report( vec![ReportStatus::NA(fl!( "pipeline-report", total_pipelines = pipelines.len(),