From 0b280c84c322391e436e9ffda9b624fd0a732b69 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 12 Apr 2017 07:35:08 -0700 Subject: [PATCH 1/2] use correct index_already_exists error code for 5.x --- src/es_archiver/lib/indices/__tests__/stubs.js | 2 +- src/es_archiver/lib/indices/create_index_stream.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/es_archiver/lib/indices/__tests__/stubs.js b/src/es_archiver/lib/indices/__tests__/stubs.js index b38b0109b36ab..b844c9f927964 100644 --- a/src/es_archiver/lib/indices/__tests__/stubs.js +++ b/src/es_archiver/lib/indices/__tests__/stubs.js @@ -52,7 +52,7 @@ export const createStubClient = (existingIndices = []) => ({ }), create: sinon.spy(async ({ index }) => { if (existingIndices.includes(index)) { - throw createEsClientError('resource_already_exists_exception'); + throw createEsClientError('index_already_exists_exception'); } else { existingIndices.push(index); return { ok: true }; diff --git a/src/es_archiver/lib/indices/create_index_stream.js b/src/es_archiver/lib/indices/create_index_stream.js index e611cbf7077b1..bd670ccefbc48 100644 --- a/src/es_archiver/lib/indices/create_index_stream.js +++ b/src/es_archiver/lib/indices/create_index_stream.js @@ -25,7 +25,7 @@ export function createCreateIndexStream({ client, stats, skipExisting }) { }); stats.createdIndex(index, { settings }); } catch (err) { - if (get(err, 'body.error.type') !== 'resource_already_exists_exception' || attemptNumber >= 3) { + if (get(err, 'body.error.type') !== 'index_already_exists_exception' || attemptNumber >= 3) { throw err; } From 5230d0a0630f21e1c16d943a74bcf359c42d0054 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 12 Apr 2017 07:35:40 -0700 Subject: [PATCH 2/2] [status api] assume 5.x style responses --- test/functional/services/kibana_server/version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/services/kibana_server/version.js b/test/functional/services/kibana_server/version.js index 7d2c3363c3059..942baa05a5196 100644 --- a/test/functional/services/kibana_server/version.js +++ b/test/functional/services/kibana_server/version.js @@ -7,6 +7,6 @@ export class KibanaServerVersion { get = once(async () => { const status = await this.kibanaStatus.get(); - return status.version.number; + return status.version; }) }