From e89e9b0925be2489e6cd9b619ff1b1a595963661 Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Thu, 11 Mar 2021 13:10:52 +0100
Subject: [PATCH] Suppress NotFound error when deleting saved objects.

---
 x-pack/plugins/fleet/server/services/epm/packages/remove.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
index da407c1d4cfa037..31185b858196cec 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
@@ -78,6 +78,7 @@ export async function removeInstallation(options: {
   return installedAssets;
 }
 
+// TODO we have both deleteKibanaAssets and deleteKibanaSavedObjectsAssets (below)
 function deleteKibanaAssets(
   installedObjects: KibanaAssetReference[],
   savedObjectsClient: SavedObjectsClientContract
@@ -135,6 +136,7 @@ async function deleteTemplate(esClient: ElasticsearchClient, name: string): Prom
   }
 }
 
+// TODO we have both deleteKibanaSavedObjectsAssets and deleteKibanaAssets (above)
 export async function deleteKibanaSavedObjectsAssets(
   savedObjectsClient: SavedObjectsClientContract,
   installedRefs: AssetReference[]
@@ -152,6 +154,8 @@ export async function deleteKibanaSavedObjectsAssets(
   try {
     await Promise.all(deletePromises);
   } catch (err) {
-    logger.warn(err);
+    if (!savedObjectsClient.errors.isNotFoundError(err)) {
+      logger.error(err);
+    }
   }
 }