From 0f804677de62e484920a7ef6ce357de2ab624aa9 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 18 Feb 2021 13:43:03 -0800
Subject: [PATCH] [Fleet] Silently swallow 404 errors when deleting ingest
 pipelines (#91778)

* Only show transform logs when there are transforms

* Silently swallow 404 errors when deleting ingest pipelines

* Change to IngestManagerError
---
 .../epm/elasticsearch/ingest_pipeline/remove.ts        |  7 ++++++-
 .../services/epm/elasticsearch/transform/install.ts    | 10 +++++++---
 .../services/epm/elasticsearch/transform/remove.ts     |  4 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
index f12d68190b4acb..4acc4767de5255 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
@@ -8,6 +8,7 @@
 import { SavedObjectsClientContract } from 'src/core/server';
 import { appContextService } from '../../../';
 import { CallESAsCurrentUser, ElasticsearchAssetType } from '../../../../types';
+import { IngestManagerError } from '../../../../errors';
 import { getInstallation } from '../../packages/get';
 import { PACKAGES_SAVED_OBJECT_TYPE, EsAssetReference } from '../../../../../common';
 
@@ -61,7 +62,11 @@ export async function deletePipeline(callCluster: CallESAsCurrentUser, id: strin
     try {
       await callCluster('ingest.deletePipeline', { id });
     } catch (err) {
-      throw new Error(`error deleting pipeline ${id}`);
+      // Only throw if error is not a 404 error. Sometimes the pipeline is already deleted, but we have
+      // duplicate references to them, see https://github.com/elastic/kibana/issues/91192
+      if (err.statusCode !== 404) {
+        throw new IngestManagerError(`error deleting pipeline ${id}: ${err}`);
+      }
     }
   }
 }
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
index 57e1090f8954b4..948a9c56746f36 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
@@ -42,9 +42,13 @@ export const installTransform = async (
     previousInstalledTransformEsAssets = installation.installed_es.filter(
       ({ type, id }) => type === ElasticsearchAssetType.transform
     );
-    logger.info(
-      `Found previous transform references:\n ${JSON.stringify(previousInstalledTransformEsAssets)}`
-    );
+    if (previousInstalledTransformEsAssets.length) {
+      logger.info(
+        `Found previous transform references:\n ${JSON.stringify(
+          previousInstalledTransformEsAssets
+        )}`
+      );
+    }
   }
 
   // delete all previous transform
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
index b08b7cb7f1ec8d..0e947e0f0b90bb 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
@@ -26,7 +26,9 @@ export const deleteTransforms = async (
   transformIds: string[]
 ) => {
   const logger = appContextService.getLogger();
-  logger.info(`Deleting currently installed transform ids ${transformIds}`);
+  if (transformIds.length) {
+    logger.info(`Deleting currently installed transform ids ${transformIds}`);
+  }
   await Promise.all(
     transformIds.map(async (transformId) => {
       // get the index the transform