From 6c5e278cd6ae0c953deadf63ba80aa07b805b345 Mon Sep 17 00:00:00 2001 From: Alex Cottner Date: Mon, 20 Jul 2026 11:08:10 -1000 Subject: [PATCH 1/2] RMST-472 - Make remote-settings v2 routes the default going forward --- components/remote_settings/src/config.rs | 25 +++++++----------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/components/remote_settings/src/config.rs b/components/remote_settings/src/config.rs index 57493a8f51..a71d78508f 100644 --- a/components/remote_settings/src/config.rs +++ b/components/remote_settings/src/config.rs @@ -31,11 +31,8 @@ pub struct RemoteSettingsConfig { #[derive(Debug, Clone, uniffi::Enum)] pub enum RemoteSettingsServer { Prod, - ProdV2, Stage, - StageV2, Dev, - DevV2, Custom { url: String }, } @@ -77,15 +74,10 @@ impl RemoteSettingsServer { fn raw_url(&self) -> &str { match self { - // v1 routes, current default - Self::Prod => "https://firefox.settings.services.mozilla.com/v1", - Self::Stage => "https://firefox.settings.services.allizom.org/v1", - Self::Dev => "https://remote-settings-dev.allizom.org/v1", - - // v2 routes, optional for now but will be default later - Self::ProdV2 => "https://firefox.settings.services.mozilla.com/v2", - Self::StageV2 => "https://firefox.settings.services.allizom.org/v2", - Self::DevV2 => "https://remote-settings-dev.allizom.org/v2", + // v2 routes, current default + Self::Prod => "https://firefox.settings.services.mozilla.com/v2", + Self::Stage => "https://firefox.settings.services.allizom.org/v2", + Self::Dev => "https://remote-settings-dev.allizom.org/v2", // custom, not currently implemented in android or iOS Self::Custom { url } => url, @@ -98,12 +90,9 @@ impl RemoteSettingsServer { /// inside the crate. pub fn get_url(&self) -> Result { Ok(match self { - Self::Prod => Url::parse("https://firefox.settings.services.mozilla.com/v1")?, - Self::Stage => Url::parse("https://firefox.settings.services.allizom.org/v1")?, - Self::Dev => Url::parse("https://remote-settings-dev.allizom.org/v1")?, - Self::ProdV2 => Url::parse("https://firefox.settings.services.mozilla.com/v2")?, - Self::StageV2 => Url::parse("https://firefox.settings.services.allizom.org/v2")?, - Self::DevV2 => Url::parse("https://remote-settings-dev.allizom.org/v2")?, + Self::Prod => Url::parse("https://firefox.settings.services.mozilla.com/v2")?, + Self::Stage => Url::parse("https://firefox.settings.services.allizom.org/v2")?, + Self::Dev => Url::parse("https://remote-settings-dev.allizom.org/v2")?, Self::Custom { url } => { let mut url = Url::parse(url)?; // Custom URLs are weird and require a couple tricks for backwards compatibility. From 2c1441d644c316a1ff24f561db833c1de262aaf1 Mon Sep 17 00:00:00 2001 From: Alex Cottner Date: Wed, 22 Jul 2026 12:12:44 -1000 Subject: [PATCH 2/2] upating changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e287f4be2e..0824953959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ [Full Changelog](In progress) +### Remote Settings +* Replacing v1 routes with v2 routes, removing added v2 routes ([#7492](https://github.com/mozilla/application-services/pull/7339)) + # v154.0 (_2026-07-20_) ## ✨ What's Changed ✨