Launchpad itself

Merge ~lgp171188/launchpad:update-bing-custom-search-site-url into launchpad:master

  1. Git
  2. lp:~lgp171188/launchpad
  3. update-bing-custom-search-site-url
  4. Merge into master
Proposed by Guruprasad
Status: Merged
Approved by: Guruprasad
Approved revision: 428a0659b86884fe0e20a10ab9a52f3cdea983c1
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~lgp171188/launchpad:update-bing-custom-search-site-url
Merge into: launchpad:master
Diff against target: 619 lines (+72/-72)
12 files modified
configs/development/launchpad-lazr.conf (+1/-1)
configs/testrunner/launchpad-lazr.conf (+1/-1)
lib/lp/services/config/schema-lazr.conf (+3/-3)
lib/lp/services/sitesearch/__init__.py (+1/-1)
lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json (+40/-40)
lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json (+10/-10)
lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt (+8/-8)
lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json (+2/-2)
lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json (+2/-2)
lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json (+2/-2)
lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json (+1/-1)
lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json (+1/-1)
Reviewer Review Type Date Requested Status
Clinton Fung Approve
Review via email: mp+464314@code.launchpad.net

Commit message

Update Bing custom search site URL

To post a comment you must log in.
Revision history for this message
Clinton Fung (clinton-fung) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/configs/development/launchpad-lazr.conf b/configs/development/launchpad-lazr.conf
2index 4e80454..7527832 100644
3--- a/configs/development/launchpad-lazr.conf
4+++ b/configs/development/launchpad-lazr.conf
5@@ -71,7 +71,7 @@ error_exchange: none
6
7 [bing]
8 # Development and the testrunner should use the stub service by default.
9-site: http://launchpad.test:8093/bingcustomsearch/v7.0/search
10+site: http://launchpad.test:8093/v7.0/custom/search
11 subscription_key: abcdef01234567890abcdef012345678
12 custom_config_id: 1234567890
13
14diff --git a/configs/testrunner/launchpad-lazr.conf b/configs/testrunner/launchpad-lazr.conf
15index 5de6421..00503ce 100644
16--- a/configs/testrunner/launchpad-lazr.conf
17+++ b/configs/testrunner/launchpad-lazr.conf
18@@ -90,7 +90,7 @@ source_only: True
19 root: /tmp/gina_test_archive
20
21 [bing]
22-site: http://launchpad.test:8093/bingcustomsearch/v7.0/search
23+site: http://launchpad.test:8093/v7.0/custom/search
24
25 [gpghandler]
26 upload_keys: True
27diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
28index fed991a..94ca842 100644
29--- a/lib/lp/services/config/schema-lazr.conf
30+++ b/lib/lp/services/config/schema-lazr.conf
31@@ -889,11 +889,11 @@ launch: False
32
33 [bing]
34 # site is the host and path that search requests are made to.
35-# eg. https://api.cognitive.microsoft.com/bingcustomsearch/v7.0/search
36+# eg. https://api.bing.microsoft.com/v7.0/custom/search
37 # datatype: string, a url to a host
38-site: https://api.cognitive.microsoft.com/bingcustomsearch/v7.0/search
39+site: https://api.bing.microsoft.com/v7.0/custom/search
40
41-# subscription_key is the Cognitive Services subscription key for
42+# subscription_key is the Bing subscription key for
43 # Bing Custom Search API.
44 # datatype: string
45 subscription_key:
46diff --git a/lib/lp/services/sitesearch/__init__.py b/lib/lp/services/sitesearch/__init__.py
47index 8e78f60..822bae6 100644
48--- a/lib/lp/services/sitesearch/__init__.py
49+++ b/lib/lp/services/sitesearch/__init__.py
50@@ -182,7 +182,7 @@ class BingSearchService:
51 """The URL to the Bing Custom Search service.
52
53 The URL is probably
54- https://api.cognitive.microsoft.com/bingcustomsearch/v7.0/search.
55+ https://api.bing.microsoft.com/v7.0/custom/search.
56 """
57 return config.bing.site
58
59diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json
60index 835c9dd..07d7471 100644
61--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json
62+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-1.json
63@@ -13,7 +13,7 @@
64 "totalEstimatedMatches": 25,
65 "value": [
66 {
67- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0",
68+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0",
69 "name": "Launchpad Bugs",
70 "url": "https://launchpad.net/~ubuntu-bugs",
71 "urlPingSuffix": "DevEx,5080.1",
72@@ -24,7 +24,7 @@
73 "fixedPosition": false
74 },
75 {
76- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1",
77+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1",
78 "name": "Bugs in Ubuntu Linux",
79 "url": "https://launchpad.net/gcleaner",
80 "urlPingSuffix": "DevEx,5095.1",
81@@ -35,7 +35,7 @@
82 "fixedPosition": false
83 },
84 {
85- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2",
86+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2",
87 "name": "Bugs related to Sample Person",
88 "url": "https://help.launchpad.net/BugExpiry",
89 "urlPingSuffix": "DevEx,5110.1",
90@@ -46,7 +46,7 @@
91 "fixedPosition": false
92 },
93 {
94- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3",
95+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3",
96 "name": "Bug #1 in Mozilla Firefox: Firefox does not support SVG",
97 "url": "https://launchpad.net/longomatch",
98 "urlPingSuffix": "DevEx,5125.1",
99@@ -57,7 +57,7 @@
100 "fixedPosition": false
101 },
102 {
103- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4",
104+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4",
105 "name": "Bugs in Source Package \"thunderbird\" in Ubuntu Linux",
106 "url": "https://answers.launchpad.net/heat/+question/232632",
107 "urlPingSuffix": "DevEx,5140.1",
108@@ -69,7 +69,7 @@
109 "fixedPosition": false
110 },
111 {
112- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.5",
113+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.5",
114 "name": "Sandpad in Launchpad",
115 "url": "https://launchpad.net/sandpad",
116 "urlPingSuffix": "DevEx,5154.1",
117@@ -80,7 +80,7 @@
118 "fixedPosition": false
119 },
120 {
121- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.6",
122+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.6",
123 "name": "Eventum in Launchpad",
124 "url": "https://launchpad.net/eventum",
125 "urlPingSuffix": "DevEx,5169.1",
126@@ -91,7 +91,7 @@
127 "fixedPosition": false
128 },
129 {
130- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.7",
131+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.7",
132 "name": "Inkscape 0.48.2 \"0.48.2\" - Launchpad",
133 "url": "https://launchpad.net/inkscape/+milestone/0.48.2",
134 "urlPingSuffix": "DevEx,5182.1",
135@@ -102,7 +102,7 @@
136 "fixedPosition": false
137 },
138 {
139- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.8",
140+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.8",
141 "name": "Code Hosting - Launchpad tour",
142 "url": "https://launchpad.net/+tour/branch-hosting-tracking",
143 "urlPingSuffix": "DevEx,5195.1",
144@@ -113,7 +113,7 @@
145 "fixedPosition": false
146 },
147 {
148- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.9",
149+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.9",
150 "name": "gdiskdump project files : gdiskdump",
151 "url": "https://launchpad.net/gdiskdump/+download",
152 "urlPingSuffix": "DevEx,5208.1",
153@@ -124,7 +124,7 @@
154 "fixedPosition": false
155 },
156 {
157- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.10",
158+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.10",
159 "name": "Bug #1747091 “epicsTimeGetEvent() / generalTime bug ...",
160 "url": "https://code.launchpad.net/bugs/1747091",
161 "urlPingSuffix": "DevEx,5220.1",
162@@ -135,7 +135,7 @@
163 "fixedPosition": false
164 },
165 {
166- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.11",
167+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.11",
168 "name": "Bug #96441 “timer updates use too much CPU” : Bugs : Jokosher",
169 "url": "https://launchpad.net/jokosher/+bug/96441",
170 "urlPingSuffix": "DevEx,5232.1",
171@@ -146,7 +146,7 @@
172 "fixedPosition": false
173 },
174 {
175- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.12",
176+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.12",
177 "name": "Series 17.10 : Mahara",
178 "url": "https://launchpad.net/mahara/17.10",
179 "urlPingSuffix": "DevEx,5247.1",
180@@ -157,7 +157,7 @@
181 "fixedPosition": false
182 },
183 {
184- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.13",
185+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.13",
186 "name": "sap in Launchpad",
187 "url": "https://launchpad.net/sap+",
188 "urlPingSuffix": "DevEx,5260.1",
189@@ -168,7 +168,7 @@
190 "fixedPosition": false
191 },
192 {
193- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.14",
194+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.14",
195 "name": "Code/BugAndBlueprintLinks - Launchpad Help",
196 "url": "https://help.launchpad.net/Code/BugAndBlueprintLinks",
197 "urlPingSuffix": "DevEx,5275.1",
198@@ -179,7 +179,7 @@
199 "fixedPosition": false
200 },
201 {
202- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.15",
203+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.15",
204 "name": "One Hundred Papercuts in Launchpad",
205 "url": "https://launchpad.net/hundredpapercuts",
206 "urlPingSuffix": "DevEx,5289.1",
207@@ -190,7 +190,7 @@
208 "fixedPosition": false
209 },
210 {
211- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.16",
212+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.16",
213 "name": "Little Software Stats in Launchpad",
214 "url": "https://launchpad.net/lilsoftstats/",
215 "urlPingSuffix": "DevEx,5304.1",
216@@ -201,7 +201,7 @@
217 "fixedPosition": false
218 },
219 {
220- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.17",
221+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.17",
222 "name": "Take the tour - Launchpad tour",
223 "url": "https://launchpad.net/+tour",
224 "urlPingSuffix": "DevEx,5317.1",
225@@ -212,7 +212,7 @@
226 "fixedPosition": false
227 },
228 {
229- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.18",
230+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.18",
231 "name": "EOEC in Launchpad",
232 "url": "https://launchpad.net/eoec",
233 "urlPingSuffix": "DevEx,5332.1",
234@@ -223,7 +223,7 @@
235 "fixedPosition": false
236 },
237 {
238- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.19",
239+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.19",
240 "name": "Bug #1210747 “taskdef name not specified” : Bugs : Radkarte",
241 "url": "https://launchpad.net/radkarte/+bug/1210747",
242 "urlPingSuffix": "DevEx,5345.1",
243@@ -242,140 +242,140 @@
244 "answerType": "WebPages",
245 "resultIndex": 0,
246 "value": {
247- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0"
248+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0"
249 }
250 },
251 {
252 "answerType": "WebPages",
253 "resultIndex": 1,
254 "value": {
255- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1"
256+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1"
257 }
258 },
259 {
260 "answerType": "WebPages",
261 "resultIndex": 2,
262 "value": {
263- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2"
264+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2"
265 }
266 },
267 {
268 "answerType": "WebPages",
269 "resultIndex": 3,
270 "value": {
271- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3"
272+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3"
273 }
274 },
275 {
276 "answerType": "WebPages",
277 "resultIndex": 4,
278 "value": {
279- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4"
280+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4"
281 }
282 },
283 {
284 "answerType": "WebPages",
285 "resultIndex": 5,
286 "value": {
287- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.5"
288+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.5"
289 }
290 },
291 {
292 "answerType": "WebPages",
293 "resultIndex": 6,
294 "value": {
295- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.6"
296+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.6"
297 }
298 },
299 {
300 "answerType": "WebPages",
301 "resultIndex": 7,
302 "value": {
303- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.7"
304+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.7"
305 }
306 },
307 {
308 "answerType": "WebPages",
309 "resultIndex": 8,
310 "value": {
311- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.8"
312+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.8"
313 }
314 },
315 {
316 "answerType": "WebPages",
317 "resultIndex": 9,
318 "value": {
319- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.9"
320+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.9"
321 }
322 },
323 {
324 "answerType": "WebPages",
325 "resultIndex": 10,
326 "value": {
327- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.10"
328+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.10"
329 }
330 },
331 {
332 "answerType": "WebPages",
333 "resultIndex": 11,
334 "value": {
335- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.11"
336+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.11"
337 }
338 },
339 {
340 "answerType": "WebPages",
341 "resultIndex": 12,
342 "value": {
343- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.12"
344+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.12"
345 }
346 },
347 {
348 "answerType": "WebPages",
349 "resultIndex": 13,
350 "value": {
351- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.13"
352+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.13"
353 }
354 },
355 {
356 "answerType": "WebPages",
357 "resultIndex": 14,
358 "value": {
359- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.14"
360+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.14"
361 }
362 },
363 {
364 "answerType": "WebPages",
365 "resultIndex": 15,
366 "value": {
367- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.15"
368+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.15"
369 }
370 },
371 {
372 "answerType": "WebPages",
373 "resultIndex": 16,
374 "value": {
375- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.16"
376+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.16"
377 }
378 },
379 {
380 "answerType": "WebPages",
381 "resultIndex": 17,
382 "value": {
383- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.17"
384+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.17"
385 }
386 },
387 {
388 "answerType": "WebPages",
389 "resultIndex": 18,
390 "value": {
391- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.18"
392+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.18"
393 }
394 },
395 {
396 "answerType": "WebPages",
397 "resultIndex": 19,
398 "value": {
399- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.19"
400+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.19"
401 }
402 }
403 ]
404diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json
405index 8cab9aa..9c2c256 100644
406--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json
407+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-bugs-2.json
408@@ -13,7 +13,7 @@
409 "totalEstimatedMatches": 25,
410 "value": [
411 {
412- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0",
413+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0",
414 "name": "Bug #2 in Ubuntu Hoary: “Blackhole Trash folder”",
415 "url": "http://bugs.launchpad.test/ubuntu/hoary/+bug/2",
416 "urlPingSuffix": "DevEx,5103.1",
417@@ -56,7 +56,7 @@
418 "fixedPosition": false
419 },
420 {
421- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1",
422+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1",
423 "name": "Bug #2 in mozilla-firefox (Debian): “Blackhole Trash folder”",
424 "url": "http://bugs.launchpad.test/debian/+source/mozilla-firefox/+bug/2",
425 "urlPingSuffix": "DevEx,5149.1",
426@@ -67,7 +67,7 @@
427 "fixedPosition": false
428 },
429 {
430- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2",
431+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2",
432 "name": "Bug #3 in mozilla-firefox (Debian): “Bug Title Test”",
433 "url": "http://bugs.launchpad.test/debian/+source/mozilla-firefox/+bug/3",
434 "urlPingSuffix": "DevEx,5178.1",
435@@ -78,7 +78,7 @@
436 "fixedPosition": false
437 },
438 {
439- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3",
440+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3",
441 "name": "Bug trackers registered in Launchpad",
442 "url": "http://bugs.launchpad.test/bugs/bugtrackers",
443 "urlPingSuffix": "DevEx,5193.1",
444@@ -89,7 +89,7 @@
445 "fixedPosition": false
446 },
447 {
448- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4",
449+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4",
450 "name": "Bug tracker “Debian Bug tracker”",
451 "url": "http://bugs.launchpad.test/bugs/bugtrackers/debbugs",
452 "urlPingSuffix": "DevEx,5208.1",
453@@ -113,35 +113,35 @@
454 "answerType": "WebPages",
455 "resultIndex": 0,
456 "value": {
457- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0"
458+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0"
459 }
460 },
461 {
462 "answerType": "WebPages",
463 "resultIndex": 1,
464 "value": {
465- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1"
466+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1"
467 }
468 },
469 {
470 "answerType": "WebPages",
471 "resultIndex": 2,
472 "value": {
473- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2"
474+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2"
475 }
476 },
477 {
478 "answerType": "WebPages",
479 "resultIndex": 3,
480 "value": {
481- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3"
482+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3"
483 }
484 },
485 {
486 "answerType": "WebPages",
487 "resultIndex": 4,
488 "value": {
489- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.4"
490+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.4"
491 }
492 }
493 ]
494diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt b/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt
495index 1beae6e..aaa3e28 100644
496--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt
497+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-mapping.txt
498@@ -8,21 +8,21 @@
499
500 * bingsearchservice-no-results.json
501
502-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=bug bingsearchservice-bugs-1.json
503+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=bug bingsearchservice-bugs-1.json
504
505-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=bug bingsearchservice-bugs-2.json
506+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=bug bingsearchservice-bugs-2.json
507
508-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=launchpad bingsearchservice-bugs-1.json
509+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=launchpad bingsearchservice-bugs-1.json
510
511-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=launchpad bingsearchservice-bugs-2.json
512+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=20&q=launchpad bingsearchservice-bugs-2.json
513
514-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=gnomebaker bingsearchservice-incomplete-response.json
515+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=gnomebaker bingsearchservice-incomplete-response.json
516
517-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=no-meaningful bingsearchservice-no-meaningful-results.json
518+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=no-meaningful bingsearchservice-no-meaningful-results.json
519
520-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=errors-please bingsearchservice-error.json
521+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=errors-please bingsearchservice-error.json
522
523-/bingcustomsearch/v7.0/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=xss bingsearchservice-xss.json
524+/v7.0/custom/search?count=20&customConfig=1234567890&mkt=en-US&offset=0&q=xss bingsearchservice-xss.json
525
526 # This stub service is also used to impersonate the Blog feed
527 /blog-feed blog.launchpad.net-feed.xml
528diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json
529index e9fe2d2..b1344c3 100644
530--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json
531+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-summary.json
532@@ -4,7 +4,7 @@
533 "totalEstimatedMatches": -25,
534 "value": [
535 {
536- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0",
537+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0",
538 "name": "Ubuntu Bugs in Launchpad",
539 "url": "https://launchpad.net/~ubuntu-bugs",
540 "urlPingSuffix": "DevEx,5080.1",
541@@ -14,7 +14,7 @@
542 "fixedPosition": false
543 },
544 {
545- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2",
546+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2",
547 "name": "BugExpiry - Launchpad Help",
548 "url": "https://help.launchpad.net/BugExpiry",
549 "urlPingSuffix": "DevEx,5110.1",
550diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json
551index f46892a..5aaf189 100644
552--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json
553+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-title.json
554@@ -4,7 +4,7 @@
555 "totalEstimatedMatches": -25,
556 "value": [
557 {
558- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0",
559+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0",
560 "url": "https://launchpad.net/~ubuntu-bugs",
561 "urlPingSuffix": "DevEx,5080.1",
562 "isFamilyFriendly": true,
563@@ -14,7 +14,7 @@
564 "fixedPosition": false
565 },
566 {
567- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.1",
568+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.1",
569 "name": "GCleaner in Launchpad",
570 "url": "https://launchpad.net/gcleaner",
571 "urlPingSuffix": "DevEx,5095.1",
572diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json
573index 29037d2..dc5d3a6 100644
574--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json
575+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-missing-url.json
576@@ -4,7 +4,7 @@
577 "totalEstimatedMatches": -25,
578 "value": [
579 {
580- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0",
581+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0",
582 "name": "Ubuntu Bugs in Launchpad",
583 "urlPingSuffix": "DevEx,5080.1",
584 "isFamilyFriendly": true,
585@@ -14,7 +14,7 @@
586 "fixedPosition": false
587 },
588 {
589- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.3",
590+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.3",
591 "name": "LongoMatch in Launchpad",
592 "url": "https://launchpad.net/longomatch",
593 "urlPingSuffix": "DevEx,5125.1",
594diff --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
595index 8655fcb..1b2f571 100644
596--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json
597+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-no-meaningful-results.json
598@@ -4,7 +4,7 @@
599 "totalEstimatedMatches": 25,
600 "value": [
601 {
602- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.2",
603+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.2",
604 "url": "https://help.launchpad.net/BugExpiry",
605 "urlPingSuffix": "DevEx,5110.1",
606 "isFamilyFriendly": true,
607diff --git a/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json b/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json
608index 18251d8..43a3ff4 100644
609--- a/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json
610+++ b/lib/lp/services/sitesearch/tests/data/bingsearchservice-xss.json
611@@ -4,7 +4,7 @@
612 "totalEstimatedMatches": -25,
613 "value": [
614 {
615- "id": "https://api.cognitive.microsoft.com/api/v7/#WebPages.0",
616+ "id": "https://api.bing.microsoft.com/api/v7/#WebPages.0",
617 "name": "Bug #1349491 “[OSSA 2014-027] Persistent <XSS> in the Host Aggrega...” : Bugs ...",
618 "url": "https://bugs.launchpad.net/horizon/+bug/1349491",
619 "urlPingSuffix": "DevEx,5154.1",

Subscribers

People subscribed via source and target branches

to status/vote changes: