maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[kbn/es] print headers when requests fail (#34237)

Browse source
This commit is contained in:
Spencer 2019-03-31 18:17:12 -07:00 committed by GitHub
parent d7b2889b28
commit c982856d31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packages/kbn-es/src/artifact.js
View file

@ -59,6 +59,13 @@ function getPlatform(key) {
}
}
function headersToString(headers, indent = '') {
return [...headers.entries()].reduce(
(acc, [key, value]) => `${acc}\n${indent}${key}: ${value}`,
''
);
}
exports.Artifact = class Artifact {
/**
* Fetch an Artifact from the Artifact API for a license level and version
@ -211,7 +218,12 @@ exports.Artifact = class Artifact {
if (!resp.ok) {
abc.abort();
throw new Error(`Unable to download elasticsearch snapshot: ${resp.statusText}`);
throw new Error(
`Unable to download elasticsearch snapshot: ${resp.statusText}${headersToString(
resp.headers,
' '
)}`
);
}
if (etag) {
@ -248,6 +260,7 @@ exports.Artifact = class Artifact {
etag: resp.headers.get('etag'),
contentLength,
first500Bytes,
headers: resp.headers,
};
}
@ -266,18 +279,26 @@ exports.Artifact = class Artifact {
if (!resp.ok) {
abc.abort();
throw new Error(`Unable to download elasticsearch checksum: ${resp.statusText}`);
throw new Error(
`Unable to download elasticsearch checksum: ${resp.statusText}${headersToString(
resp.headers,
' '
)}`
);
}
// in format of stdout from `shasum` cmd, which is `<checksum> <filename>`
const [expectedChecksum] = (await resp.text()).split(' ');
if (artifactResp.checksum !== expectedChecksum) {
const len = `${artifactResp.first500Bytes / artifactResp.contentLength}`;
const len = Buffer.byteLength(artifactResp.first500Bytes);
const lenString = `${len} / ${artifactResp.contentLength}`;
throw createCliError(
`artifact downloaded from ${this.getUrl()} does not match expected checksum\n` +
` expected: ${expectedChecksum}\n` +
` received: ${artifactResp.checksum}\n` +
` content[${len}]: ${artifactResp.first500Bytes.toString('utf8')}`
` headers: ${headersToString(artifactResp.headers, ' ')}\n` +
` content[${lenString} base64]: ${artifactResp.first500Bytes.toString('base64')}`
);
}