[Ingest Manager] Install uploaded package #77986

skh · 2020-09-21T10:00:44Z

Summary

Partially implements #70582

This adds the functionality to actually install a package from an uploaded zip or tar.gz archive. A package uploaded this way can be deleted by the existing DELETE /api/ingest_manager/epm/packages/PKGKEY endpoint.

IMPORTANT: The installed package cannot yet be added to a policy and used by enrolled agents. This functionality will be added in a follow-up PR. This PR is opened for review now to keep the amount of code to be reviewed manageable (it is on the large side already).

The API endpoint to upload packages is undocumented and should not be used. Therefore, this PR does not contain documentation or changes to the OpenAPI spec.

In detail, the changes include:

Refactoring EPM to allow installation from different sources (upload and registry). This includes types, method names, and control flow.
Adding error classes for specific errors related to package upload, add tests for those which don't return 400
Changing the saved object epm-packages to include the installation source of a package (registry or upload).
Performing some basic verification on the uploaded archive, and use the top-level manifest.yml to extract the information we need for package installation.
Picking all information about config templates and datasets from the manifest.xml files in the package.
Refactoring the in-memory cache for package data: Add a cache package key->package file list and remove the cache package key->archive location. The existing file cache file path->file buffer is unchanged. This is necessary because the cache now contains package contents that do not come from the registry, and thus don't have an archive location.

How to test this

Try to break it

This change contains a fair amount of refactoring of existing functionality. Ideally, the behavior when installing and using packages from the registry should not have changed. Please review with a focus on the changed code paths, and try to break them in manual testing. The existing integration tests were a great help, but we don't have full test coverage over all areas of the code.

Upload and uninstall packages

Integration tests have been added. The package archives used in these tests can also be used for manual testing. First, export a variable with the path to your kibana project directory:

export KIBANA_HOME=./path/to/srcdir/of/kibana

Then, copy & paste the following curl commands to see the behavior of the API endpoint on the command line. (Assuming a locally running dev environment, --no-base-path and port 5601).

Happy path:

zip: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'
tar.gz: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_0.1.4.tar.gz -H 'kbn-xsrf: xyz' -H 'Content-Type: application/gzip'

Uploaded packages can be deleted as expected:

curl -X DELETE -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages/apache-0.1.4 -H 'kbn-xsrf: xxx'

Wrong content type:

tar.gz with application/zip: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_0.1.4.tar.gz -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'
zip with application/gzip: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/gzip'

Invalid packages

Two toplevel directories: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_invalid_two_toplevels_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'
No manifest: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_invalid_no_manifest_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'
Invalid YAML in manifest: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_invalid_manifest_invalid_yaml_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'
Mandatory field missing in manifest: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_invalid_manifest_missing_field_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'
Toplevel directory doesn't match name and version from manifest: curl -X POST -u elastic:changeme http://localhost:5601/api/ingest_manager/epm/packages --data-binary @$KIBANA_HOME/x-pack/test/ingest_manager_api_integration/apis/fixtures/direct_upload_packages/apache_invalid_toplevel_mismatch_0.1.4.zip -H 'kbn-xsrf: xyz' -H 'Content-Type: application/zip'

NOTE: When not copy-pasting, be sure to use --data-binary, not --data or the upload is corrupted.

ruflin

I had a look at the PR and left a few comments. Overall I think this is heading in the right direction. It would be nice in some cases to directly build the struct for the manifest so it can be reused in multiple places.

I also want to take this as an opportunity to share a bit on how I think the end result could look like.

There are different sources from where to install a package. In the end, in all cases it is a .zip file. The fetcher for the specific sources knows how to get this zip file from the source. From there, installation is always the same. It goes through the validator and caches / stores the package locally. As soon as a package is installed, all data should be always fetched from this cache / store.

The only source where packages can be browsed without being installed is the package registry. This is our special case. The package list package + package details page for uninstalled packages comes directly from the registry. All the installed package details are served locally.

My hope is that the only place where we need to use the json from the registry is in the uninstalled package list and the details page for uninstalled package.

x-pack/plugins/ingest_manager/common/types/models/epm.ts

x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts

x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts

elasticmachine · 2020-10-01T14:41:47Z

Pinging @elastic/ingest-management (Team:Ingest Management)

x-pack/plugins/ingest_manager/server/services/epm/packages/assets.test.ts

jfsiii

👏 Great stuff! I've read this through a few times but haven't had a chance to run it.

I am still processing a few of the flow changes (basically around new cache/stores) but everything reads well and seems isolated enough (and with tests) that it'd be easy to change later if we needed to.

x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts

x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts

x-pack/test/ingest_manager_api_integration/apis/epm/install_by_upload.ts

x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts

skh · 2020-10-05T12:22:13Z

@jen-huang @jonathan-buttner @jfsiii thanks for your comments! I have either answered, or made amends in the code, or both.

This is ready for another look.

x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts

jen-huang · 2020-10-05T14:05:53Z

x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts

@@ -0,0 +1,332 @@
+/*


👍 I like all the verify methods in this file

x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/install.ts

jen-huang · 2020-10-05T14:14:53Z

x-pack/test/ingest_manager_api_integration/apis/epm/install_by_upload.ts

  const supertest = getService('supertest');
  const dockerServers = getService('dockerServers');
-  const log = getService('log');

  const testPkgArchiveTgz = path.join(


I imagine this is already done if the tests pass, but do these new fixtures have the new package changes? (I recall having to adjust apache_0.1.4.tar.gz during my PR)

I need to update all package fixtures. Right now I adjusted the tests to the fact that the datasets (and assets related to them) are not found in the uploaded packages.

I wonder if it is worth tracking the unpacked version of the fixtures. binary diffs are not super useful 😅

The downside of unpackaged packages is that they may contain a lot of files, which clutter PRs -- I accidentally opened one with so many files that the github review interface became unusable. I consider these fixtures like the packages contained in the dockerized registry -- unfortunately a bit difficult to handle, but they shouldn't change that often.

Also, I think I can reduce the number of these packages and move some of the validation tests to unit tests.

jen-huang · 2020-10-05T14:15:41Z

Oops, meant to leave a comment with that review ^: A few minor comments but LGTM!!

skh · 2020-10-05T14:54:40Z

@elasticmachine merge upstream

kibanamachine · 2020-10-05T16:30:07Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 7959736

Metrics [docs]

distributable file count

id	before	after	diff
`default`	47107	47108	+1

Saved Objects .kibana field count

id	before	after	diff
`epm-packages`	14	15	+1

History

💔 Build #79643 failed f134573
💔 Build #79594 failed 0881314
💚 Build #79611 succeeded df23d82
💚 Build #79576 succeeded df23d82
💔 Build #79536 failed ff2006f

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* Refactor: installPackage -> installPackageFromRegistry * Refactor: factor out source-agnostic installation steps * Unpack and cache uploaded zip and tgz files. * Add basic archive verification and parse manifest. * Catch error when zip archive is uploaded as gzip. * Add API integration tests. * Remove unnecessary use of "package key" concept. * Add 'install_source' property to saved object epm-packages. * Adjust tests. * Add API integration test for manifest missing fields. * Refactor loadArchive -> loadArchivePackage. * Refactor caching of package archive content * Get datasets and config templates from manifest files. * Use file paths from archive instead of asset paths from registry. * Correctly load registry packages into cache * Use InstallablePackage instead of RegistryPackage where possible. * Actually install uploaded package. * Add missing field to saved objects in tests. * Adjust unit test to pick buffer extractor. * Adjust unit test. * Fix and re-enable getAsset() test. * Adjust integration tests. * Make error message match test. * Pick data_stream.dataset from manifest if set. * dataset -> data_stream also in comments * Remove unused variable. * Use pkgToPkgKey() where appropriate. * More dataset -> data stream renaming. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

* Refactor: installPackage -> installPackageFromRegistry * Refactor: factor out source-agnostic installation steps * Unpack and cache uploaded zip and tgz files. * Add basic archive verification and parse manifest. * Catch error when zip archive is uploaded as gzip. * Add API integration tests. * Remove unnecessary use of "package key" concept. * Add 'install_source' property to saved object epm-packages. * Adjust tests. * Add API integration test for manifest missing fields. * Refactor loadArchive -> loadArchivePackage. * Refactor caching of package archive content * Get datasets and config templates from manifest files. * Use file paths from archive instead of asset paths from registry. * Correctly load registry packages into cache * Use InstallablePackage instead of RegistryPackage where possible. * Actually install uploaded package. * Add missing field to saved objects in tests. * Adjust unit test to pick buffer extractor. * Adjust unit test. * Fix and re-enable getAsset() test. * Adjust integration tests. * Make error message match test. * Pick data_stream.dataset from manifest if set. * dataset -> data_stream also in comments * Remove unused variable. * Use pkgToPkgKey() where appropriate. * More dataset -> data stream renaming. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

skh self-assigned this Sep 21, 2020

skh added the Team:Fleet Team label for Observability Data Collection Fleet team label Sep 21, 2020

skh force-pushed the 70582-direct-package-upload-part-2 branch 2 times, most recently from 9cbeddf to 0557804 Compare September 23, 2020 15:41

ycombinator mentioned this pull request Sep 23, 2020

Upload locally-built package to Ingest Manager elastic/elastic-package#114

Closed

skh force-pushed the 70582-direct-package-upload-part-2 branch 3 times, most recently from e0baec6 to f841ea8 Compare September 28, 2020 08:21

ruflin reviewed Sep 29, 2020

View reviewed changes

skh force-pushed the 70582-direct-package-upload-part-2 branch 3 times, most recently from 1771d65 to ff01e6e Compare September 30, 2020 10:13

skh marked this pull request as ready for review October 1, 2020 14:41

skh requested a review from a team as a code owner October 1, 2020 14:41

skh requested a review from a team October 1, 2020 14:41

skh requested a review from a team as a code owner October 1, 2020 14:41

skh added release_note:skip Skip the PR/issue when compiling release notes v7.10.0 v8.0.0 Feature:EPM Fleet team's Elastic Package Manager (aka Integrations) project labels Oct 1, 2020

skh requested a review from jen-huang October 1, 2020 14:43

skh mentioned this pull request Oct 1, 2020

[Fleet] Allow to install a package without the registry. #70582

Closed

8 tasks

skh force-pushed the 70582-direct-package-upload-part-2 branch from 7746bd2 to d182c7d Compare October 2, 2020 13:29

jfsiii reviewed Oct 2, 2020

View reviewed changes

x-pack/plugins/ingest_manager/server/services/epm/packages/assets.test.ts Outdated Show resolved Hide resolved

jfsiii reviewed Oct 2, 2020

View reviewed changes

jonathan-buttner reviewed Oct 2, 2020

View reviewed changes

jen-huang reviewed Oct 2, 2020

View reviewed changes

x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts Outdated Show resolved Hide resolved

skh added 2 commits October 5, 2020 12:40

Refactor: installPackage -> installPackageFromRegistry

0766159

Refactor: factor out source-agnostic installation steps

6553615

skh added 3 commits October 5, 2020 12:40

Add missing field to saved objects in tests.

f54e3a2

Adjust unit test to pick buffer extractor.

2c30b69

Adjust unit test.

523d8dc

skh force-pushed the 70582-direct-package-upload-part-2 branch from d182c7d to 523d8dc Compare October 5, 2020 10:40

skh added 7 commits October 5, 2020 12:54

Fix and re-enable getAsset() test.

ff2006f

Adjust integration tests.

6169a64

Make error message match test.

9fcdc83

Pick data_stream.dataset from manifest if set.

014b56f

dataset -> data_stream also in comments

c91c151

Remove unused variable.

d2fef88

Use pkgToPkgKey() where appropriate.

df23d82

skh requested review from jfsiii, jen-huang and jonathan-buttner October 5, 2020 13:22

skh force-pushed the 70582-direct-package-upload-part-2 branch from 0881314 to df23d82 Compare October 5, 2020 13:42

jen-huang approved these changes Oct 5, 2020

View reviewed changes

More dataset -> data stream renaming.

f134573

jonathan-buttner approved these changes Oct 5, 2020

View reviewed changes

Merge branch 'master' into 70582-direct-package-upload-part-2

7959736

skh merged commit ce4641a into elastic:master Oct 5, 2020

skh deleted the 70582-direct-package-upload-part-2 branch October 5, 2020 16:51

skh mentioned this pull request Oct 5, 2020

[7.x] [Ingest Manager] Install uploaded package (#77986) #79505

Merged

ruflin mentioned this pull request Oct 20, 2020

[Fleet] Proposal: Store installed packages in cluster #81110

Closed

neptunian mentioned this pull request Nov 12, 2020

[Fleet] Error when uploading a package that does not exist in the registry #83312

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Ingest Manager] Install uploaded package #77986

[Ingest Manager] Install uploaded package #77986

skh commented Sep 21, 2020 •

edited

Loading

ruflin left a comment

elasticmachine commented Oct 1, 2020

jfsiii left a comment

skh commented Oct 5, 2020

jen-huang Oct 5, 2020

jen-huang Oct 5, 2020

skh Oct 5, 2020 •

edited

Loading

jen-huang Oct 5, 2020 •

edited

Loading

skh Oct 5, 2020

jen-huang commented Oct 5, 2020

skh commented Oct 5, 2020

kibanamachine commented Oct 5, 2020

[Ingest Manager] Install uploaded package #77986

[Ingest Manager] Install uploaded package #77986

Conversation

skh commented Sep 21, 2020 • edited Loading

Summary

How to test this

Try to break it

Upload and uninstall packages

ruflin left a comment

Choose a reason for hiding this comment

elasticmachine commented Oct 1, 2020

jfsiii left a comment

Choose a reason for hiding this comment

skh commented Oct 5, 2020

jen-huang Oct 5, 2020

Choose a reason for hiding this comment

jen-huang Oct 5, 2020

Choose a reason for hiding this comment

skh Oct 5, 2020 • edited Loading

Choose a reason for hiding this comment

jen-huang Oct 5, 2020 • edited Loading

Choose a reason for hiding this comment

skh Oct 5, 2020

Choose a reason for hiding this comment

jen-huang commented Oct 5, 2020

skh commented Oct 5, 2020

kibanamachine commented Oct 5, 2020

💚 Build Succeeded

Metrics [docs]

distributable file count

Saved Objects .kibana field count

History

skh commented Sep 21, 2020 •

edited

Loading

skh Oct 5, 2020 •

edited

Loading

jen-huang Oct 5, 2020 •

edited

Loading