(PUP-10786) Update puppet node clean for ca-cli 2 #8445
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
Previously, the puppet node clean action called the PuppetServer CA CLI as a library to clean certs. To do so it implemented a bridge between the CA library's logger and Puppet's logger. That implementation only included those methods used by the CA's clean action. However, in the most recent version of the CA it will now also `warn` if the cadir is in the legacy location (like Puppet proper does). This patch implements the remaining API for the CA's logger (debug and warn). It also filters out the warning from the CA library for a cadir nested w/in the ssldir, as Puppet should have already warned about that if needed.
|
The test is kinda wonky for a unit test because the warning depends on the state of the system running the test (unless we heavily refactor the CA library and the face). However, I tested locally that the unit test fails properly w/o the change and passes with the change with both an existing |
Magisus
approved these changes
Nov 19, 2020
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.
Previously, the puppet node clean action called the PuppetServer CA CLI
as a library to clean certs. To do so it implemented a bridge between
the CA library's logger and Puppet's logger. That implementation only
included those methods used by the CA's clean action. However, in the
most recent version of the CA it will now also
warnif the cadir is inthe legacy location (like Puppet proper does).
This patch implements the remaining API for the CA's logger (debug
and warn). It also filters out the warning from the CA library for a
cadir nested w/in the ssldir, as Puppet should have already warned about
that if needed.