Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support wrapped templates produced by elastic-package dump #1492

Merged
merged 6 commits into from
May 23, 2022

Conversation

cavokz
Copy link
Contributor

@cavokz cavokz commented May 17, 2022

This allows to use integration assets dumped by elastic-package as-is, which enclose an outer meta data layer otherwise rejected when sent to Elastisearch.

@cavokz cavokz marked this pull request as ready for review May 17, 2022 14:56
Copy link
Contributor

@DJRickyB DJRickyB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this. Please add a description to the issue (we are doing this because elastic-package dump produces wrapped objects, I think that's fine to mention here), and some documentation to the track reference docs

esrally/resources/track-schema.json Outdated Show resolved Hide resolved
esrally/resources/track-schema.json Outdated Show resolved Hide resolved
cavokz and others added 3 commits May 17, 2022 17:05
Co-authored-by: Rick Boyd <boyd.richardj@gmail.com>
Co-authored-by: Rick Boyd <boyd.richardj@gmail.com>
@cavokz cavokz requested a review from DJRickyB May 17, 2022 16:16
Copy link
Contributor

@DJRickyB DJRickyB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM with one nit. I don't think we should work to support a leading . in the template-path (for the root element), but I think one is implied by the wording JSON path in the docs/docstrings. I know this was my wording, but if you agree I think it's better documented as the JSON field inside the file content that contains the template. That way, we support the dot-notation in the way that you've coded but there's no reason for anyone to plug a leading .

With just a docs change to this effect, I don't see a need for further review, but please feel free to re-request

@cavokz
Copy link
Contributor Author

cavokz commented May 20, 2022

Yes, I also noticed this and you're right, better save some time now that we still remember this caveat. Fixed with d9ccf60.

@DJRickyB
Copy link
Contributor

@elasticmachine run tests

@DJRickyB
Copy link
Contributor

@elasticmachine update branch

@cavokz cavokz merged commit de83f22 into elastic:master May 23, 2022
@cavokz cavokz deleted the address-wrapped-templates branch May 23, 2022 14:27
@pquentin pquentin changed the title Address wrapped templates Allow wrapped templates produced by elastic-package dump Jun 23, 2022
@pquentin pquentin added the enhancement Improves the status quo label Jun 23, 2022
@pquentin pquentin changed the title Allow wrapped templates produced by elastic-package dump Support wrapped templates produced by elastic-package dump Jun 23, 2022
@pquentin pquentin added this to the 2.5.0 milestone Jun 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improves the status quo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants