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

Revert the validation on dotted key in the keystore and add a cyclic reference test case #6098

Merged
merged 4 commits into from
Jan 23, 2018

Conversation

ph
Copy link
Contributor

@ph ph commented Jan 17, 2018

We are reverting the change in 0cdcf4f and we will allow dotted key in the keystore. We also add a system env test that add a cyclic reference use case.

This PR depends on elastic/go-ucfg#97 allowing configuration to define cyclic references.

@ph ph requested a review from tsg January 17, 2018 21:41
@ruflin ruflin added the blocked label Jan 18, 2018
@ph ph force-pushed the fix/revert-dotted-key-validation branch from 82f9d70 to fcd62d4 Compare January 23, 2018 02:11
@ph ph added needs_backport PR is waiting to be backported to other branches. and removed blocked labels Jan 23, 2018
@ph
Copy link
Contributor Author

ph commented Jan 23, 2018

elastic/go-ucfg#97 was merged, waiting for CI to run everything.

Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

Awesome work here! WFG

@ph
Copy link
Contributor Author

ph commented Jan 23, 2018

Thanks @exekias!

ph added 4 commits January 23, 2018 10:21
Adding a specific system env test to target a cyclic reference in the
configuration.
This update allow us to support top level key reference when the top
level doesn't already exist in the YAML document and it allow us to use
cyclic reference in a yaml document if the key exist in other resolvers.

Ref: elastic/go-ucfg#97
@ph ph force-pushed the fix/revert-dotted-key-validation branch from fcd62d4 to 5a855d8 Compare January 23, 2018 15:21
@ph
Copy link
Contributor Author

ph commented Jan 23, 2018

updated with a fixed version on go-ucfg (0.5.0) instead of a commit hash.

@urso urso merged commit 34b6a46 into elastic:master Jan 23, 2018
ph added a commit to ph/beats that referenced this pull request Jan 23, 2018
…reference test case (elastic#6098)

* Revert "Refuse to store dotted keys to prevent cyclic reference in our configuration. (elastic#6077)"

This reverts commit 0cdcf4f.

* Keystore adding a system env test

Adding a specific system env test to target a cyclic reference in the
configuration.

* Update go-ucfg

This update allow us to support top level key reference when the top
level doesn't already exist in the YAML document and it allow us to use
cyclic reference in a yaml document if the key exist in other resolvers.

Ref: elastic/go-ucfg#97

* Update changelog

(cherry picked from commit 34b6a46)
@ph ph removed the needs_backport PR is waiting to be backported to other branches. label Jan 23, 2018
tsg pushed a commit that referenced this pull request Jan 24, 2018
…reference test case (#6098) (#6154)

* Revert "Refuse to store dotted keys to prevent cyclic reference in our configuration. (#6077)"

This reverts commit 0cdcf4f.

* Keystore adding a system env test

Adding a specific system env test to target a cyclic reference in the
configuration.

* Update go-ucfg

This update allow us to support top level key reference when the top
level doesn't already exist in the YAML document and it allow us to use
cyclic reference in a yaml document if the key exist in other resolvers.

Ref: elastic/go-ucfg#97

* Update changelog

(cherry picked from commit 34b6a46)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…reference test case (elastic#6098) (elastic#6154)

* Revert "Refuse to store dotted keys to prevent cyclic reference in our configuration. (elastic#6077)"

This reverts commit f531ac0.

* Keystore adding a system env test

Adding a specific system env test to target a cyclic reference in the
configuration.

* Update go-ucfg

This update allow us to support top level key reference when the top
level doesn't already exist in the YAML document and it allow us to use
cyclic reference in a yaml document if the key exist in other resolvers.

Ref: elastic/go-ucfg#97

* Update changelog

(cherry picked from commit 375191e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants