Bug 1748283 #8354
Merged
Bug 1748283 #8354
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
howbazaar
approved these changes
Feb 8, 2018
environs/config/config.go
Outdated
| userDataMap := make(map[string]interface{}) | ||
| if err := yaml.Unmarshal([]byte(raw), &userDataMap); err != nil { | ||
| userDataMap, err := ensureStringMaps(raw) | ||
| if err != nil { | ||
| return errors.Annotate(err, "cloudinit-userdata: must be valid YAML") |
There was a problem hiding this comment.
I feel that this may be a slightly confusing error message now since YAML does allow non-string keys, but it is probably fine.
There was a problem hiding this comment.
reworked the error messages a little, so we only get the "must be valid YAML" if the unmarshal fails
or bson, while being sent through the apiserver.
|
|
Merged
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.
Description of change
Complicated YAML needs to be normalized for json/bson before passing via the apiserver. Fix this for cloudinit-userdata.
QA steps
Documentation changes
N/A
Bug reference
https://bugs.launchpad.net/juju/+bug/1748283