Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ✨
Expand Down
25 changes: 7 additions & 18 deletions components/remote_settings/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ pub struct RemoteSettingsConfig {
#[derive(Debug, Clone, uniffi::Enum)]
pub enum RemoteSettingsServer {
Prod,
ProdV2,
Stage,
StageV2,
Dev,
DevV2,
Custom { url: String },
}

Expand Down Expand Up @@ -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,
Expand All @@ -98,12 +90,9 @@ impl RemoteSettingsServer {
/// inside the crate.
pub fn get_url(&self) -> Result<Url> {
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.
Expand Down