From d2c1d0cb297d3a5718ae6665ec2e5c95e89cc84b Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Tue, 2 Jan 2024 16:39:54 +0100 Subject: [PATCH 1/3] [Fleet] Fix keep up to date after package install --- .../server/services/epm/packages/_install_package.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts index 8f45e8eee6b13..54788bf13b8ef 100644 --- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts +++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts @@ -351,7 +351,7 @@ export async function _installPackage({ savedObjectType: PACKAGES_SAVED_OBJECT_TYPE, }); logger.debug(`Package install - Updating install status`); - const updatedPackage = await withPackageSpan('Update install status', () => + await withPackageSpan('Update install status', () => savedObjectsClient.update(PACKAGES_SAVED_OBJECT_TYPE, pkgName, { version: pkgVersion, install_version: pkgVersion, @@ -364,8 +364,12 @@ export async function _installPackage({ ), }) ); - logger.debug(`Package install - Install status ${updatedPackage?.attributes?.install_status}`); + const updatedPackage = await savedObjectsClient.get( + PACKAGES_SAVED_OBJECT_TYPE, + pkgName + ); + logger.debug(`Package install - Install status ${updatedPackage?.attributes?.install_status}`); // If the package is flagged with the `keep_policies_up_to_date` flag, upgrade its // associated package policies after installation if (updatedPackage.attributes.keep_policies_up_to_date) { From c810e36754fdbdcf2e4f39506a8ca5bf73e92fc2 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:51:43 +0000 Subject: [PATCH 2/3] [CI] Auto-commit changed files from 'node scripts/notice' --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 45af6e5231783..d02031c4b5a2b 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Kibana source code with Kibana X-Pack source code -Copyright 2012-2023 Elasticsearch B.V. +Copyright 2012-2024 Elasticsearch B.V. --- Pretty handling of logarithmic axes. From 8388d6a70da8ec5af36aad9979b35d8a9554470e Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Tue, 2 Jan 2024 18:05:48 +0100 Subject: [PATCH 3/3] Fix test and add comments --- .../server/services/epm/packages/_install_package.test.ts | 3 +++ .../fleet/server/services/epm/packages/_install_package.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts index 4402db72b86a9..5e1be5fc254c3 100644 --- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts +++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts @@ -69,6 +69,9 @@ describe('_installPackage', () => { soClient.update.mockImplementation(async (type, id, attributes) => { return { id, attributes } as any; }); + soClient.get.mockImplementation(async (type, id) => { + return { id, attributes: {} } as any; + }); esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; appContextService.start(createAppContextStartContractMock()); diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts index 54788bf13b8ef..125daecce5ab6 100644 --- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts +++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts @@ -365,6 +365,7 @@ export async function _installPackage({ }) ); + // Need to refetch the installation again to retrieve all the attributes const updatedPackage = await savedObjectsClient.get( PACKAGES_SAVED_OBJECT_TYPE, pkgName