Merge branch 'main' into gh_main

dyegomb · Nov 19, 2024 · 4bbee3e · 4bbee3e
2 parents 0259ad4 + 4c69f4f
commit 4bbee3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/tests.rs b/src/tests.rs
@@ -45,7 +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": "PROD-test-1.0.0"},
+                    "variables": {
+                        "PROD_TAG": "Test-tag",
+                        "trigger_email":"test@test.tst"
+                    },
                 }
         );
 
@@ -94,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
@@ -17,7 +17,7 @@ pub async fn mailrelay_build(smtp_config: SmtpConfig) -> Option<SmtpTransport> {
             }
             Err(error) => {
                 error!("{}", error);
-                return None;
+                None
             }
         },
         false => None,
@@ -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);