From fd88c37fb6422a558a6267002e0ec1ee1e806d96 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 16 Oct 2024 21:32:29 +0100 Subject: [PATCH 1/3] chore(NA): bump version to 8.17.0 --- package.json | 2 +- x-pack/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6e29f954fcee9..77316b09f9050 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dashboarding" ], "private": true, - "version": "8.16.0", + "version": "8.17.0", "branch": "8.x", "types": "./kibana.d.ts", "tsdocMetadata": "./build/tsdoc-metadata.json", diff --git a/x-pack/package.json b/x-pack/package.json index c4f8f4efe770d..8ed1a6aed92ec 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -1,6 +1,6 @@ { "name": "x-pack", - "version": "8.16.0", + "version": "8.17.0", "author": "Elastic", "private": true, "license": "Elastic-License", From bc485607341755bb85fd51fe53454ae51e63747a Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Thu, 17 Oct 2024 01:22:03 +0100 Subject: [PATCH 2/3] fix(NA): jest integration snapshot tests --- .../migrations/group1/v2_migration.test.ts | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts index 2236b6adcc62a..aa8ecf83491b2 100644 --- a/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts +++ b/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts @@ -86,12 +86,14 @@ describe('v2 migration', () => { expect(migrationResults.map((result) => omit(result, 'elapsedMs'))).toMatchInlineSnapshot(` Array [ Object { - "destIndex": ".kibana_migrator_${currentVersion}_001", - "status": "patched", + "destIndex": ".kibana_migrator_8.16.0_001", + "sourceIndex": ".kibana_migrator_8.16.0_001", + "status": "migrated", }, Object { - "destIndex": ".kibana_migrator_tasks_${currentVersion}_001", - "status": "patched", + "destIndex": ".kibana_migrator_tasks_8.16.0_001", + "sourceIndex": ".kibana_migrator_tasks_8.16.0_001", + "status": "migrated", }, ] `); @@ -320,19 +322,19 @@ describe('v2 migration', () => { // omit elapsedMs as it varies in each execution expect(migrationResults.map((result) => omit(result, 'elapsedMs'))) .toMatchInlineSnapshot(` - Array [ - Object { - "destIndex": ".kibana_migrator_${nextMinor}_001", - "sourceIndex": ".kibana_migrator_${currentVersion}_001", - "status": "migrated", - }, - Object { - "destIndex": ".kibana_migrator_tasks_${currentVersion}_001", - "sourceIndex": ".kibana_migrator_tasks_${currentVersion}_001", - "status": "migrated", - }, - ] - `); + Array [ + Object { + "destIndex": ".kibana_migrator_8.18.0_001", + "sourceIndex": ".kibana_migrator_8.16.0_001", + "status": "migrated", + }, + Object { + "destIndex": ".kibana_migrator_tasks_8.16.0_001", + "sourceIndex": ".kibana_migrator_tasks_8.16.0_001", + "status": "migrated", + }, + ] + `); }); it('each migrator takes less than 60 seconds', () => { From a0a43b7b5aa73d56f0d2279e40c241f4e736b4f1 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Thu, 17 Oct 2024 01:51:30 +0100 Subject: [PATCH 3/3] fix(NA): eslint for src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts --- .../saved_objects/migrations/group1/v2_migration.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts index aa8ecf83491b2..7d9929481670b 100644 --- a/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts +++ b/src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts @@ -22,7 +22,6 @@ import { readLog, clearLog, currentVersion, - nextMinor, } from '../kibana_migrator_test_kit'; import { BASELINE_COMPLEX_DOCUMENTS_500K_AFTER,