Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: fix error api json #2225

Merged
merged 1 commit into from
Sep 14, 2018
Merged

Conversation

rudyfly
Copy link
Collaborator

@rudyfly rudyfly commented Sep 10, 2018

Ⅰ. Describe what this PR did

Modify missing omitempty in json for api, genarate api by our swagger tool.
We use swagger-0.12.0, and cherry-pick commit: b6e18f

Ⅱ. Does this pull request fix one issue?

NONE

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

NONE

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: Rudy Zhang [email protected]

@pouchrobot pouchrobot added kind/bug This is bug report for project size/XS labels Sep 10, 2018
@codecov-io
Copy link

codecov-io commented Sep 10, 2018

Codecov Report

Merging #2225 into master will decrease coverage by 4.69%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #2225     +/-   ##
=========================================
- Coverage   66.57%   61.88%   -4.7%     
=========================================
  Files         208      208             
  Lines       16744    16744             
=========================================
- Hits        11148    10362    -786     
- Misses       4273     5197    +924     
+ Partials     1323     1185    -138
Flag Coverage Δ
#criv1alpha1test ?
#criv1alpha2test 33.5% <ø> (+0.06%) ⬆️
#integrationtest 39.96% <ø> (ø) ⬆️
#nodee2etest 33.6% <ø> (-0.11%) ⬇️
#unittest 23.87% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cri/v1alpha1/cri_types.go 0% <0%> (-100%) ⬇️
cri/v1alpha1/service/cri.go 0% <0%> (-84.62%) ⬇️
cri/v1alpha1/cri_stream.go 0% <0%> (-80%) ⬇️
cri/v1alpha1/server.go 0% <0%> (-79.85%) ⬇️
cri/v1alpha1/cri.go 0% <0%> (-62.57%) ⬇️
cri/v1alpha1/cri_wrapper.go 0% <0%> (-55.81%) ⬇️
cri/criservice.go 39.7% <0%> (-25%) ⬇️
cri/v1alpha1/cri_utils.go 59.06% <0%> (-24.17%) ⬇️
cri/ocicni/cni_manager.go 65% <0%> (-15%) ⬇️
ctrd/watch.go 75.75% <0%> (-7.58%) ⬇️
... and 7 more

@@ -41,7 +41,7 @@ type RegistryServiceConfig struct {
// > are in compliance with any terms that cover redistributing
// > nondistributable artifacts.
//
AllowNondistributableArtifactsCIDRs []string `json:"AllowNondistributableArtifactsCIDRs"`
AllowNondistributableArtifactsCIDRs []string `json:"AllowNondistributableArtifactsCIDRs,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed again and again ...

@pouchrobot pouchrobot added size/S and removed size/XS labels Sep 11, 2018
@rudyfly rudyfly changed the title [WIP]bugfix: fix error api json remarks bugfix: fix error api json remarks Sep 11, 2018
Modify missing `omitempty` in json for api

Signed-off-by: Rudy Zhang <[email protected]>
@rudyfly rudyfly changed the title bugfix: fix error api json remarks bugfix: fix error api json Sep 11, 2018
Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid fuweid merged commit 7400311 into AliyunContainerService:master Sep 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants