From b9b41446e796c44229237f745fe9887fe8ee012f Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Tue, 15 Jun 2021 11:02:38 -0400
Subject: [PATCH] fix tests

---
 .../elasticsearch/ingest_pipeline/install.ts  |  3 ++-
 .../__snapshots__/template.test.ts.snap       | 21 +++++++++++--------
 .../apis/epm/final_pipeline.ts                |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
index 89848e5dc74b6..a6aa87c5ed0f5 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
@@ -191,7 +191,7 @@ export async function ensureFleetFinalPipelineIsInstalled(esClient: Elasticsearc
     ignore: [404],
   };
   const res = await esClient.ingest.getPipeline(
-    { id: FLEET_FINAL_PIPELINE_CONTENT },
+    { id: FLEET_FINAL_PIPELINE_ID },
     esClientRequestOptions
   );
 
@@ -201,6 +201,7 @@ export async function ensureFleetFinalPipelineIsInstalled(esClient: Elasticsearc
       pipeline: {
         nameForInstallation: FLEET_FINAL_PIPELINE_ID,
         contentForInstallation: FLEET_FINAL_PIPELINE_CONTENT,
+        extension: 'yml',
       },
     });
     return { isCreated: true };
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
index acf8ae742bf8f..6a4476316bfa5 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
@@ -25,8 +25,7 @@ exports[`EPM template tests loading base.yml: base.yml 1`] = `
           "default_field": [
             "long.nested.foo"
           ]
-        },
-        "final_pipeline": ".fleet_final_pipeline"
+        }
       }
     },
     "mappings": {
@@ -99,7 +98,9 @@ exports[`EPM template tests loading base.yml: base.yml 1`] = `
     }
   },
   "data_stream": {},
-  "composed_of": [],
+  "composed_of": [
+    ".fleet_component_template-1"
+  ],
   "_meta": {
     "package": {
       "name": "nginx"
@@ -140,8 +141,7 @@ exports[`EPM template tests loading coredns.logs.yml: coredns.logs.yml 1`] = `
             "coredns.response.code",
             "coredns.response.flags"
           ]
-        },
-        "final_pipeline": ".fleet_final_pipeline"
+        }
       }
     },
     "mappings": {
@@ -214,7 +214,9 @@ exports[`EPM template tests loading coredns.logs.yml: coredns.logs.yml 1`] = `
     }
   },
   "data_stream": {},
-  "composed_of": [],
+  "composed_of": [
+    ".fleet_component_template-1"
+  ],
   "_meta": {
     "package": {
       "name": "coredns"
@@ -283,8 +285,7 @@ exports[`EPM template tests loading system.yml: system.yml 1`] = `
             "system.users.scope",
             "system.users.remote_host"
           ]
-        },
-        "final_pipeline": ".fleet_final_pipeline"
+        }
       }
     },
     "mappings": {
@@ -1741,7 +1742,9 @@ exports[`EPM template tests loading system.yml: system.yml 1`] = `
     }
   },
   "data_stream": {},
-  "composed_of": [],
+  "composed_of": [
+    ".fleet_component_template-1"
+  ],
   "_meta": {
     "package": {
       "name": "system"
diff --git a/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts b/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts
index a800546a27a3e..8c906b2cc043f 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts
@@ -12,7 +12,7 @@ import { skipIfNoDockerRegistry } from '../../helpers';
 
 const TEST_INDEX = 'logs-log.log-test';
 
-const FINAL_PIPELINE_ID = '.fleet_final_pipeline';
+const FINAL_PIPELINE_ID = '.fleet_final_pipeline-1';
 
 let pkgKey: string;