Re-factor the backend implementation #70
Merged
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
This is an attempt to get deep_merge's working, which are currently throwing exceptons in my testing environment. See [this issue](voxpupuli#65). I copied the yaml_backend from hiera v1.2.1, which is the one used in puppet v3.4.2, and injected the decryption mechanics. I also needed to copy the `parse_answer` method from the `::Hiera::Backend` and modified it to use the decryption aware version of `parse_string`. It's still an unfortunately long implementation considering that the only real difference between the eyaml backend and the yaml backend is the change to `::Heira::Backend.parse_string` that allows it to process encrypted values. I feel like this backend could be trimmed down so that it inherits from the yaml backend, but the issues with doing that are tricky enough to solve that I'm not going to pursue it at this point.
|
Should be good to go now. |
|
Exceptionally quick! |
|
Thanks @devin-c - this looks good to me and works ok for me (I don't use hashes, but it hasn't broken anything else). My only concern is that the debug has been striped of the hiera-eyaml prefix so it is no longer easy to see the origin of hiera log output. This could be confusing since they are largely the same log lines as those that the standard yaml backend. Can we re-introduce the [hiera-eyaml] prefix to differentiate output from the eyaml backend? |
|
@sihil, sorry about that. |
|
The "[hiera-eyaml]" log tag is back in place. |
|
Thanks. Looks good to me 👍 |
Open
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.
This is an attempt to get deep_merge's working, which are currently
throwing exceptons in my testing environment. See #65.
I copied the yaml_backend from hiera v1.2.1, which is the one used in
puppet v3.4.2, and injected the decryption mechanics. I also needed to
copy the
parse_answermethod from the::Hiera::Backendand modifiedit to use the decryption aware version of
parse_string. It's still anunfortunately long implementation considering that the only real
difference between the eyaml backend and the yaml backend is the change
to
::Heira::Backend.parse_stringthat allows it to process encryptedvalues.
I feel like this backend could be trimmed down so that it inherits from
the yaml backend, but the issues with doing that are tricky enough to
solve that I'm not going to pursue it at this point.
I've successfully tested this in my sandbox environment at work.