From 0756fe04555e8638ae6d24e5efefa3a28252905e Mon Sep 17 00:00:00 2001 From: Dyego Date: Thu, 14 Nov 2024 19:09:23 -0300 Subject: [PATCH 1/4] needless return --- src/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.rs b/src/utils.rs index 7657445..bf9f3b0 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -17,7 +17,7 @@ pub async fn mailrelay_build(smtp_config: SmtpConfig) -> Option { } Err(error) => { error!("{}", error); - return None; + None } }, false => None, From d0bbb54b08bff7a25bfcdeca4369d4b2a1d7ec88 Mon Sep 17 00:00:00 2001 From: Dyego Date: Thu, 14 Nov 2024 19:28:17 -0300 Subject: [PATCH 2/4] more info creating pipelines --- src/tests.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests.rs b/src/tests.rs index 55729da..64af3cb 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -45,7 +45,8 @@ mod integration_tests { // "variables": {"trigger_email":"teste@test.tst"}, // "variables": {"ref_source":"master"}, // "variables": {"source_id":config.project_id.unwrap_or(0).to_string()}, - "variables": {"PROD_TAG": "PROD-test-1.0.0"}, + "variables": {"PROD_TAG": "Test-test-1.0.0", + "trigger_email":"teste@test.tst"}, } ); From 8628507fb22e1e640302876dc60e659578f65227 Mon Sep 17 00:00:00 2001 From: Dyego Date: Thu, 14 Nov 2024 19:36:19 -0300 Subject: [PATCH 3/4] use working tag --- src/tests.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tests.rs b/src/tests.rs index 64af3cb..8bc9fe1 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -45,8 +45,10 @@ mod integration_tests { // "variables": {"trigger_email":"teste@test.tst"}, // "variables": {"ref_source":"master"}, // "variables": {"source_id":config.project_id.unwrap_or(0).to_string()}, - "variables": {"PROD_TAG": "Test-test-1.0.0", - "trigger_email":"teste@test.tst"}, + "variables": { + "PROD_TAG": "Test-tag", + "trigger_email":"teste@test.tst" + }, } ); From 4c69f4fe694201ebc8056a9e4428467aae909751 Mon Sep 17 00:00:00 2001 From: Dyego Date: Tue, 19 Nov 2024 12:12:44 -0300 Subject: [PATCH 4/4] fix multiples destination addresses --- src/tests.rs | 6 ++++-- src/utils.rs | 9 +-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/tests.rs b/src/tests.rs index 8bc9fe1..fdfe9a4 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -47,7 +47,7 @@ mod integration_tests { // "variables": {"source_id":config.project_id.unwrap_or(0).to_string()}, "variables": { "PROD_TAG": "Test-tag", - "trigger_email":"teste@test.tst" + "trigger_email":"test@test.tst" }, } ); @@ -97,7 +97,9 @@ mod integration_tests { let mail_relay_handle = tokio::spawn(utils::mailrelay_build(config.clone().unwrap())); - let test_job = JobInfo::default(); + let mut test_job = JobInfo::default(); + + test_job.user_mail = Some("test@test.tst".to_string()); let message = utils::mail_message( &test_job, diff --git a/src/utils.rs b/src/utils.rs index bf9f3b0..d99ea40 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -37,14 +37,7 @@ pub fn mail_message(job: &JobInfo, reason: MailReason, builder: &SmtpConfig) -> MailReason::Status(status) => format!("Status of job {}: {}", job, status), }; - let binding = builder.to.clone(); - let to = match &job.user_mail { - Some(to) => match &binding { - None => Some(to.to_string()), - Some(to_inc) => Some(format!("{to}; {to_inc}")), - }, - None => binding, - }; + let to = job.user_mail.clone(); debug!("Sending mail to {:?}", &to);