Bug 1861662 - Update Amazon search engines. r=Standard8

Differential Revision: https://phabricator.services.mozilla.com/D192269
2024-11-23 12:51:06 +00:00 · 2023-11-01 20:12:28 +00:00 · 2023-11-01 20:12:28 +00:00 · 99a9eed20c
commit 99a9eed20c
parent 06ccb24c32
21 changed files with 57 additions and 150 deletions
--- a/browser/components/search/extensions/amazon/_locales/au/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/au/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.com.au Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.com.au/exec/obidos/external-search/"
+    "message": "https://www.amazon.com.au/s"
  },
  "searchForm": {
-    "message": "https://www.amazon.com.au/exec/obidos/external-search/"
+    "message": "https://www.amazon.com.au/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.com.au/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=111172"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/ca/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/ca/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.ca Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.ca/exec/obidos/external-search/"
+    "message": "https://www.amazon.ca/s"
  },
  "searchForm": {
-    "message": "https://www.amazon.ca/exec/obidos/external-search/"
+    "message": "https://www.amazon.ca/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillacanada-20&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.ca/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=7"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/de/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/de/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.de Suche"
  },
  "searchUrl": {
-    "message": "https://www.amazon.de/exec/obidos/external-search/"
+    "message": "https://www.amazon.de/s"
  },
  "searchForm": {
    "message": "https://www.amazon.de/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-de-21&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.de/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=4"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/en-GB/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/en-GB/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.co.uk Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.co.uk/exec/obidos/external-search/"
+    "message": "https://www.amazon.co.uk/s"
  },
  "searchForm": {
    "message": "https://www.amazon.co.uk/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-uk-21&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.co.uk/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=3"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/france/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/france/messages.json
@ -6,18 +6,12 @@
    "message": "Recherche Amazon.fr"
  },
  "searchUrl": {
-    "message": "https://www.amazon.fr/exec/obidos/external-search/"
+    "message": "https://www.amazon.fr/s"
  },
  "searchForm": {
    "message": "https://www.amazon.fr/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-fr-21&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.fr/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=5"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/in/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/in/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.in Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.in/exec/obidos/external-search/"
+    "message": "https://www.amazon.in/s"
  },
  "searchForm": {
    "message": "https://www.amazon.in/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.in/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=44571"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/it/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/it/messages.json
@ -6,18 +6,12 @@
    "message": "Ricerca Amazon.it"
  },
  "searchUrl": {
-    "message": "https://www.amazon.it/exec/obidos/external-search/"
+    "message": "https://www.amazon.it/s"
  },
  "searchForm": {
    "message": "https://www.amazon.it/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefoxit-21&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.it/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=35691"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/nl/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/nl/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.nl Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.nl/gp/search"
+    "message": "https://www.amazon.nl/s"
  },
  "searchForm": {
    "message": "https://www.amazon.nl/"
  },
  "searchUrlGetParams": {
-    "message": "ie={inputEncoding}&tag=mozillanether-21&index=aps&keywords={searchTerms}"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.nl/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=328451"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/spain/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/spain/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.es"
  },
  "searchUrl": {
-    "message": "https://www.amazon.es/exec/obidos/external-search/"
+    "message": "https://www.amazon.es/s"
  },
  "searchForm": {
    "message": "https://www.amazon.es/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillaspain-21&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.es/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=44551"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/_locales/sweden/messages.json
+++ b/browser/components/search/extensions/amazon/_locales/sweden/messages.json
@ -6,18 +6,12 @@
    "message": "Amazon.se"
  },
  "searchUrl": {
-    "message": "https://www.amazon.se/exec/obidos/external-search/"
+    "message": "https://www.amazon.se/s"
  },
  "searchForm": {
    "message": "https://www.amazon.se/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillasweede-21&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.se/search/complete"
-  },
-  "suggestUrlGetParams": {
-    "message": "q={searchTerms}&search-alias=aps&mkt=704403121"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazon/manifest.json
+++ b/browser/components/search/extensions/amazon/manifest.json
@ -2,7 +2,7 @@
  "name": "__MSG_extensionName__",
  "description": "__MSG_extensionDescription__",
  "manifest_version": 2,
-  "version": "1.12",
+  "version": "1.13",
  "browser_specific_settings": {
    "gecko": {
      "id": "amazon@search.mozilla.org"
@ -20,9 +20,7 @@
      "name": "__MSG_extensionName__",
      "search_url": "__MSG_searchUrl__",
      "search_form": "__MSG_searchForm__",
-      "search_url_get_params": "__MSG_searchUrlGetParams__",
-      "suggest_url": "__MSG_suggestUrl__",
-      "suggest_url_get_params": "__MSG_suggestUrlGetParams__"
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
    }
  }
 }
--- a/browser/components/search/extensions/amazondotcn/_locales/default/messages.json
+++ b/browser/components/search/extensions/amazondotcn/_locales/default/messages.json
@ -1,8 +1,8 @@
 {
  "searchUrl": {
-    "message": "https://www.amazon.cn/mn/searchApp"
+    "message": "https://www.amazon.cn/s"
  },
  "searchUrlGetParams": {
-    "message": "ix=sunray&pageletid=headsearch&searchType=&Go.x=0&Go.y=0&bestSaleNum=0&keywords={searchTerms}"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json
+++ b/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json
@ -1,8 +1,8 @@
 {
  "searchUrl": {
-    "message": "https://www.amazon.cn/gp/search"
+    "message": "https://www.amazon.cn/s"
  },
  "searchUrlGetParams": {
-    "message": "ie=UTF8&camp=536&creative=3200&index=aps&linkCode=ur2&tag=mozilla&keywords={searchTerms}"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazondotcn/manifest.json
+++ b/browser/components/search/extensions/amazondotcn/manifest.json
@ -2,7 +2,7 @@
  "name": "亚马逊",
  "description": "亚马逊搜索",
  "manifest_version": 2,
-  "version": "1.2",
+  "version": "1.3",
  "browser_specific_settings": {
    "gecko": {
      "id": "amazondotcn@search.mozilla.org"
--- a/browser/components/search/extensions/amazondotcom/_locales/en/messages.json
+++ b/browser/components/search/extensions/amazondotcom/_locales/en/messages.json
@ -6,15 +6,12 @@
    "message": "Amazon.com Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.com/exec/obidos/external-search/"
+    "message": "https://www.amazon.com/s"
  },
  "searchForm": {
-    "message": "https://www.amazon.com/exec/obidos/external-search/"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
+    "message": "https://www.amazon.com/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazondotcom/_locales/us/messages.json
+++ b/browser/components/search/extensions/amazondotcom/_locales/us/messages.json
@ -6,15 +6,12 @@
    "message": "Amazon.com Search"
  },
  "searchUrl": {
-    "message": "https://www.amazon.com/exec/obidos/external-search/"
+    "message": "https://www.amazon.com/s"
  },
  "searchForm": {
-    "message": "https://www.amazon.com/exec/obidos/external-search/"
-  },
-  "suggestUrl": {
-    "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
+    "message": "https://www.amazon.com/"
  },
  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=moz-us-20&sourceid=Mozilla-search"
+    "message": "k={searchTerms}"
  }
 }
--- a/browser/components/search/extensions/amazondotcom/manifest.json
+++ b/browser/components/search/extensions/amazondotcom/manifest.json
@ -2,7 +2,7 @@
  "name": "__MSG_extensionName__",
  "description": "__MSG_extensionDescription__",
  "manifest_version": 2,
-  "version": "1.6",
+  "version": "1.7",
  "browser_specific_settings": {
    "gecko": {
      "id": "amazondotcom@search.mozilla.org"
@ -20,7 +20,6 @@
      "name": "__MSG_extensionName__",
      "search_url": "__MSG_searchUrl__",
      "search_form": "__MSG_searchForm__",
-      "suggest_url": "__MSG_suggestUrl__",
      "search_url_get_params": "__MSG_searchUrlGetParams__"
    }
  }
--- a/browser/components/search/test/browser/browser_searchEngine_behaviors.js
+++ b/browser/components/search/test/browser/browser_searchEngine_behaviors.js
@ -10,8 +10,7 @@
 const SEARCH_ENGINE_DETAILS = [
  {
    alias: "a",
-    baseURL:
-      "https://www.amazon.com/exec/obidos/external-search/?field-keywords=foo&ie=UTF-8&mode=blended&tag=moz-us-20&sourceid=Mozilla-search",
+    baseURL: "https://www.amazon.com/s?k=foo",
    codes: {
      context: "",
      keyword: "",
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@ -108,3 +108,9 @@ browser/chrome/browser/skin/classic/browser/customize.svg
 # Bug 1718144 - De-duplicate lightbulb icon
 browser/features/webcompat-reporter@mozilla.org/icons/lightbulb.svg
 chrome/toolkit/skin/classic/global/icons/lightbulb.svg
+
+# Bug 1861662 - These will be removed with new search config changes
+browser/chrome/browser/search-extensions/amazondotcn/_locales/default/messages.json
+browser/chrome/browser/search-extensions/amazondotcn/_locales/mozillaonline/messages.json
+browser/chrome/browser/search-extensions/amazondotcom/_locales/en/messages.json
+browser/chrome/browser/search-extensions/amazondotcom/_locales/us/messages.json
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js
@ -116,8 +116,7 @@ const test = new SearchConfigTest({
          regions: ["au"],
        },
      ],
-      suggestionUrlBase: "https://completion.amazon.com.au/search/complete",
-      suggestUrlCode: "mkt=111172",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.ca",
@ -128,9 +127,7 @@ const test = new SearchConfigTest({
          regions: ["ca"],
        },
      ],
-      searchUrlCode: "tag=mozillacanada-20",
-      suggestionUrlBase: "https://completion.amazon.ca/search/complete",
-      suggestUrlCode: "mkt=7",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.cn",
@ -140,7 +137,6 @@ const test = new SearchConfigTest({
          regions: ["cn"],
        },
      ],
-      searchUrlCode: "ix=sunray",
      noSuggestionsURL: true,
    },
    {
@ -153,8 +149,7 @@ const test = new SearchConfigTest({
        },
      ],
      searchUrlCode: "tag=mozillajapan-fx-22",
-      suggestionUrlBase: "https://completion.amazon.co.jp/search/complete",
-      suggestUrlCode: "mkt=6",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.co.uk",
@ -165,9 +160,7 @@ const test = new SearchConfigTest({
          regions: ["gb", "ie"],
        },
      ],
-      searchUrlCode: "tag=firefox-uk-21",
-      suggestionUrlBase: "https://completion.amazon.co.uk/search/complete",
-      suggestUrlCode: "mkt=3",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.com",
@ -178,7 +171,7 @@ const test = new SearchConfigTest({
          regions: ["us"],
        },
      ],
-      searchUrlCode: "tag=moz-us-20",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.com",
@ -192,7 +185,7 @@ const test = new SearchConfigTest({
        },
      ],
      excluded: [{ regions: mainShippedRegions }],
-      searchUrlCode: "tag=mozilla-20",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.de",
@ -203,9 +196,7 @@ const test = new SearchConfigTest({
          regions: ["at", "ch", "de"],
        },
      ],
-      searchUrlCode: "tag=firefox-de-21",
-      suggestionUrlBase: "https://completion.amazon.de/search/complete",
-      suggestUrlCode: "mkt=4",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.es",
@ -216,9 +207,7 @@ const test = new SearchConfigTest({
          regions: ["es", "pt"],
        },
      ],
-      searchUrlCode: "tag=mozillaspain-21",
-      suggestionUrlBase: "https://completion.amazon.es/search/complete",
-      suggestUrlCode: "mkt=44551",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.fr",
@ -235,9 +224,7 @@ const test = new SearchConfigTest({
          },
        },
      ],
-      searchUrlCode: "tag=firefox-fr-21",
-      suggestionUrlBase: "https://completion.amazon.fr/search/complete",
-      suggestUrlCode: "mkt=5",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.in",
@ -251,8 +238,7 @@ const test = new SearchConfigTest({
          regions: ["in"],
        },
      ],
-      suggestionUrlBase: "https://completion.amazon.in/search/complete",
-      suggestUrlCode: "mkt=44571",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.it",
@ -263,9 +249,7 @@ const test = new SearchConfigTest({
          regions: ["it", "sm", "va"],
        },
      ],
-      searchUrlCode: "tag=firefoxit-21",
-      suggestionUrlBase: "https://completion.amazon.it/search/complete",
-      suggestUrlCode: "mkt=35691",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.nl",
@ -276,9 +260,7 @@ const test = new SearchConfigTest({
          regions: ["nl"],
        },
      ],
-      searchUrlCode: "tag=mozillanether-21",
-      suggestionUrlBase: "https://completion.amazon.nl/search/complete",
-      suggestUrlCode: "mkt=328451",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.nl",
@ -296,9 +278,7 @@ const test = new SearchConfigTest({
          },
        },
      ],
-      searchUrlCode: "tag=mozillanether-21",
-      suggestionUrlBase: "https://completion.amazon.nl/search/complete",
-      suggestUrlCode: "mkt=328451",
+      noSuggestionsURL: true,
    },
    {
      domain: "amazon.se",
@ -309,9 +289,7 @@ const test = new SearchConfigTest({
          regions: ["se"],
        },
      ],
-      searchUrlCode: "tag=mozillasweede-21",
-      suggestionUrlBase: "https://completion.amazon.se/search/complete",
-      suggestUrlCode: "mkt=704403121",
+      noSuggestionsURL: true,
    },
  ],
 });
@ -337,7 +315,6 @@ add_task(async function test_searchConfig_amazon_pre89() {
    d => d.telemetryId == "amazondotcom-us"
  );
  details.telemetryId = "amazondotcom";
-  details.searchUrlCode = "tag=mozilla-20";

  // nl not present due to urls that don't work.
  let availableIn = test._config.available.included;
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js
@ -78,12 +78,6 @@ tests.push({
  region: "CN",
  distribution: "MozillaOnline",
  test: engines =>
-    hasParams(engines, "亚马逊", "searchbar", "ie=UTF8") &&
-    hasParams(engines, "亚马逊", "suggestions", "tag=mozilla") &&
-    hasParams(engines, "亚马逊", "homepage", "camp=536") &&
-    hasParams(engines, "亚马逊", "homepage", "creative=3200") &&
-    hasParams(engines, "亚马逊", "homepage", "index=aps") &&
-    hasParams(engines, "亚马逊", "homepage", "linkCode=ur2") &&
    hasEnginesFirst(engines, ["百度", "Bing", "Google", "亚马逊", "维基百科"]),
 });