launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #31033
[Merge] ~lgp171188/launchpad:update-bing-custom-search-site-url into launchpad:master
Guruprasad has proposed merging ~lgp171188/launchpad:update-bing-custom-search-site-url into launchpad:master.
Commit message:
Update Bing custom search site URL
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/464314
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:update-bing-custom-search-site-url into launchpad:master.
diff --git a/configs/development/launchpad-lazr.conf b/configs/development/launchpad-lazr.conf
index 4e80454..7527832 100644
--- a/configs/development/launchpad-lazr.conf
+++ b/configs/development/launchpad-lazr.conf
@@ -71,7 +71,7 @@ error_exchange: none
[bing]
# Development and the testrunner should use the stub service by default.
-site: http://launchpad.test:8093/bingcustomsearch/v7.0/search
+site: http://launchpad.test:8093/v7.0/custom/search
subscription_key: abcdef01234567890abcdef012345678
custom_config_id: 1234567890
diff --git a/configs/testrunner/launchpad-lazr.conf b/configs/testrunner/launchpad-lazr.conf
index 5de6421..00503ce 100644
--- a/configs/testrunner/launchpad-lazr.conf
+++ b/configs/testrunner/launchpad-lazr.conf
@@ -90,7 +90,7 @@ source_only: True
root: /tmp/gina_test_archive
[bing]
-site: http://launchpad.test:8093/bingcustomsearch/v7.0/search
+site: http://launchpad.test:8093/v7.0/custom/search
[gpghandler]
upload_keys: True
diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index fed991a..94ca842 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -889,11 +889,11 @@ launch: False
[bing]
# site is the host and path that search requests are made to.
-# eg. https://api.cognitive.microsoft.com/bingcustomsearch/v7.0/search
+# eg. https://api.bing.microsoft.com/v7.0/custom/search
# datatype: string, a url to a host
-site: https://api.cognitive.microsoft.com/bingcustomsearch/v7.0/search
+site: https://api.bing.microsoft.com/v7.0/custom/search
-# subscription_key is the Cognitive Services subscription key for
+# subscription_key is the Bing subscription key for
# Bing Custom Search API.
# datatype: string
subscription_key:
diff --git a/lib/lp/services/sitesearch/__init__.py b/lib/lp/services/sitesearch/__init__.py
index 8e78f60..822bae6 100644
--- a/lib/lp/services/sitesearch/__init__.py
+++ b/lib/lp/services/sitesearch/__init__.py
@@ -182,7 +182,7 @@ class BingSearchService:
"""The URL to the Bing Custom Search service.
The URL is probably
- https://api.cognitive.microsoft.com/bingcustomsearch/v7.0/search.
+ https://api.bing.microsoft.com/v7.0/custom/search.
"""
return config.bing.site
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json
index 835c9dd..07d7471 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json
@@ -13,7 +13,7 @@
"totalEstimatedMatches": 25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";,
"name": "Launchpad Bugs",
"url": "https://launchpad.net/~ubuntu-bugs";,
"urlPingSuffix": "DevEx,5080.1",
@@ -24,7 +24,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1";,
"name": "Bugs in Ubuntu Linux",
"url": "https://launchpad.net/gcleaner";,
"urlPingSuffix": "DevEx,5095.1",
@@ -35,7 +35,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2";,
"name": "Bugs related to Sample Person",
"url": "https://help.launchpad.net/BugExpiry";,
"urlPingSuffix": "DevEx,5110.1",
@@ -46,7 +46,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3";,
"name": "Bug #1 in Mozilla Firefox: Firefox does not support SVG",
"url": "https://launchpad.net/longomatch";,
"urlPingSuffix": "DevEx,5125.1",
@@ -57,7 +57,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4";,
"name": "Bugs in Source Package \"thunderbird\" in Ubuntu Linux",
"url": "https://answers.launchpad.net/heat/+question/232632";,
"urlPingSuffix": "DevEx,5140.1",
@@ -69,7 +69,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.5";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.5";,
"name": "Sandpad in Launchpad",
"url": "https://launchpad.net/sandpad";,
"urlPingSuffix": "DevEx,5154.1",
@@ -80,7 +80,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.6";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.6";,
"name": "Eventum in Launchpad",
"url": "https://launchpad.net/eventum";,
"urlPingSuffix": "DevEx,5169.1",
@@ -91,7 +91,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.7";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.7";,
"name": "Inkscape 0.48.2 \"0.48.2\" - Launchpad",
"url": "https://launchpad.net/inkscape/+milestone/0.48.2";,
"urlPingSuffix": "DevEx,5182.1",
@@ -102,7 +102,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.8";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.8";,
"name": "Code Hosting - Launchpad tour",
"url": "https://launchpad.net/+tour/branch-hosting-tracking";,
"urlPingSuffix": "DevEx,5195.1",
@@ -113,7 +113,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.9";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.9";,
"name": "gdiskdump project files : gdiskdump",
"url": "https://launchpad.net/gdiskdump/+download";,
"urlPingSuffix": "DevEx,5208.1",
@@ -124,7 +124,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.10";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.10";,
"name": "Bug #1747091 “epicsTimeGetEvent() / generalTime bug ...",
"url": "https://code.launchpad.net/bugs/1747091";,
"urlPingSuffix": "DevEx,5220.1",
@@ -135,7 +135,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.11";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.11";,
"name": "Bug #96441 “timer updates use too much CPU” : Bugs : Jokosher",
"url": "https://launchpad.net/jokosher/+bug/96441";,
"urlPingSuffix": "DevEx,5232.1",
@@ -146,7 +146,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.12";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.12";,
"name": "Series 17.10 : Mahara",
"url": "https://launchpad.net/mahara/17.10";,
"urlPingSuffix": "DevEx,5247.1",
@@ -157,7 +157,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.13";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.13";,
"name": "sap in Launchpad",
"url": "https://launchpad.net/sap+";,
"urlPingSuffix": "DevEx,5260.1",
@@ -168,7 +168,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.14";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.14";,
"name": "Code/BugAndBlueprintLinks - Launchpad Help",
"url": "https://help.launchpad.net/Code/BugAndBlueprintLinks";,
"urlPingSuffix": "DevEx,5275.1",
@@ -179,7 +179,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.15";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.15";,
"name": "One Hundred Papercuts in Launchpad",
"url": "https://launchpad.net/hundredpapercuts";,
"urlPingSuffix": "DevEx,5289.1",
@@ -190,7 +190,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.16";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.16";,
"name": "Little Software Stats in Launchpad",
"url": "https://launchpad.net/lilsoftstats/";,
"urlPingSuffix": "DevEx,5304.1",
@@ -201,7 +201,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.17";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.17";,
"name": "Take the tour - Launchpad tour",
"url": "https://launchpad.net/+tour";,
"urlPingSuffix": "DevEx,5317.1",
@@ -212,7 +212,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.18";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.18";,
"name": "EOEC in Launchpad",
"url": "https://launchpad.net/eoec";,
"urlPingSuffix": "DevEx,5332.1",
@@ -223,7 +223,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.19";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.19";,
"name": "Bug #1210747 “taskdef name not specified” : Bugs : Radkarte",
"url": "https://launchpad.net/radkarte/+bug/1210747";,
"urlPingSuffix": "DevEx,5345.1",
@@ -242,140 +242,140 @@
"answerType": "WebPages",
"resultIndex": 0,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";
}
},
{
"answerType": "WebPages",
"resultIndex": 1,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1";
}
},
{
"answerType": "WebPages",
"resultIndex": 2,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2";
}
},
{
"answerType": "WebPages",
"resultIndex": 3,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3";
}
},
{
"answerType": "WebPages",
"resultIndex": 4,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4";
}
},
{
"answerType": "WebPages",
"resultIndex": 5,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.5";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.5";
}
},
{
"answerType": "WebPages",
"resultIndex": 6,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.6";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.6";
}
},
{
"answerType": "WebPages",
"resultIndex": 7,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.7";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.7";
}
},
{
"answerType": "WebPages",
"resultIndex": 8,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.8";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.8";
}
},
{
"answerType": "WebPages",
"resultIndex": 9,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.9";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.9";
}
},
{
"answerType": "WebPages",
"resultIndex": 10,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.10";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.10";
}
},
{
"answerType": "WebPages",
"resultIndex": 11,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.11";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.11";
}
},
{
"answerType": "WebPages",
"resultIndex": 12,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.12";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.12";
}
},
{
"answerType": "WebPages",
"resultIndex": 13,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.13";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.13";
}
},
{
"answerType": "WebPages",
"resultIndex": 14,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.14";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.14";
}
},
{
"answerType": "WebPages",
"resultIndex": 15,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.15";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.15";
}
},
{
"answerType": "WebPages",
"resultIndex": 16,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.16";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.16";
}
},
{
"answerType": "WebPages",
"resultIndex": 17,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.17";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.17";
}
},
{
"answerType": "WebPages",
"resultIndex": 18,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.18";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.18";
}
},
{
"answerType": "WebPages",
"resultIndex": 19,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.19";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.19";
}
}
]
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json
index 8cab9aa..9c2c256 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json
@@ -13,7 +13,7 @@
"totalEstimatedMatches": 25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";,
"name": "Bug #2 in Ubuntu Hoary: “Blackhole Trash folder”",
"url": "http://bugs.launchpad.test/ubuntu/hoary/+bug/2";,
"urlPingSuffix": "DevEx,5103.1",
@@ -56,7 +56,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1";,
"name": "Bug #2 in mozilla-firefox (Debian): “Blackhole Trash folder”",
"url": "http://bugs.launchpad.test/debian/+source/mozilla-firefox/+bug/2";,
"urlPingSuffix": "DevEx,5149.1",
@@ -67,7 +67,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2";,
"name": "Bug #3 in mozilla-firefox (Debian): “Bug Title Test”",
"url": "http://bugs.launchpad.test/debian/+source/mozilla-firefox/+bug/3";,
"urlPingSuffix": "DevEx,5178.1",
@@ -78,7 +78,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3";,
"name": "Bug trackers registered in Launchpad",
"url": "http://bugs.launchpad.test/bugs/bugtrackers";,
"urlPingSuffix": "DevEx,5193.1",
@@ -89,7 +89,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4";,
"name": "Bug tracker “Debian Bug tracker”",
"url": "http://bugs.launchpad.test/bugs/bugtrackers/debbugs";,
"urlPingSuffix": "DevEx,5208.1",
@@ -113,35 +113,35 @@
"answerType": "WebPages",
"resultIndex": 0,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";
}
},
{
"answerType": "WebPages",
"resultIndex": 1,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1";
}
},
{
"answerType": "WebPages",
"resultIndex": 2,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2";
}
},
{
"answerType": "WebPages",
"resultIndex": 3,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3";
}
},
{
"answerType": "WebPages",
"resultIndex": 4,
"value": {
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4";
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4";
}
}
]
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt b/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt
index 1beae6e..aaa3e28 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt
@@ -8,21 +8,21 @@
* bingsearchservice-no-results.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=bug bingsearchservice-bugs-1.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=bug bingsearchservice-bugs-1.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=bug bingsearchservice-bugs-2.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=bug bingsearchservice-bugs-2.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=launchpad bingsearchservice-bugs-1.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=launchpad bingsearchservice-bugs-1.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=launchpad bingsearchservice-bugs-2.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=launchpad bingsearchservice-bugs-2.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=gnomebaker bingsearchservice-incomplete-response.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=gnomebaker bingsearchservice-incomplete-response.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=no-meaningful bingsearchservice-no-meaningful-results.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=no-meaningful bingsearchservice-no-meaningful-results.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=errors-please bingsearchservice-error.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=errors-please bingsearchservice-error.json
-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=xss bingsearchservice-xss.json
+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=xss bingsearchservice-xss.json
# This stub service is also used to impersonate the Blog feed
/blog-feed blog.launchpad.net-feed.xml
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json
index e9fe2d2..b1344c3 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json
@@ -4,7 +4,7 @@
"totalEstimatedMatches": -25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";,
"name": "Ubuntu Bugs in Launchpad",
"url": "https://launchpad.net/~ubuntu-bugs";,
"urlPingSuffix": "DevEx,5080.1",
@@ -14,7 +14,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2";,
"name": "BugExpiry - Launchpad Help",
"url": "https://help.launchpad.net/BugExpiry";,
"urlPingSuffix": "DevEx,5110.1",
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json
index f46892a..5aaf189 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json
@@ -4,7 +4,7 @@
"totalEstimatedMatches": -25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";,
"url": "https://launchpad.net/~ubuntu-bugs";,
"urlPingSuffix": "DevEx,5080.1",
"isFamilyFriendly": true,
@@ -14,7 +14,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1";,
"name": "GCleaner in Launchpad",
"url": "https://launchpad.net/gcleaner";,
"urlPingSuffix": "DevEx,5095.1",
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json
index 29037d2..dc5d3a6 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json
@@ -4,7 +4,7 @@
"totalEstimatedMatches": -25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";,
"name": "Ubuntu Bugs in Launchpad",
"urlPingSuffix": "DevEx,5080.1",
"isFamilyFriendly": true,
@@ -14,7 +14,7 @@
"fixedPosition": false
},
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3";,
"name": "LongoMatch in Launchpad",
"url": "https://launchpad.net/longomatch";,
"urlPingSuffix": "DevEx,5125.1",
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json
index 8655fcb..1b2f571 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json
@@ -4,7 +4,7 @@
"totalEstimatedMatches": 25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2";,
"url": "https://help.launchpad.net/BugExpiry";,
"urlPingSuffix": "DevEx,5110.1",
"isFamilyFriendly": true,
diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json
index 18251d8..43a3ff4 100644
--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json
+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json
@@ -4,7 +4,7 @@
"totalEstimatedMatches": -25,
"value": [
{
- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0";,
+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0";,
"name": "Bug #1349491 “[OSSA 2014-027] Persistent <XSS> in the Host Aggrega...” : Bugs ...",
"url": "https://bugs.launchpad.net/horizon/+bug/1349491";,
"urlPingSuffix": "DevEx,5154.1",
