From 4c34ba050104137ba001d9f2a7a65b1a34267566 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Tue, 19 Mar 2024 13:47:42 -0400 Subject: [PATCH 1/2] [Fleet] Fix concurent package policies create --- x-pack/plugins/fleet/server/services/epm/packages/get.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.ts index 614fc8d636816..7b032791eae4a 100644 --- a/x-pack/plugins/fleet/server/services/epm/packages/get.ts +++ b/x-pack/plugins/fleet/server/services/epm/packages/get.ts @@ -542,7 +542,11 @@ export async function getPackageFromSource(options: { let res: GetPackageResponse; // If the package is installed - if (installedPkg && installedPkg.version === pkgVersion) { + if ( + installedPkg && + installedPkg.install_status === 'installed' && + installedPkg.version === pkgVersion + ) { const { install_source: pkgInstallSource } = installedPkg; if (!res && installedPkg.package_assets) { res = await getEsPackage( From f302c9aa3f499c2c38eb4a8d5e9c72890305cac2 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Tue, 19 Mar 2024 14:22:18 -0400 Subject: [PATCH 2/2] Fix unit tests --- x-pack/plugins/fleet/server/services/epm/packages/get.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts index 66e220c328b5f..e6199da195447 100644 --- a/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts +++ b/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts @@ -268,6 +268,7 @@ description: Elasticsearch description`, name: 'elasticsearch', version: '0.0.1', install_source: 'upload', + install_status: 'installed', package_assets: [], data_utf8: ` name: elasticsearch @@ -360,6 +361,7 @@ test: invalid manifest`, name: 'invalidpackage', version: '0.0.1', install_source: 'upload', + install_status: 'installed', package_assets: [], data_utf8: ` name: invalidpackage @@ -414,6 +416,7 @@ test: invalid manifest version: '0.0.1', install_source: 'upload', install_version: '0.0.1', + install_status: 'installed', }, score: 0, type: PACKAGES_SAVED_OBJECT_TYPE, @@ -442,6 +445,7 @@ description: Elasticsearch description`, attributes: { name: 'elasticsearch', version: '0.0.1', + install_status: 'installed', install_source: 'upload', package_assets: [], data_utf8: `