[api] Send variant information (#934)

We don't actually directly use this information because we send the ID directly, but it is a part of the request and we should send it.

Author: gnalh

api/src/urls.rs

@@ -1,6 +1,6 @@
 use bundle::Test;
 use context::repo::RepoUrlParts;
-use url::{form_urlencoded, ParseError, Url};
+use url::{ParseError, Url, form_urlencoded};
 
 pub fn url_for_test_case(
     public_api_address: &str,
@@ -46,6 +46,7 @@ fn test_url_generated() {
         timestamp_millis: None,
         is_quarantined: false,
         failure_message: None,
+        variant: None,
     };
 
     let actual = url_for_test_case(
@@ -56,11 +57,9 @@ fn test_url_generated() {
     );
 
     assert_eq!(
-    actual,
-    Ok(
-      String::from(
-        "https://app.trunk-staging.io/bad-app-org/flaky-tests/test/c33a7f64-8f3e-5db9-b37b-2ea870d2441b?repo=bad-app%2Fios-app"
-      )
-    ),
-  );
+        actual,
+        Ok(String::from(
+            "https://app.trunk-staging.io/bad-app-org/flaky-tests/test/c33a7f64-8f3e-5db9-b37b-2ea870d2441b?repo=bad-app%2Fios-app"
+        )),
+    );
 }

bundle/src/types.rs

@@ -24,10 +24,12 @@ pub struct Test {
     pub timestamp_millis: Option<i64>,
     pub is_quarantined: bool,
     pub failure_message: Option<String>,
+    pub variant: Option<String>,
 }
 
 impl Test {
-    pub fn new<T: AsRef<str>>(
+    // trunk-ignore(clippy/too_many_arguments)
+    pub fn new<T: AsRef<str> + ToString>(
         id: Option<T>,
         name: String,
         parent_name: String,
@@ -47,6 +49,7 @@ impl Test {
             timestamp_millis,
             is_quarantined: false,
             failure_message: None,
+            variant: Some(variant.to_string()),
         };
 
         if let Some(id) = id {
@@ -193,6 +196,7 @@ mod tests {
             timestamp_millis: Some(0),
             is_quarantined: false,
             failure_message: None,
+            variant: Some(String::new()),
         };
         assert_eq!(result.name, name);
         assert_eq!(result.parent_name, parent_name);

cli/src/context_quarantine.rs

@@ -15,7 +15,7 @@ use context::{
             BindingsReport, BindingsTestCase, BindingsTestCaseStatusStatus, BindingsTestSuite,
         },
         junit_path::TestRunnerReportStatus,
-        parser::{bin_parse, JunitParser},
+        parser::{JunitParser, bin_parse},
     },
     repo::RepoUrlParts,
 };
@@ -71,7 +71,7 @@ impl QuarantineContext {
     }
 }
 
-fn convert_case_to_test<T: AsRef<str>>(
+fn convert_case_to_test<T: AsRef<str> + ToString>(
     repo: &RepoUrlParts,
     org_slug: T,
     parent_name: String,
@@ -104,12 +104,12 @@ fn convert_case_to_test<T: AsRef<str>>(
         timestamp_millis,
         is_quarantined: case.is_quarantined(),
         failure_message,
+        variant: Some(variant.to_string()),
     };
     if let Some(id) = case.extra().get("id") {
         if id.is_empty() {
             test.set_id(org_slug, repo, variant);
         } else {
-            // trunk-ignore(clippy/assigning_clones)
             test.id = id.clone();
         }
     } else {