bugfix: add check for json-file log opt #2306
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
Codecov Report
@@ Coverage Diff @@
## master #2306 +/- ##
==========================================
+ Coverage 66.97% 67.05% +0.08%
==========================================
Files 211 211
Lines 17306 17316 +10
==========================================
+ Hits 11591 11612 +21
+ Misses 4312 4306 -6
+ Partials 1403 1398 -5
|
allencloud
reviewed
Oct 12, 2018
daemon/logger/jsonfile/jsonfile.go
Outdated
| func ValidateLogOpt(cfg map[string]string) error { | ||
| for key := range cfg { | ||
| switch key { | ||
| case "max-file": |
There was a problem hiding this comment.
Could you add all these valid type in a single slice?
And we could check if the input type is in the slice. Then we could make the detailed implemented function decoupled from the specific string, but only a parameter of slice.
|
I think we should add some integration test for this feature. WDYT? @ZYecho |
allencloud
reviewed
Oct 12, 2018
daemon/mgr/container_validation.go
Outdated
| @@ -11,6 +11,7 @@ import ( | |||
| "github.com/alibaba/pouch/daemon/logger/syslog" | |||
| "github.com/alibaba/pouch/pkg/system" | |||
|
|
|||
| "github.com/alibaba/pouch/daemon/logger/jsonfile" | |||
There was a problem hiding this comment.
Please remove the blank line before this import line and add a blank line below it.
ZYecho
force-pushed
the
add-logopt-check
branch
from
a220b86 to
ce7cb9b
Compare
Signed-off-by: zhangyue <zy675793960@yeah.net>
ZYecho
force-pushed
the
add-logopt-check
branch
from
ce7cb9b to
dee059d
Compare
done. |
|
LGTM |
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.
Signed-off-by: zhangyue zy675793960@yeah.net
Ⅰ. Describe what this PR did
check the pouch if run with unsupported log options.
Ⅱ. Does this pull request fix one issue?
fix issue #2276
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
None.
Ⅳ. Describe how to verify it
pouch run --name=test --log-opt env1=baz busybox echo helloGet
Error: failed to run container: {"message":"unknown log opt 'env1' for json-file log driver"}Ⅴ. Special notes for reviews
None.