Add password_file to type #20
Merged
Conversation
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
| isrequired | ||
| newparam(:password_file) do | ||
| desc 'The path to a file containing the password used to protect the | ||
| keystore. This cannot be used together with :password.' |
There was a problem hiding this comment.
You can probably add a validate block to check if someone specifies both :password_file and :password, like so: https://github.com/puppetlabs/puppetlabs-firewall/blob/master/lib/puppet/type/firewall.rb#L727-L729
There was a problem hiding this comment.
Thanks. Fixed (see below).
| if File.exists?(@resource[:target]) and not File.zero?(@resource[:target]) | ||
| tmpfile.write("#{@resource[:password]}\n#{@resource[:password]}") | ||
|
|
||
| tmpfile = nil |
There was a problem hiding this comment.
This adds a lot of logic to this method; I think that this could be extracted to a private method and called here to make this a bit more simple.
|
@adrienthebo: I added a |
|
Thanks for merging. I will now move on to the puppetdb part of using this change :-) |
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 PR adds a
password_fileparameter to pass a file instead of a string for the password.Note: the provider specs are broken in master, I did not intend to fix them.