forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Expose an HTTP-request browser client (elastic#35486)
* Expose an HTTP-request browser client * Fix failing tests from kfetch refactor * Make abort() non-enumerable, fix review issues * Move kfetch test setup to build-excluded location * Add ndjson tests to browser http service * Lint fixes * Fix missing update of del to delete in http mock * Fix problems with merging headers with undefined Content-Type * Delete correct property from updated options * Linting fix * Fix reference to kfetch_test_setup due to moving test file * Add tests and fix implementation of abortables * Add missing http start mock contract, fix test in CI * Remove abortable promise functionality * Fix DELETE method handler, remove unnecessary promise wrapper
- Loading branch information
1 parent
4a8cc13
commit 286b467
Showing
19 changed files
with
626 additions
and
235 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"},"title":"Log Agents","uiStateJSON":"{}","visState":"{\"title\":\"Log Agents\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100},\"title\":{\"text\":\"agent.raw: Descending\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"agent.raw\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}]}"},"id":"082f1d60-a2e7-11e7-bb30-233be9be6a15","migrationVersion":{"visualization":"7.0.0"},"references":[{"id":"f1e4c910-a2e6-11e7-bb30-233be9be6a15","name":"kibanaSavedObjectMeta.searchSourceJSON.index","type":"index-pattern"}],"type":"visualization","version":1} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import { merge } from 'lodash'; | ||
import { format } from 'url'; | ||
|
||
import { HttpFetchOptions, HttpBody, Deps } from './types'; | ||
import { HttpFetchError } from './http_fetch_error'; | ||
|
||
const JSON_CONTENT = /^(application\/(json|x-javascript)|text\/(x-)?javascript|x-json)(;.*)?$/; | ||
const NDJSON_CONTENT = /^(application\/ndjson)(;.*)?$/; | ||
|
||
export const setup = ({ basePath, injectedMetadata }: Deps) => { | ||
async function fetch(path: string, options: HttpFetchOptions = {}): Promise<HttpBody> { | ||
const { query, prependBasePath, ...fetchOptions } = merge( | ||
{ | ||
method: 'GET', | ||
credentials: 'same-origin', | ||
prependBasePath: true, | ||
headers: { | ||
'kbn-version': injectedMetadata.getKibanaVersion(), | ||
'Content-Type': 'application/json', | ||
}, | ||
}, | ||
options | ||
); | ||
const url = format({ | ||
pathname: prependBasePath ? basePath.addToPath(path) : path, | ||
query, | ||
}); | ||
|
||
if ( | ||
options.headers && | ||
'Content-Type' in options.headers && | ||
options.headers['Content-Type'] === undefined | ||
) { | ||
delete fetchOptions.headers['Content-Type']; | ||
} | ||
|
||
let response; | ||
let body = null; | ||
|
||
try { | ||
response = await window.fetch(url, fetchOptions as RequestInit); | ||
} catch (err) { | ||
throw new HttpFetchError(err.message); | ||
} | ||
|
||
const contentType = response.headers.get('Content-Type') || ''; | ||
|
||
try { | ||
if (NDJSON_CONTENT.test(contentType)) { | ||
body = await response.blob(); | ||
} else if (JSON_CONTENT.test(contentType)) { | ||
body = await response.json(); | ||
} else { | ||
body = await response.text(); | ||
} | ||
} catch (err) { | ||
throw new HttpFetchError(err.message, response, body); | ||
} | ||
|
||
if (!response.ok) { | ||
throw new HttpFetchError(response.statusText, response, body); | ||
} | ||
|
||
return body; | ||
} | ||
|
||
function shorthand(method: string) { | ||
return (path: string, options: HttpFetchOptions = {}) => fetch(path, { ...options, method }); | ||
} | ||
|
||
return { fetch, shorthand }; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.