Bug 1973636 - Add isNewUntil Search Definition to

Rust Engine Selector.

Author: mandysGit

CHANGELOG.md

@@ -89,6 +89,7 @@
 
 - The `SearchEngineSelector::filter_engine_configuration` will now sort any
   unordered engines by name rather than identifier.
+- Added `is_new_until` field to the SearchEngineDefinition struct. This optional field represents the date in YYYY-MM-DD format until which a search engine variant or subvariant is considered "new".
 
 [Full Changelog](https://github.com/mozilla/application-services/compare/v139.0...v140.0)
 

components/search/src/configuration_types.rs

@@ -169,6 +169,10 @@ pub(crate) struct JSONEngineVariant {
     /// Details of the possible user environments that this variant applies to.
     pub environment: JSONVariantEnvironment,
 
+    /// Indicates the date until which the engine variant or subvariant is considered new
+    /// (format: YYYY-MM-DD).
+    pub is_new_until: Option<String>,
+
     /// This search engine is presented as an option that the user may enable.
     /// If not specified, defaults to false.
     #[serde(default)]

components/search/src/filter.rs

@@ -94,6 +94,9 @@ impl SearchEngineDefinition {
         if let Some(urls) = &variant.urls {
             self.urls.merge(urls);
         }
+        if let Some(is_new_until) = &variant.is_new_until {
+            self.is_new_until = Some(is_new_until.clone());
+        }
     }
 
     fn merge_override(&mut self, override_record: &JSONOverridesRecord) {
@@ -124,6 +127,7 @@ impl SearchEngineDefinition {
             telemetry_suffix: String::new(),
             urls: base.urls.into(),
             click_url: None,
+            is_new_until: None,
         };
 
         engine_definition.merge_variant(variant);
@@ -542,6 +546,7 @@ mod tests {
                     all_regions_and_locales: true,
                     ..Default::default()
                 },
+                is_new_until: None,
                 optional: false,
                 partner_code: None,
                 telemetry_suffix: None,
@@ -558,6 +563,7 @@ mod tests {
                 charset: "UTF-8".to_string(),
                 classification: SearchEngineClassification::General,
                 identifier: "test".to_string(),
+                is_new_until: None,
                 partner_code: String::new(),
                 name: "Test".to_string(),
                 optional: false,
@@ -651,6 +657,7 @@ mod tests {
                     all_regions_and_locales: true,
                     ..Default::default()
                 },
+                is_new_until: None,
                 optional: false,
                 partner_code: None,
                 telemetry_suffix: None,
@@ -667,6 +674,7 @@ mod tests {
                 charset: "ISO-8859-15".to_string(),
                 classification: SearchEngineClassification::Unknown,
                 identifier: "test".to_string(),
+                is_new_until: None,
                 partner_code: "firefox".to_string(),
                 name: "Test".to_string(),
                 optional: false,
@@ -741,6 +749,7 @@ mod tests {
                     all_regions_and_locales: true,
                     ..Default::default()
                 },
+                is_new_until: Some("2063-04-05".to_string()),
                 optional: true,
                 partner_code: Some("trek".to_string()),
                 telemetry_suffix: Some("star".to_string()),
@@ -802,6 +811,7 @@ mod tests {
                 charset: "ISO-8859-15".to_string(),
                 classification: SearchEngineClassification::Unknown,
                 identifier: "test".to_string(),
+                is_new_until: Some("2063-04-05".to_string()),
                 partner_code: "trek".to_string(),
                 name: "Test".to_string(),
                 optional: true,
@@ -868,6 +878,7 @@ mod tests {
                     all_regions_and_locales: true,
                     ..Default::default()
                 },
+                is_new_until: None,
                 optional: true,
                 partner_code: Some("trek".to_string()),
                 telemetry_suffix: Some("star".to_string()),
@@ -928,6 +939,7 @@ mod tests {
                     all_regions_and_locales: true,
                     ..Default::default()
                 },
+                is_new_until: Some("2063-04-05".to_string()),
                 optional: true,
                 partner_code: Some("trek2".to_string()),
                 telemetry_suffix: Some("star2".to_string()),
@@ -988,6 +1000,7 @@ mod tests {
                 charset: "ISO-8859-15".to_string(),
                 classification: SearchEngineClassification::Unknown,
                 identifier: "test".to_string(),
+                is_new_until: Some("2063-04-05".to_string()),
                 partner_code: "trek2".to_string(),
                 name: "Test".to_string(),
                 optional: true,

components/search/src/selector.rs

@@ -549,6 +549,7 @@ mod tests {
                         charset: "UTF-8".to_string(),
                         classification: SearchEngineClassification::Unknown,
                         identifier: "test2".to_string(),
+                        is_new_until: None,
                         name: "Test 2".to_string(),
                         optional: false,
                         order_hint: None,

components/search/src/types.rs

@@ -183,6 +183,10 @@ pub struct SearchEngineDefinition {
     /// also used to form the base telemetry id and may be extended by telemetrySuffix.
     pub identifier: String,
 
+    /// Indicates the date until which the engine variant or subvariant is considered new
+    /// (format: YYYY-MM-DD).
+    pub is_new_until: Option<String>,
+
     /// The user visible name of the search engine.
     pub name: String,