More configurer validation changes, should fill in missing defaults into config #147
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
|
Ah yeah, there's conflicts with the base branch that I think we'd need to merge together, it's in the validate code. I modified some things when I was messing with the logic a bit but I think maybe I can revert some of my changes there that are basically doing the same thing in the original branch. |
sjrct
requested changes
Oct 30, 2019
| # Ensure the key exists, and if we aren't taking defaults, ensure we report | ||
| if not tmp and not fill_default: | ||
| if not tmp and not required: | ||
| break |
There was a problem hiding this comment.
shouldn't this be a continue instead? if we break we don't validate the rest of the keys
| @@ -132,6 +137,10 @@ def _instantiate_objects(self, key): | |||
| conf = inst[k] | |||
| obj = self.load_object(conf["of"], conf=conf) | |||
|
|
|||
| if obj.config != conf: | |||
| self.config[key + "-instances"][k] = obj.config | |||
| self.config._write_config() | |||
There was a problem hiding this comment.
I'm not sure that I am a fan of this, maybe we should just give a warning instead? I can be convinced otherwise though.
If I am convinced otherwise, we probably should set a bool and do the write after the loop though.
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.
Not sure if any of this will make sense, or if it makes sense in the grand scheme of things. Basically the goal was to add logic to fix broken config files. From a few local tests I've run this seems to be working okay. A few things:
dependsparameter for any dependency of an option. One example of this istls-verify, wheredepends="tls"<option>: nullin the config file. It doesn't seem to break anything, and I tried working around this by having therequiredlocal variable in my changes, more in the item below.Again, maybe this is wrong but hopefully helpful in some way, or at least guiding this in the right direction. Please feel free to post feedback on this.