Allow config file to set ssl.verify usefully #200
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
| @@ -183,7 +183,7 @@ def upload | |||
| client_name: Berkshelf::Config.instance.chef.node_name, | |||
| client_key: Berkshelf::Config.instance.chef.client_key, | |||
| ssl: { | |||
| verify: (options[:ssl_verify] || Berkshelf::Config.instance.ssl.verify) | |||
| verify: (options[:ssl_verify] || Berkshelf::Config.instance.ssl.verify || true) | |||
| } | |||
There was a problem hiding this comment.
I don't think this fallback is necessary if we marked the option as required in the Berkshelf::Config
attribute 'ssl.verify',
required: true,
type: Boolean,
default: trueDo you think this is a better approach?
There was a problem hiding this comment.
You can drop the second line change; the ssl.verify has that default already, I just missed it. No need to force it, I think.
There was a problem hiding this comment.
ok I'll merge this in and make this small change
|
another good catch! |
reset
added a commit
that referenced
this pull request
Nov 10, 2012
Allow config file to set ssl.verify usefully
|
Thanks! |
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.
The
--ssl_verifyflag has a default of true, which means it always overrides thessl.verifyconfig file option, even if it isn't selected. Making it default to nil, and adding the default further down the chain (in case neither cli nor config file expresses an opinion).