This repository was archived by the owner on Sep 17, 2024. It is now read-only.
fix: properly copy files from compose to elastic-package#1764
Merged
mdelapenya merged 1 commit intoelastic:masterfrom Nov 3, 2021
Merged
fix: properly copy files from compose to elastic-package#1764mdelapenya merged 1 commit intoelastic:masterfrom
mdelapenya merged 1 commit intoelastic:masterfrom
Conversation
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
cachedout
approved these changes
Nov 3, 2021
v1v
reviewed
Nov 3, 2021
v1v
approved these changes
Nov 3, 2021
mergify Bot
pushed a commit
that referenced
this pull request
Nov 3, 2021
(cherry picked from commit 293ba96)
mergify Bot
pushed a commit
that referenced
this pull request
Nov 3, 2021
(cherry picked from commit 293ba96) # Conflicts: # internal/deploy/elastic_package.go
mergify Bot
pushed a commit
that referenced
this pull request
Nov 3, 2021
(cherry picked from commit 293ba96)
mdelapenya
added a commit
that referenced
this pull request
Nov 3, 2021
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What does this PR do?
This PR reverts the SRC/TARGET file paths used to check and copy the kibana configs from our compose config dir when copying that kibana config to a newly created elastic-package profile.
The src file, which the code checks its existence, must always follow the
kibana.config.ymlfile name, and the target file, where the code copies the src file to, must always follow the elastic-package naming-schema for the config:kibana.config.8x.ymlfor master orkibana.config.default.yml.Why is it important?
Whenever an scenario is using a profile different than
default, as we do in the preconfigured-policies feature file, the code will incorrectly check for the existence under the compose config dir of a '8x' file, which does not exist, causing in the following error thrown by elastic-package:Checklist
make unit-test), and they are passing locallymake noticein the proper directory)Related issues
Follow-ups
Backports must be fixed, as when backporting this PR to any maintenance branch, the
elastic_package.go:L114must be updated tokiban.config.default.yml.