libcni: up-convert a Config to a ConfigList when no other configs are found. #374
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
squeed
changed the title
|
LGTM |
bboreham
approved these changes
Feb 24, 2017
libcni/conf.go
Outdated
|
|
||
| rawConfigList := make(map[string]interface{}) | ||
| rawConfigList["name"] = original.Network.Name | ||
| rawConfigList["cniVersion"] = original.Network.CNIVersion |
There was a problem hiding this comment.
how about
rawConfigList := map[string]interface{}{
"name" : original.Network.Name,
"cniVersion": original.Network.CNIVersion,
"plugins" : []interface{}{rawConfig},
}
libcni/conf.go
Outdated
| // no files at all | ||
| case len(files) == 0 && err == NoConfigsFoundError: | ||
| return nil, err | ||
| // some files found |
There was a problem hiding this comment.
could be clearer - "some files found by ConfFiles, but not one matching the required name" ?
libcni/conf.go
Outdated
| // golang default values. | ||
|
|
||
| rawConfig := make(map[string]interface{}) | ||
| err := json.Unmarshal(original.Bytes, &rawConfig) |
There was a problem hiding this comment.
could merge with next line
|
LGTM |
squeed
force-pushed
the
config-list-upconvert
branch
from
2719207 to
6e6ad53
Compare
|
@bboreham thanks for the feedback, updated. |
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.
No description provided.