Bug 1871446: Vendor application-services into mozilla-central r=markh

Differential Revision: https://phabricator.services.mozilla.com/D197124

.cargo/config.in

@@ -50,9 +50,9 @@ git = "https://github.com/mozilla-spidermonkey/jsparagus"
 rev = "64ba08e24749616de2344112f226d1ef4ba893ae"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822"]
+[source."git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417"]
 git = "https://github.com/mozilla/application-services"
-rev = "5babdbc9756a879c906d12613bb764b3f99fe822"
+rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=6be424d75f1367e70f2f5ddcacd6d0237e81a6a9"]

Cargo.lock

@@ -1583,7 +1583,7 @@ dependencies = [
 [[package]]
 name = "error-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "error-support-macros",
  "lazy_static",
@@ -1595,7 +1595,7 @@ dependencies = [
 [[package]]
 name = "error-support-macros"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2809,7 +2809,7 @@ dependencies = [
 [[package]]
 name = "interrupt-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "lazy_static",
  "parking_lot",
@@ -3987,7 +3987,7 @@ dependencies = [
 [[package]]
 name = "nss_build_common"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 
 [[package]]
 name = "nsstring"
@@ -4658,7 +4658,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "remote_settings"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "parking_lot",
  "serde",
@@ -5189,7 +5189,7 @@ dependencies = [
 [[package]]
 name = "sql-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "ffi-support",
  "interrupt-support",
@@ -5370,7 +5370,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 [[package]]
 name = "suggest"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "anyhow",
  "chrono",
@@ -5416,7 +5416,7 @@ dependencies = [
 [[package]]
 name = "sync-guid"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "base64 0.21.3",
  "rand",
@@ -5427,7 +5427,7 @@ dependencies = [
 [[package]]
 name = "sync15"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "anyhow",
  "error-support",
@@ -5459,7 +5459,7 @@ dependencies = [
 [[package]]
 name = "tabs"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6107,7 +6107,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viaduct"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "ffi-support",
  "log",
@@ -6253,7 +6253,7 @@ dependencies = [
 [[package]]
 name = "webext-storage"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=5babdbc9756a879c906d12613bb764b3f99fe822#5babdbc9756a879c906d12613bb764b3f99fe822"
+source = "git+https://github.com/mozilla/application-services?rev=57ecda94fae3226cf67b3e12ce7d6b504e0e2417#57ecda94fae3226cf67b3e12ce7d6b504e0e2417"
 dependencies = [
  "anyhow",
  "error-support",

Cargo.toml

@@ -205,13 +205,13 @@ warp = { git = "https://github.com/seanmonstar/warp", rev = "9d081461ae1167eb321
 malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }
 
 # application-services overrides to make updating them all simpler.
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "5babdbc9756a879c906d12613bb764b3f99fe822" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "57ecda94fae3226cf67b3e12ce7d6b504e0e2417" }
 
 # Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2.
 # There is not going to be new version of mio 0.6, mio now being >= 0.7.11.

third_party/rust/error-support/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"cf73fe7b6066cb2ccccb0939f19b14d4e27d9cfdc20c9e527de3210029f2ee6f","README.md":"8030b4a314b1be31ba018ac12c3b586bb736db5307c3c395f2857fffe0130322","android/build.gradle":"200fe9fcf26477ae4e941dd1e702c43deae9fb0a7252569bd7352eac1771efbe","android/src/main/AndroidManifest.xml":"4f8b16fa6a03120ac810c6438a3a60294075414d92e06caa7e85388e389e5d17","build.rs":"c8d3c38c1208eea36224662b284d8daf3e7ad1b07d22d750524f3da1cc66ccca","src/errorsupport.udl":"e793034d01a2608298528051757f38405e006ee1abc4cf65dc6f18c53590ace8","src/handling.rs":"545c969d71907d81cb5af93f435ba443508adda2ec57ac2a975fed7d9828ccea","src/lib.rs":"96ae3cc2c1077ae45442ace6b5b5311b86267d0b9067f3ff58396af30ccbbc07","src/macros.rs":"0d03f82fab20c96a182f941baf3fcf2a286b00fea871ee7fd8e339abc14f9522","src/redact.rs":"c9a4df1a87be68b15d583587bda941d4c60a1d0449e2d43ff99f3611a290a863","src/reporting.rs":"38efd24d86ba8facfb181cb27e8b698d2831db0afab85691ffda034a4dc68dfa","uniffi.toml":"644fe81c12fe3c01ee81e017ca3c00d0e611f014b7eade51aadaf208179a3450"},"package":null}
+{"files":{"Cargo.toml":"cf73fe7b6066cb2ccccb0939f19b14d4e27d9cfdc20c9e527de3210029f2ee6f","README.md":"8030b4a314b1be31ba018ac12c3b586bb736db5307c3c395f2857fffe0130322","android/build.gradle":"200fe9fcf26477ae4e941dd1e702c43deae9fb0a7252569bd7352eac1771efbe","android/src/main/AndroidManifest.xml":"4f8b16fa6a03120ac810c6438a3a60294075414d92e06caa7e85388e389e5d17","build.rs":"c8d3c38c1208eea36224662b284d8daf3e7ad1b07d22d750524f3da1cc66ccca","src/errorsupport.udl":"e793034d01a2608298528051757f38405e006ee1abc4cf65dc6f18c53590ace8","src/handling.rs":"6e0568b18d426531cb2ae9967c8dd0d51ece5a065f68b15eeb308b995edaa167","src/lib.rs":"96ae3cc2c1077ae45442ace6b5b5311b86267d0b9067f3ff58396af30ccbbc07","src/macros.rs":"0d03f82fab20c96a182f941baf3fcf2a286b00fea871ee7fd8e339abc14f9522","src/redact.rs":"c9a4df1a87be68b15d583587bda941d4c60a1d0449e2d43ff99f3611a290a863","src/reporting.rs":"38efd24d86ba8facfb181cb27e8b698d2831db0afab85691ffda034a4dc68dfa","uniffi.toml":"644fe81c12fe3c01ee81e017ca3c00d0e611f014b7eade51aadaf208179a3450"},"package":null}

third_party/rust/error-support/src/handling.rs

@@ -99,7 +99,10 @@ where
     let handling = e.get_error_handling();
     let reporting = handling.reporting;
     if let Some(level) = reporting.log_level {
-        log::log!(level, "{}", e.to_string());
+        match &reporting.report_class {
+            Some(report_class) => log::log!(level, "{report_class}: {}", e.to_string()),
+            None => log::log!(level, "{}", e.to_string()),
+        }
     }
     if let Some(report_class) = reporting.report_class {
         // notify the error reporter if the feature is enabled.

third_party/rust/interrupt-support/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"66dc13869b8094d43cbacc3c1e4c5c40f86f2a23166206e35dac5b47d9a73b8d","README.md":"7f1418b4a7c138ba20bcaea077fe6cf0d6ffbaf6df6b90c80efc52aa0d0e2e9f","src/error.rs":"b83cbe8abd22a9d687508d236a2a77e28b3fc6c39673633e5820cc0e3fc86cba","src/interruptee.rs":"c56f9ac610d0b24a128a907266432287558c4b73f6c24b82674ca7894181d18f","src/lib.rs":"cf44a84310913be5264e1c4a3e004a9f7a6cd82d01a109bb6ac4d6002b5dd560","src/shutdown.rs":"b9dfdb717932301035001a0398967384f1b993e14505860415d023febbe82d63","src/sql.rs":"7e050313884a281e6b3fc7a4514374e08cb9e5f3c5aefb873be92e56f30af660"},"package":null}
+{"files":{"Cargo.toml":"96acb323d4b231a725a4a017053005c8c1cec4841987db2422f17315f84e9e8c","README.md":"7f1418b4a7c138ba20bcaea077fe6cf0d6ffbaf6df6b90c80efc52aa0d0e2e9f","src/error.rs":"b83cbe8abd22a9d687508d236a2a77e28b3fc6c39673633e5820cc0e3fc86cba","src/interruptee.rs":"c56f9ac610d0b24a128a907266432287558c4b73f6c24b82674ca7894181d18f","src/lib.rs":"cf44a84310913be5264e1c4a3e004a9f7a6cd82d01a109bb6ac4d6002b5dd560","src/shutdown.rs":"b9dfdb717932301035001a0398967384f1b993e14505860415d023febbe82d63","src/sql.rs":"7e050313884a281e6b3fc7a4514374e08cb9e5f3c5aefb873be92e56f30af660"},"package":null}

third_party/rust/interrupt-support/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2021"
 name = "interrupt-support"
 version = "0.1.0"
-authors = ["application-services@mozilla.com"]
+authors = ["Sync Team <sync-team@mozilla.com>"]
 readme = "README.md"
 license = "MPL-2.0"
 

third_party/rust/suggest/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"7839381979f9d80ac58e1dbf5d3403d9b44575f77d20c9b3782733fa69b6bba0","README.md":"8d7457893194e255b87e5a2667ee25c87bd470f5338d7078506f866a67a3fdbd","build.rs":"78780c5cccfe22c3ff4198624b9e188559c437c3e6fa1c8bb66548eee6aa66bf","src/db.rs":"60aaceae91013aac3d6420773eceb8eaa59109509bcba1d9661200bd6ab690ff","src/error.rs":"f47763a1a5d228b446eb8f718433e49fdb1c7b304de1255891215144dddd7a43","src/keyword.rs":"988d0ab021c0df19cfd3c519df7d37f606bf984cd14d0efca4e5a7aff88344dd","src/lib.rs":"c6bb8d94cf361482c5ebc182c4c853b72ed4eaad3220a7da9be5c7bd9aa08509","src/pocket.rs":"c4dda43390d1c39dc795933596b3c1e4e282932cac6c69da53c6e05d39e9ef29","src/provider.rs":"23733f87d3fa8d5574f9d12cb1c2762f168c4cd76118d2e27aae905d994ad767","src/rs.rs":"e39c79e7f1e5c369788fa3a2f61b327befe97fedd0cd3a77f0270b34ed01cab0","src/schema.rs":"97cbd1796ccb1416d313e0e2935443bb8b600d877c4dff1fa60b496857b4fa64","src/store.rs":"256c24d6fec81cb596738c79f631d6802472bc941449408fe00f4745fd5204d6","src/suggest.udl":"653bb92b9f13c5800bd54fc2e11600bae9fda0ea09f072705bc039f33df22dd4","src/suggestion.rs":"4832bb3e66a5a647b3f0b935ff98cd9be585a889224cea9a775c51113b83d9c6","uniffi.toml":"f26317442ddb5b3281245bef6e60ffcb78bb95d29fe4a351a56dbb88d4ec8aab"},"package":null}
+{"files":{"Cargo.toml":"7839381979f9d80ac58e1dbf5d3403d9b44575f77d20c9b3782733fa69b6bba0","README.md":"8d7457893194e255b87e5a2667ee25c87bd470f5338d7078506f866a67a3fdbd","build.rs":"78780c5cccfe22c3ff4198624b9e188559c437c3e6fa1c8bb66548eee6aa66bf","src/db.rs":"60aaceae91013aac3d6420773eceb8eaa59109509bcba1d9661200bd6ab690ff","src/error.rs":"f47763a1a5d228b446eb8f718433e49fdb1c7b304de1255891215144dddd7a43","src/keyword.rs":"988d0ab021c0df19cfd3c519df7d37f606bf984cd14d0efca4e5a7aff88344dd","src/lib.rs":"c6bb8d94cf361482c5ebc182c4c853b72ed4eaad3220a7da9be5c7bd9aa08509","src/pocket.rs":"c4dda43390d1c39dc795933596b3c1e4e282932cac6c69da53c6e05d39e9ef29","src/provider.rs":"23733f87d3fa8d5574f9d12cb1c2762f168c4cd76118d2e27aae905d994ad767","src/rs.rs":"e39c79e7f1e5c369788fa3a2f61b327befe97fedd0cd3a77f0270b34ed01cab0","src/schema.rs":"4b1e70a4fdcda972bf0935b9c4b6fd59c83c5c85c41d7ff219b50252ac0d9376","src/store.rs":"8bc28d7ef523b043cf9f82fd074ea7f13f7de64e6634868d0e750297f617431b","src/suggest.udl":"653bb92b9f13c5800bd54fc2e11600bae9fda0ea09f072705bc039f33df22dd4","src/suggestion.rs":"4832bb3e66a5a647b3f0b935ff98cd9be585a889224cea9a775c51113b83d9c6","uniffi.toml":"f26317442ddb5b3281245bef6e60ffcb78bb95d29fe4a351a56dbb88d4ec8aab"},"package":null}

third_party/rust/suggest/src/schema.rs

@@ -6,7 +6,7 @@
 use rusqlite::{Connection, Transaction};
 use sql_support::open_database::{self, ConnectionInitializer};
 
-pub const VERSION: u32 = 8;
+pub const VERSION: u32 = 9;
 
 pub const SQL: &str = "
     CREATE TABLE meta(
@@ -26,8 +26,8 @@ pub const SQL: &str = "
         keyword_suffix TEXT NOT NULL DEFAULT '',
         confidence INTEGER NOT NULL DEFAULT 0,
         rank INTEGER NOT NULL,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id),
+        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        PRIMARY KEY (keyword_prefix, keyword_suffix, suggestion_id) 
+        PRIMARY KEY (keyword_prefix, keyword_suffix, suggestion_id)
     ) WITHOUT ROWID;
 
     CREATE UNIQUE INDEX keywords_suggestion_id_rank ON keywords(suggestion_id, rank);
@@ -48,8 +48,7 @@ pub const SQL: &str = "
         impression_url TEXT NOT NULL,
         click_url TEXT NOT NULL,
         icon_id TEXT NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id)
+        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-        ON DELETE CASCADE
     );
 
     CREATE TABLE pocket_custom_details(
@@ -70,8 +69,7 @@ pub const SQL: &str = "
         rating TEXT,
         number_of_ratings INTEGER NOT NULL,
         score REAL NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id)
+        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-        ON DELETE CASCADE
     );
 
     CREATE INDEX suggestions_record_id ON suggestions(record_id);
@@ -110,7 +108,7 @@ impl ConnectionInitializer for SuggestConnectionInitializer {
 
     fn upgrade_from(&self, _db: &Transaction<'_>, version: u32) -> open_database::Result<()> {
         match version {
-            1..=7 => {
+            1..=8 => {
                 // These schema versions were used during development, and never
                 // shipped in any applications. Treat these databases as
                 // corrupt, so that they'll be replaced.

third_party/rust/suggest/src/store.rs

@@ -838,7 +838,7 @@ mod tests {
 
     /// Tests re-ingesting suggestions from an updated attachment.
     #[test]
-    fn reingest_suggestions() -> anyhow::Result<()> {
+    fn reingest_amp_suggestions() -> anyhow::Result<()> {
         before_each();
 
         // Ingest suggestions from the initial snapshot.
@@ -1210,6 +1210,253 @@ mod tests {
         Ok(())
     }
 
+    /// Tests re-ingesting AMO suggestions from an updated attachment.
+    #[test]
+    fn reingest_amo_suggestions() -> anyhow::Result<()> {
+        before_each();
+
+        // Ingest suggestions from the initial snapshot.
+        let initial_snapshot = Snapshot::with_records(json!([{
+            "id": "data-1",
+            "type": "amo-suggestions",
+            "last_modified": 15,
+            "attachment": {
+                "filename": "data-1.json",
+                "mimetype": "application/json",
+                "location": "data-1.json",
+                "hash": "",
+                "size": 0,
+            },
+        }, {
+            "id": "data-2",
+            "type": "amo-suggestions",
+            "last_modified": 15,
+            "attachment": {
+                "filename": "data-2.json",
+                "mimetype": "application/json",
+                "location": "data-2.json",
+                "hash": "",
+                "size": 0,
+            },
+        }]))?
+        .with_data(
+            "data-1.json",
+            json!({
+                "description": "First suggestion",
+                "url": "https://example.org/amo-suggestion-1",
+                "guid": "{b9db16a4-6edc-47ec-a1f4-b86292ed211d}",
+                "keywords": ["relay", "spam", "masking email", "alias"],
+                "title": "AMO suggestion",
+                "icon": "https://example.org/amo-suggestion-1/icon.png",
+                "rating": "4.9",
+                "number_of_ratings": 800,
+                "score": 0.25
+            }),
+        )?
+        .with_data(
+            "data-2.json",
+            json!([{
+                "description": "Second suggestion",
+                "url": "https://example.org/amo-suggestion-2",
+                "guid": "{6d24e3b8-1400-4d37-9440-c798f9b79b1a}",
+                "keywords": ["dark mode", "dark theme", "night mode"],
+                "title": "Another AMO suggestion",
+                "icon": "https://example.org/amo-suggestion-2/icon.png",
+                "rating": "4.6",
+                "number_of_ratings": 750,
+                "score": 0.25
+            }, {
+                "description": "Third suggestion",
+                "url": "https://example.org/amo-suggestion-3",
+                "guid": "{1e9d493b-0498-48bb-9b9a-8b45a44df146}",
+                "keywords": ["grammar", "spelling", "edit"],
+                "title": "Yet another AMO suggestion",
+                "icon": "https://example.org/amo-suggestion-3/icon.png",
+                "rating": "4.8",
+                "number_of_ratings": 900,
+                "score": 0.25
+            }]),
+        )?;
+
+        let store = unique_test_store(SnapshotSettingsClient::with_snapshot(initial_snapshot));
+
+        store.ingest(SuggestIngestionConstraints::default())?;
+
+        store.dbs()?.reader.read(|dao| {
+            assert_eq!(dao.get_meta(LAST_INGEST_META_KEY)?, Some(15u64));
+
+            expect![[r#"
+                [
+                    Amo {
+                        title: "AMO suggestion",
+                        url: "https://example.org/amo-suggestion-1",
+                        icon_url: "https://example.org/amo-suggestion-1/icon.png",
+                        description: "First suggestion",
+                        rating: Some(
+                            "4.9",
+                        ),
+                        number_of_ratings: 800,
+                        guid: "{b9db16a4-6edc-47ec-a1f4-b86292ed211d}",
+                        score: 0.25,
+                    },
+                ]
+            "#]]
+            .assert_debug_eq(&dao.fetch_suggestions(&SuggestionQuery {
+                keyword: "masking e".into(),
+                providers: vec![SuggestionProvider::Amo],
+                limit: None,
+            })?);
+
+            expect![[r#"
+                [
+                    Amo {
+                        title: "Another AMO suggestion",
+                        url: "https://example.org/amo-suggestion-2",
+                        icon_url: "https://example.org/amo-suggestion-2/icon.png",
+                        description: "Second suggestion",
+                        rating: Some(
+                            "4.6",
+                        ),
+                        number_of_ratings: 750,
+                        guid: "{6d24e3b8-1400-4d37-9440-c798f9b79b1a}",
+                        score: 0.25,
+                    },
+                ]
+            "#]]
+            .assert_debug_eq(&dao.fetch_suggestions(&SuggestionQuery {
+                keyword: "night".into(),
+                providers: vec![SuggestionProvider::Amo],
+                limit: None,
+            })?);
+
+            Ok(())
+        })?;
+
+        // Update the snapshot with new suggestions: update the second, drop the
+        // third, and add the fourth.
+        *store.settings_client.snapshot.borrow_mut() = Snapshot::with_records(json!([{
+            "id": "data-2",
+            "type": "amo-suggestions",
+            "last_modified": 30,
+            "attachment": {
+                "filename": "data-2-1.json",
+                "mimetype": "application/json",
+                "location": "data-2-1.json",
+                "hash": "",
+                "size": 0,
+            },
+        }]))?
+        .with_data(
+            "data-2-1.json",
+            json!([{
+                "description": "Updated second suggestion",
+                "url": "https://example.org/amo-suggestion-2",
+                "guid": "{6d24e3b8-1400-4d37-9440-c798f9b79b1a}",
+                "keywords": ["dark mode", "night mode"],
+                "title": "Another AMO suggestion",
+                "icon": "https://example.org/amo-suggestion-2/icon.png",
+                "rating": "4.7",
+                "number_of_ratings": 775,
+                "score": 0.25
+            }, {
+                "description": "Fourth suggestion",
+                "url": "https://example.org/amo-suggestion-4",
+                "guid": "{1ea82ebd-a1ba-4f57-b8bb-3824ead837bd}",
+                "keywords": ["image search", "visual search"],
+                "title": "New AMO suggestion",
+                "icon": "https://example.org/amo-suggestion-4/icon.png",
+                "rating": "5.0",
+                "number_of_ratings": 100,
+                "score": 0.25
+            }]),
+        )?;
+
+        store.ingest(SuggestIngestionConstraints::default())?;
+
+        store.dbs()?.reader.read(|dao| {
+            assert_eq!(dao.get_meta(LAST_INGEST_META_KEY)?, Some(30u64));
+
+            expect![[r#"
+                [
+                    Amo {
+                        title: "AMO suggestion",
+                        url: "https://example.org/amo-suggestion-1",
+                        icon_url: "https://example.org/amo-suggestion-1/icon.png",
+                        description: "First suggestion",
+                        rating: Some(
+                            "4.9",
+                        ),
+                        number_of_ratings: 800,
+                        guid: "{b9db16a4-6edc-47ec-a1f4-b86292ed211d}",
+                        score: 0.25,
+                    },
+                ]
+            "#]]
+            .assert_debug_eq(&dao.fetch_suggestions(&SuggestionQuery {
+                keyword: "masking e".into(),
+                providers: vec![SuggestionProvider::Amo],
+                limit: None,
+            })?);
+
+            expect![[r#"
+                []
+            "#]]
+            .assert_debug_eq(&dao.fetch_suggestions(&SuggestionQuery {
+                keyword: "dark t".into(),
+                providers: vec![SuggestionProvider::Amo],
+                limit: None,
+            })?);
+
+            expect![[r#"
+                [
+                    Amo {
+                        title: "Another AMO suggestion",
+                        url: "https://example.org/amo-suggestion-2",
+                        icon_url: "https://example.org/amo-suggestion-2/icon.png",
+                        description: "Updated second suggestion",
+                        rating: Some(
+                            "4.7",
+                        ),
+                        number_of_ratings: 775,
+                        guid: "{6d24e3b8-1400-4d37-9440-c798f9b79b1a}",
+                        score: 0.25,
+                    },
+                ]
+            "#]]
+            .assert_debug_eq(&dao.fetch_suggestions(&SuggestionQuery {
+                keyword: "night".into(),
+                providers: vec![SuggestionProvider::Amo],
+                limit: None,
+            })?);
+
+            expect![[r#"
+                [
+                    Amo {
+                        title: "New AMO suggestion",
+                        url: "https://example.org/amo-suggestion-4",
+                        icon_url: "https://example.org/amo-suggestion-4/icon.png",
+                        description: "Fourth suggestion",
+                        rating: Some(
+                            "5.0",
+                        ),
+                        number_of_ratings: 100,
+                        guid: "{1ea82ebd-a1ba-4f57-b8bb-3824ead837bd}",
+                        score: 0.25,
+                    },
+                ]
+            "#]]
+            .assert_debug_eq(&dao.fetch_suggestions(&SuggestionQuery {
+                keyword: "image search".into(),
+                providers: vec![SuggestionProvider::Amo],
+                limit: None,
+            })?);
+
+            Ok(())
+        })?;
+
+        Ok(())
+    }
+
     /// Tests ingesting tombstones for previously-ingested suggestions and
     /// icons.
     #[test]
@@ -2236,10 +2483,10 @@ mod tests {
                     UnparsableRecords(
                         {
                             "clippy-2": UnparsableRecord {
-                                schema_version: 8,
+                                schema_version: 9,
                             },
                             "fancy-new-suggestions-1": UnparsableRecord {
-                                schema_version: 8,
+                                schema_version: 9,
                             },
                         },
                     ),
@@ -2304,10 +2551,10 @@ mod tests {
                     UnparsableRecords(
                         {
                             "clippy-2": UnparsableRecord {
-                                schema_version: 8,
+                                schema_version: 9,
                             },
                             "fancy-new-suggestions-1": UnparsableRecord {
-                                schema_version: 8,
+                                schema_version: 9,
                             },
                         },
                     ),
@@ -2410,10 +2657,10 @@ mod tests {
                     UnparsableRecords(
                         {
                             "clippy-2": UnparsableRecord {
-                                schema_version: 8,
+                                schema_version: 9,
                             },
                             "fancy-new-suggestions-1": UnparsableRecord {
-                                schema_version: 8,
+                                schema_version: 9,
                             },
                         },
                     ),

third_party/rust/sync15/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"430dc61a88547775628f467d0a40cf7ee9fd560eb31e5ff0a13a9c28221bc6f1","README.md":"6d4ff5b079ac5340d18fa127f583e7ad793c5a2328b8ecd12c3fc723939804f2","build.rs":"aa971160d67ce8626b26e15c04c34b730f594c45c817aae34cfc9f3ea14ae284","src/bso/content.rs":"92935258745bdf0c3915a555cb6884a7fa69faa1290ec2c1815f6e2f3c0f0562","src/bso/crypto.rs":"27602dcccb37d3a55620ee4e16b705da455d49af575de115c7c79c0178eb1d6d","src/bso/mod.rs":"09e723dc7e99295ecafdcadffaf604d66ea27cf2b7f1fd9ab3cac4f4698ff6a7","src/bso/test_utils.rs":"4ec5a2df5e1c0ec14dc770681e959bdcef6ef04f6fde435999197f46a8ae4831","src/client/coll_state.rs":"13e6ef55273baf5536acc369be522e34a803a32cabf19cce43e426aea9b6223e","src/client/coll_update.rs":"dac04a90c29dd969f8b4250414609c9b6d61daf2dfa4ae77d1c4a165ba970b05","src/client/collection_keys.rs":"c27b2277a3a52033b58ab01490fc2ea7007494195dd5e6dc2c6931a4ca96795a","src/client/mod.rs":"8f588d4a035cf79d96f2500f06d5651c1a7c566127c456ffa5429811ddce3fd6","src/client/request.rs":"8841524e37d8195867bdf6ba98c75f610cf47a4644adeebd6372cc6713f2260a","src/client/state.rs":"4e31193ef2471c1dfabf1c6a391bcb95e14ddb45855786a4194ff187d5c9347c","src/client/status.rs":"f445a8765dac9789444e23b5145148413407bb1d18a15ef56682243997f591bf","src/client/storage_client.rs":"8de72d4ba3ca4f68c8e1898466de83a2b543545a18679800cb4f7fbda2dc3183","src/client/sync.rs":"b29abb512ec9d163f7883b71f78c9202802dcb17cad1fc5dc08087fb0bb66704","src/client/sync_multiple.rs":"6e92571132f89744b553190c596be8aff9b2d031d8f79d82c94cdf78b1683f4a","src/client/token.rs":"b268759d31e0fe17e0e2a428694cd9a317fcfbdd52f023d5d8c7cc6f00f1a102","src/client/util.rs":"71cc70ee41f821f53078675e636e9fad9c6046fa1a989e37f5487e340a2277d6","src/client_types.rs":"3c3cac1540b92482f43660d9e43bdde8481c4cc1a98253a68c80e791231f5976","src/clients_engine/engine.rs":"9e11b47be81fc63214f31879af74075674aa50a8f8989afe20fefa7990fa99b9","src/clients_engine/mod.rs":"461729e6f89b66b2cbd89b041a03d4d6a8ba582284ed4f3015cb13e1a0c6da97","src/clients_engine/record.rs":"b0d84bf420743d7638a45e4836633a45e50257d5548fe7ecd04bff4d724439b8","src/clients_engine/ser.rs":"ef12daeb11faf618fe3cafe91f20a031fe5bb6751369b6ee5aee03f196efe88c","src/device_type.rs":"dc2d4296d25e31471c8e68488f1043ff239b902036cd6aea8a686cf79b4ed335","src/enc_payload.rs":"aa3eea7df49b24cd59831680a47c417b73a3e36e6b0f3f4baf14ca66bd68be6b","src/engine/bridged_engine.rs":"f70f1bfce6e0c04b0c72ec9cbfbb12c82d4009a23fb9768792107d41b2865a4f","src/engine/mod.rs":"90f1f9760f5f712a337aebb04e59c736e4b6fbd89d6a188d969210c7f3f321ae","src/engine/request.rs":"5923025fb9550178339f880a1bf8526d8e853e7a0b2bce6d9d687cc808ac0085","src/engine/sync_engine.rs":"5f6489fa2d92475e79fe2f6e54c9f091f2528e2afe0d1aeebeab3863721efbc9","src/error.rs":"a45cfe02e6301f473c34678b694943c1a04308b8c292c6e0448bf495194c3b5e","src/key_bundle.rs":"abd0781f3be8c8e7c691f18bb71f3433b633803c48da9794e15ac6301ed60d6c","src/lib.rs":"f59f8817978d943518dfa03ab31fc0f6b1fc72ee9943a97aef1537e2769649f5","src/record_types.rs":"02bb3d352fb808131d298f9b90d9c95b7e9e0138b97c5401f3b9fdacc5562f44","src/server_timestamp.rs":"0020f31971ccbfc485894cabc3087459d42252b86d7de07f2136997864b0373b","src/sync15.udl":"005b2b056b93c959a04670f6f489afecb8e17093d8e4be34765a3a4cc0faeb8c","src/telemetry.rs":"e3a7e13e85f5e336526ebf07db04c81b8f1ba89ae1db4159a3a570826cb8cfd2","uniffi.toml":"34488f947497a9b05007445dd816024ef02e6b1696f1056ee868f039722828ee"},"package":null}
+{"files":{"Cargo.toml":"f1c393a0b8b62e476bdde3e01e69087ec1a25597ec1c4a2d996d4f5514a39768","README.md":"6d4ff5b079ac5340d18fa127f583e7ad793c5a2328b8ecd12c3fc723939804f2","build.rs":"aa971160d67ce8626b26e15c04c34b730f594c45c817aae34cfc9f3ea14ae284","src/bso/content.rs":"92935258745bdf0c3915a555cb6884a7fa69faa1290ec2c1815f6e2f3c0f0562","src/bso/crypto.rs":"27602dcccb37d3a55620ee4e16b705da455d49af575de115c7c79c0178eb1d6d","src/bso/mod.rs":"09e723dc7e99295ecafdcadffaf604d66ea27cf2b7f1fd9ab3cac4f4698ff6a7","src/bso/test_utils.rs":"4ec5a2df5e1c0ec14dc770681e959bdcef6ef04f6fde435999197f46a8ae4831","src/client/coll_state.rs":"13e6ef55273baf5536acc369be522e34a803a32cabf19cce43e426aea9b6223e","src/client/coll_update.rs":"dac04a90c29dd969f8b4250414609c9b6d61daf2dfa4ae77d1c4a165ba970b05","src/client/collection_keys.rs":"c27b2277a3a52033b58ab01490fc2ea7007494195dd5e6dc2c6931a4ca96795a","src/client/mod.rs":"8f588d4a035cf79d96f2500f06d5651c1a7c566127c456ffa5429811ddce3fd6","src/client/request.rs":"8841524e37d8195867bdf6ba98c75f610cf47a4644adeebd6372cc6713f2260a","src/client/state.rs":"4e31193ef2471c1dfabf1c6a391bcb95e14ddb45855786a4194ff187d5c9347c","src/client/status.rs":"f445a8765dac9789444e23b5145148413407bb1d18a15ef56682243997f591bf","src/client/storage_client.rs":"8de72d4ba3ca4f68c8e1898466de83a2b543545a18679800cb4f7fbda2dc3183","src/client/sync.rs":"b29abb512ec9d163f7883b71f78c9202802dcb17cad1fc5dc08087fb0bb66704","src/client/sync_multiple.rs":"6e92571132f89744b553190c596be8aff9b2d031d8f79d82c94cdf78b1683f4a","src/client/token.rs":"b268759d31e0fe17e0e2a428694cd9a317fcfbdd52f023d5d8c7cc6f00f1a102","src/client/util.rs":"71cc70ee41f821f53078675e636e9fad9c6046fa1a989e37f5487e340a2277d6","src/client_types.rs":"3c3cac1540b92482f43660d9e43bdde8481c4cc1a98253a68c80e791231f5976","src/clients_engine/engine.rs":"9e11b47be81fc63214f31879af74075674aa50a8f8989afe20fefa7990fa99b9","src/clients_engine/mod.rs":"461729e6f89b66b2cbd89b041a03d4d6a8ba582284ed4f3015cb13e1a0c6da97","src/clients_engine/record.rs":"b0d84bf420743d7638a45e4836633a45e50257d5548fe7ecd04bff4d724439b8","src/clients_engine/ser.rs":"ef12daeb11faf618fe3cafe91f20a031fe5bb6751369b6ee5aee03f196efe88c","src/device_type.rs":"dc2d4296d25e31471c8e68488f1043ff239b902036cd6aea8a686cf79b4ed335","src/enc_payload.rs":"aa3eea7df49b24cd59831680a47c417b73a3e36e6b0f3f4baf14ca66bd68be6b","src/engine/bridged_engine.rs":"f70f1bfce6e0c04b0c72ec9cbfbb12c82d4009a23fb9768792107d41b2865a4f","src/engine/mod.rs":"90f1f9760f5f712a337aebb04e59c736e4b6fbd89d6a188d969210c7f3f321ae","src/engine/request.rs":"5923025fb9550178339f880a1bf8526d8e853e7a0b2bce6d9d687cc808ac0085","src/engine/sync_engine.rs":"531b35d72ce9e04c3e543c0468c1e450fba2c0dc3d33d68d9b1c0a5c1ad7dd34","src/error.rs":"a45cfe02e6301f473c34678b694943c1a04308b8c292c6e0448bf495194c3b5e","src/key_bundle.rs":"abd0781f3be8c8e7c691f18bb71f3433b633803c48da9794e15ac6301ed60d6c","src/lib.rs":"f59f8817978d943518dfa03ab31fc0f6b1fc72ee9943a97aef1537e2769649f5","src/record_types.rs":"02bb3d352fb808131d298f9b90d9c95b7e9e0138b97c5401f3b9fdacc5562f44","src/server_timestamp.rs":"0020f31971ccbfc485894cabc3087459d42252b86d7de07f2136997864b0373b","src/sync15.udl":"005b2b056b93c959a04670f6f489afecb8e17093d8e4be34765a3a4cc0faeb8c","src/telemetry.rs":"e3a7e13e85f5e336526ebf07db04c81b8f1ba89ae1db4159a3a570826cb8cfd2","uniffi.toml":"34488f947497a9b05007445dd816024ef02e6b1696f1056ee868f039722828ee"},"package":null}

third_party/rust/sync15/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2021"
 name = "sync15"
 version = "0.1.0"
-authors = ["application-services@mozilla.com"]
+authors = ["Sync Team <sync-team@mozilla.com>"]
 exclude = [
     "/android",
     "/ios",

third_party/rust/sync15/src/engine/sync_engine.rs

@@ -223,7 +223,15 @@ pub trait SyncEngine {
     /// `assoc` defines how this store is to be associated with sync.
     fn reset(&self, assoc: &EngineSyncAssociation) -> Result<()>;
 
-    fn wipe(&self) -> Result<()>;
+    /// Wipes the engine's data
+    /// This is typically triggered by a client command, which at the time of writing, only
+    /// supported wiping bookmarks.
+    ///
+    /// This panics if triggered on a sync engine that does not explicitly implement wipe, because
+    /// that implies a confustion that shouldn't occur.
+    fn wipe(&self) -> Result<()> {
+        unimplemented!("The engine does not implement wipe, no wipe should be requested")
+    }
 }
 
 #[cfg(test)]

third_party/rust/tabs/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"78673ad0821c15aa4a2f491df9f0012f9405946cf726ea37c7334b300e717dd9","README.md":"c48b8f391ef822c4f3971b5f453a1e7b43bea232752d520460d2f04803aead1a","build.rs":"33e61b811b19ed2b58e319cc65d5988bed258d2c4fea2d706301184c59847a0f","src/error.rs":"2694657aeb12f99c4b2fe102ad2b08b79955d209201831b3e071129f0b7d7eda","src/lib.rs":"7208f78955e015ef8bab7916307e551cd3c1bd56d7fe14f8b53cd53bc4b38555","src/schema.rs":"2b7b51f3c2edc0ca603495c10b917603fd9ac791c4a366080e40d090b13b91f2","src/storage.rs":"4ad235bda076a85660f7825aea518c0d1ae458e7eddf47b1cf1167ca5a52385f","src/store.rs":"ab0b6214b30b0f0fa7c6a89098ff3db1a8f76264f6711c4481c0be460afe522b","src/sync/bridge.rs":"3bf96a7e028efb771854439f7ec183488f831f859396b562bbcf1ece9a6959b3","src/sync/engine.rs":"13656bf027fcbf0b5682a66d29f062177e49250a73ec1fd0cf2af3f1fe59f12f","src/sync/mod.rs":"09ba3c87f1174a243bf5aaa481effd18929d54359ceb9b23ccb2c32ee3482f34","src/sync/record.rs":"896ebc6aa213bac9e6170c7e0b7dbee322f62e5f6c28462cb6da0bfe8ce938ba","src/tabs.udl":"e94706bc555ed082c806b2bc806f494770b66470aa8ee437f7f43eb26fd8f112","uniffi.toml":"f9125e8d55b109e86076ee88bfd640372f06b142b7db557e41816c7227dd445c"},"package":null}
+{"files":{"Cargo.toml":"89500c37861b349dec196fb232b4d55650c71cca37aa2c10cc0ced9f7920e39d","README.md":"c48b8f391ef822c4f3971b5f453a1e7b43bea232752d520460d2f04803aead1a","build.rs":"33e61b811b19ed2b58e319cc65d5988bed258d2c4fea2d706301184c59847a0f","src/error.rs":"2694657aeb12f99c4b2fe102ad2b08b79955d209201831b3e071129f0b7d7eda","src/lib.rs":"7208f78955e015ef8bab7916307e551cd3c1bd56d7fe14f8b53cd53bc4b38555","src/schema.rs":"2b7b51f3c2edc0ca603495c10b917603fd9ac791c4a366080e40d090b13b91f2","src/storage.rs":"4ad235bda076a85660f7825aea518c0d1ae458e7eddf47b1cf1167ca5a52385f","src/store.rs":"ab0b6214b30b0f0fa7c6a89098ff3db1a8f76264f6711c4481c0be460afe522b","src/sync/bridge.rs":"3bf96a7e028efb771854439f7ec183488f831f859396b562bbcf1ece9a6959b3","src/sync/engine.rs":"13656bf027fcbf0b5682a66d29f062177e49250a73ec1fd0cf2af3f1fe59f12f","src/sync/mod.rs":"09ba3c87f1174a243bf5aaa481effd18929d54359ceb9b23ccb2c32ee3482f34","src/sync/record.rs":"896ebc6aa213bac9e6170c7e0b7dbee322f62e5f6c28462cb6da0bfe8ce938ba","src/tabs.udl":"e94706bc555ed082c806b2bc806f494770b66470aa8ee437f7f43eb26fd8f112","uniffi.toml":"f9125e8d55b109e86076ee88bfd640372f06b142b7db557e41816c7227dd445c"},"package":null}

third_party/rust/tabs/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2021"
 name = "tabs"
 version = "0.1.0"
-authors = ["application-services@mozilla.com"]
+authors = ["Sync Team <sync-team@mozilla.com>"]
 exclude = [
     "/android",
     "/ios",