Unify command-line options and configuration #227
Conversation
|
Added a unit test for verifying that the configuration file options take precedence. |
| @@ -63,7 +63,7 @@ def merge(self, d): | |||
| """ | |||
| Merge variables from dict ``d`` into the configuration | |||
|
|
|||
| The last one wins. | |||
| The first one wins. | |||
There was a problem hiding this comment.
Isn't it the last one? If both dicts have the same key, the value will be updated to the value for the key in the passed dict.
There was a problem hiding this comment.
This is correct. The reason is because of the default cli options. I wasn't able to find a reliable way to tell whether the option had been passed in vs the argparse default value. Since pki also uses the framework I can't drop all default values because they may use them as well.
The tests verify this in an indirect way. e.g. setting output_type=human vs the default value of json.
There was a problem hiding this comment.
But I don't understand the comment. Isn't the last one winning?
There was a problem hiding this comment.
It's because of the object.__setattr__(self, key, value) in setitem. It basically makes it immutable.
There was a problem hiding this comment.
Thanks, missed that.
This makes it possible to add command-line options to the configuration file. The config file is loaded then the command-line options are merged in. The first one option set takes precedence. So if an option, say output_type, is in the configuration file then passing output-type on the command-line will not override it. The workaround is to pass --config= to ipa-healthcheck in order to not load the configuration file. This will allow for greater flexibility when running this automatically without having to manually change test timer scripting directly. https://bugzilla.redhat.com/show_bug.cgi?id=1872467 Signed-off-by: Rob Crittenden <[email protected]>
This adds command-line options to the configuration, but not vice-versa.
It will allow for greater flexibility when running this automatically
without having to change any scripting.
https://bugzilla.redhat.com/show_bug.cgi?id=1872467
Signed-off-by: Rob Crittenden [email protected]