[7.15] [Fleet] Fix pipeline with id [*] does not exists (elastic#116707…

…) (elastic#116942) * [Fleet] Fix pipeline with id [*] does not exists (elastic#116707) # Conflicts: # x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts * Fix tests
kibanamachine · Nov 1, 2021 · 5b44541 · 5b44541
1 parent 4739590
commit 5b44541
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
@@ -256,7 +256,7 @@ export const getEsPackage = async (
       dataStreams.push({
         dataset: dataset || `${pkgName}.${dataStreamPath}`,
         package: pkgName,
-        ingest_pipeline: ingestPipeline || 'default',
+        ingest_pipeline: ingestPipeline,
         path: dataStreamPath,
         streams,
         ...dataStreamManifestProps,

diff --git a/x-pack/plugins/fleet/server/services/epm/archive/validation.ts b/x-pack/plugins/fleet/server/services/epm/archive/validation.ts
@@ -217,7 +217,6 @@ export function parseAndVerifyDataStreams(
     }
     const streams = parseAndVerifyStreams(manifestStreams, dataStreamPath);
 
-    // default ingest pipeline name see https://github.com/elastic/package-registry/blob/master/util/dataset.go#L26
     dataStreams.push(
       Object.entries(restOfProps).reduce(
         (validatedDataStream, [key, value]) => {
@@ -233,7 +232,7 @@ export function parseAndVerifyDataStreams(
           type,
           package: pkgName,
           dataset: dataset || `${pkgName}.${dataStreamPath}`,
-          ingest_pipeline: ingestPipeline || 'default',
+          ingest_pipeline: ingestPipeline,
           path: dataStreamPath,
           streams,
         }

diff --git a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap b/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
@@ -70,7 +70,7 @@ export default function (providerContext: FtrProviderContext) {
         .type('application/gzip')
         .send(buf)
         .expect(200);
-      expect(res.body.response.length).to.be(26);
+      expect(res.body.response.length).to.be(24);
     });
 
     it('should install a zip archive correctly and package info should return correctly after validation', async function () {
@@ -81,7 +81,7 @@ export default function (providerContext: FtrProviderContext) {
         .type('application/zip')
         .send(buf)
         .expect(200);
-      expect(res.body.response.length).to.be(26);
+      expect(res.body.response.length).to.be(24);
 
       const packageInfoRes = await supertest
         .get(`/api/fleet/epm/packages/${testPkgKey}`)