[Fleet] Split unpacking an archive and caching its files into separate functions #83085
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jfsiii
changed the title
jfsiii
commented
Nov 10, 2020
| paths, | ||
| }; | ||
| } | ||
|
|
||
| export function parseAndVerifyArchive(paths: string[]): ArchivePackage { |
There was a problem hiding this comment.
parseAndVerifyArchive needs to read any manifest.yml files in the archive to do its validation. Instead of sharing the existing memory cache, use a local map. It only holds a few entries only needs them while parsing. Now it's not coupled to any other implementation or order.
jfsiii
added
7.11.0
release_note:skip
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: |
skh
approved these changes
Nov 10, 2020
botelastic
bot
added
the
Team:Fleet
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
jfsiii
pushed a commit
that referenced
this pull request
Nov 11, 2020
…e functions (#83085) (#83153) ## Summary * Separate unpacking an archive from caching it or other side-effects * Parse and validate an archive before caching it * Validation has no coupling with caching side-effects or any other code outside the `validation.ts` file ```diff - const paths = await unpackArchiveToCache(archiveBuffer, contentType); - const archivePackageInfo = parseAndVerifyArchive(paths); + const entries = await unpackArchiveEntries(archiveBuffer, contentType); + const { archivePackageInfo } = await parseAndVerifyArchiveEntries(entries); + const paths = addEntriesToMemoryStore(entries); ``` ### Checklist - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
validation.tsfileChecklist