Cherry-pick #9892 to 6.x: Remove _meta/kibana.generated symlink#9917
Merged
kvch merged 1 commit intoelastic:6.xfrom Jan 7, 2019
Merged
Cherry-pick #9892 to 6.x: Remove _meta/kibana.generated symlink#9917kvch merged 1 commit intoelastic:6.xfrom
kvch merged 1 commit intoelastic:6.xfrom
Conversation
Fixes a bug introduced with elastic#9546 where a symlink from `_meta/kibana.generated` to `build/kibana` would cause objects to be included in the dashboard ZIP file with the wrong path. This removes the symlink in favor of a conditional. Fixes elastic#9785.
kvch
force-pushed
the
backport_9892_6.x
branch
from
7e085c7 to
8553c59
Compare
Contributor
Author
|
Failing tests are unrelated. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of PR #9892 to 6.x branch. Original message:
#9546 introduced a symlink from
_meta/kibana.generatedtobuild/kibanaso Auditbeat remains backwards compatible with the other Beats (Auditbeat is already using the first as a location for all its Kibana objects, while the other Beats are still using the latter).This introduced a bug, where objects would be included in the dashboard ZIP file with the wrong path (#9785).
One way of fixing this would have been to double down on symlinks and change just one line in
addFileToZip. But with #9842 about to change all Beats to use the newbuild/kibanaI thought it better to just remove the symlink capability altogether and instead if-else between the two possible locations based on whether they exist or not. #9842 will then change all of that - at least inmaster- once it's merged.Fixes #9785.