WIP - working through other component changes, rebased from main

Author: alexcottner

components/nimbus/android/src/test/java/org/mozilla/experiments/nimbus/NimbusBuilderTest.kt

@@ -7,7 +7,7 @@ package org.mozilla.experiments.nimbus
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import kotlinx.coroutines.Job
-import mozilla.appservices.remotesettings.RemoteSettingsConfig2
+import mozilla.appservices.remotesettings.RemoteSettingsConfig
 import mozilla.appservices.remotesettings.RemoteSettingsService
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -34,7 +34,7 @@ class NimbusBuilderTest {
         }.build(
             appInfo,
             NimbusServerSettings(
-                remoteSettingsService = RemoteSettingsService(storageDir = "dummy", config = RemoteSettingsConfig2()),
+                remoteSettingsService = RemoteSettingsService(storageDir = "dummy", config = RemoteSettingsConfig()),
                 collection = "nimbus-preview",
             ),
         ) as DummyNimbus

components/nimbus/tests/common/mod.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #![cfg(feature = "rkv-safe-mode")]
 
-use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsService};
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsService};
 use rkv::StoreOptions;
 
 // utilities shared between tests
@@ -78,7 +78,7 @@ fn new_test_client_internal(
         ..Default::default()
     };
 
-    let config = RemoteSettingsConfig2 {
+    let config = RemoteSettingsConfig {
         server: Some(RemoteSettingsServer::Custom {
             url: url.as_str().to_string(),
         }),

components/nimbus/tests/test_fs_client.rs

@@ -8,7 +8,7 @@
 use std::sync::Arc;
 
 use nimbus::error::Result;
-use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsService};
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsService};
 
 mod common;
 
@@ -28,7 +28,7 @@ fn test_simple() -> Result<()> {
 
     let url = Url::from_file_path(dir).expect("experiments dir should exist");
 
-    let config = RemoteSettingsConfig2 {
+    let config = RemoteSettingsConfig {
         server: Some(RemoteSettingsServer::Custom {
             url: url.as_str().to_string(),
         }),

components/relay/src/rs.rs

@@ -298,11 +298,11 @@ impl RelayRemoteSettingsClient {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use remote_settings::{RemoteSettingsConfig2, RemoteSettingsServer};
+    use remote_settings::{RemoteSettingsConfig, RemoteSettingsServer};
 
     // Helper to create a RemoteSettingsService for testing
     fn create_test_remote_settings_service() -> Arc<RemoteSettingsService> {
-        let config = RemoteSettingsConfig2 {
+        let config = RemoteSettingsConfig {
             server: Some(RemoteSettingsServer::Custom {
                 url: "http://localhost".to_string(),
             }),

components/search/src/selector.rs

@@ -161,7 +161,7 @@ mod tests {
     use crate::test_helpers::{EngineRecord, ExpectedEngine, SubVariant, Variant};
     use crate::{test_helpers, types::*, SearchApiError};
     use mockito::mock;
-    use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsServer};
+    use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsServer};
     use serde_json::json;
 
     #[test]
@@ -870,7 +870,7 @@ mod tests {
         error_support::init_for_tests();
         viaduct_dev::init_backend_dev();
 
-        let config = RemoteSettingsConfig2 {
+        let config = RemoteSettingsConfig {
             server: Some(RemoteSettingsServer::Custom {
                 url: mockito::server_url(),
             }),

components/suggest/src/benchmarks/client.rs

@@ -6,6 +6,8 @@ use std::collections::HashMap;
 
 use crate::{error::Error, rs, Result};
 
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsService};
+
 /// Remotes settings client for benchmarking
 ///
 /// This fetches all data in `new`, then implements [rs::Client] by returning the local data.
@@ -20,55 +22,39 @@ pub struct RemoteSettingsBenchmarkClient {
 impl RemoteSettingsBenchmarkClient {
     pub fn new() -> Result<Self> {
         let mut new_benchmark_client = Self::default();
-        new_benchmark_client.fetch_data_with_client(
-            remote_settings::RemoteSettings::new(remote_settings::RemoteSettingsConfig {
-                server: None,
-                bucket_name: None,
-                collection_name: rs::Collection::Amp.name().to_owned(),
-                server_url: None,
-            })?,
-            rs::Collection::Amp,
-        )?;
-        new_benchmark_client.fetch_data_with_client(
-            remote_settings::RemoteSettings::new(remote_settings::RemoteSettingsConfig {
-                server: None,
-                bucket_name: None,
-                collection_name: rs::Collection::Other.name().to_owned(),
-                server_url: None,
-            })?,
-            rs::Collection::Other,
-        )?;
-        new_benchmark_client.fetch_data_with_client(
-            remote_settings::RemoteSettings::new(remote_settings::RemoteSettingsConfig {
-                server: None,
-                bucket_name: None,
-                collection_name: rs::Collection::Fakespot.name().to_owned(),
-                server_url: None,
-            })?,
-            rs::Collection::Fakespot,
-        )?;
+        new_benchmark_client.fetch_data(rs::Collection::Amp)?;
+        new_benchmark_client.fetch_data(rs::Collection::Other)?;
+        new_benchmark_client.fetch_data(rs::Collection::Fakespot)?;
         Ok(new_benchmark_client)
     }
 
-    fn fetch_data_with_client(
-        &mut self,
-        client: remote_settings::RemoteSettings,
-        collection: rs::Collection,
-    ) -> Result<()> {
-        let response = client.get_records()?;
-        for r in &response.records {
-            if let Some(a) = &r.attachment {
-                self.attachments
-                    .insert(a.location.clone(), client.get_attachment(&a.location)?);
+    fn fetch_data(&mut self, collection: rs::Collection) -> Result<()> {
+        let service = RemoteSettingsService::new(
+            String::from(":memory:"),
+            RemoteSettingsConfig {
+                server: None,
+                bucket_name: None,
+                app_context: Some(RemoteSettingsContext::default()),
+            },
+        );
+        let client = service.make_client(collection.name().to_string());
+        let records = client.get_records(true);
+        if let Some(records) = records {
+            for r in &records {
+                if let Some(a) = &r.attachment {
+                    self.attachments
+                        .insert(a.location.clone(), client.get_attachment(r)?);
+                }
             }
+            self.records.extend(
+                records
+                    .into_iter()
+                    .filter_map(|r| rs::Record::new(r, collection).ok()),
+            );
+            Ok(())
+        } else {
+            Err(Error::MissingRecords)
         }
-        self.records.extend(
-            response
-                .records
-                .into_iter()
-                .filter_map(|r| rs::Record::new(r, collection).ok()),
-        );
-        Ok(())
     }
 
     pub fn attachment_size_by_record_type(&self) -> Vec<(rs::SuggestRecordType, usize)> {

components/suggest/src/benchmarks/mod.rs

@@ -20,7 +20,7 @@ use std::{
 use tempfile::TempDir;
 
 use crate::{SuggestIngestionConstraints, SuggestStore};
-use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsService};
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsService};
 
 use std::sync::Arc;
 
@@ -88,7 +88,7 @@ fn new_store() -> SuggestStore {
         let temp_dir = tempfile::tempdir().unwrap();
         let db_path = temp_dir.path().join(unique_db_filename());
         let remote_settings_dir = temp_dir.path().join(unique_remote_settings_dir());
-        let rs_config = RemoteSettingsConfig2 {
+        let rs_config = RemoteSettingsConfig {
             bucket_name: None,
             server: None,
             app_context: Some(RemoteSettingsContext::default()),
@@ -106,7 +106,7 @@ fn new_store() -> SuggestStore {
     });
 
     let db_path = starter_dir.path().join(unique_db_filename());
-    let rs_config = RemoteSettingsConfig2 {
+    let rs_config = RemoteSettingsConfig {
         bucket_name: None,
         server: None,
         app_context: Some(RemoteSettingsContext::default()),

components/suggest/src/error.rs

@@ -26,6 +26,9 @@ pub enum Error {
     #[error("Error from Remote Settings: {0}")]
     RemoteSettings(#[from] RemoteSettingsError),
 
+    #[error("Remote settings has no records for this collection")]
+    MissingRecords,
+
     #[error("Remote settings record is missing an attachment (id: u64)")]
     MissingAttachment(String),
 

components/support/nimbus-cli/src/sources/experiment_list.rs

@@ -220,7 +220,7 @@ impl TryFrom<&ExperimentListSource> for Value {
                 is_preview,
             } => {
                 use remote_settings::{
-                    RemoteSettingsConfig2, RemoteSettingsServer, RemoteSettingsService,
+                    RemoteSettingsConfig, RemoteSettingsServer, RemoteSettingsService,
                 };
                 let collection_name = if *is_preview {
                     "nimbus-preview".to_string()
@@ -241,7 +241,7 @@ impl TryFrom<&ExperimentListSource> for Value {
                 let server = RemoteSettingsServer::Custom {
                     url: endpoint.clone(),
                 };
-                let config = RemoteSettingsConfig2 {
+                let config = RemoteSettingsConfig {
                     server: Some(server),
                     ..Default::default()
                 };

examples/cli-support/src/lib.rs

@@ -10,7 +10,7 @@ use std::{
     sync::Arc,
 };
 
-use remote_settings::{RemoteSettingsConfig2, RemoteSettingsServer, RemoteSettingsService};
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsServer, RemoteSettingsService};
 
 pub mod fxa_creds;
 pub mod prompt;