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.

Sign up for GitHub

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

Jump to bottom

remove the omitempty tag from CertificateSigningRequestList.Items #29468

Merged
merged 1 commit into from
Jul 29, 2016
Merged

remove the omitempty tag from CertificateSigningRequestList.Items #29468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/swagger-spec/certificates_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,9 @@
"models": {
"v1alpha1.CertificateSigningRequestList": {
"id": "v1alpha1.CertificateSigningRequestList",
"required": [
"items"
],
"properties": {
"kind": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions docs/api-reference/certificates/v1alpha1/definitions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ <h3 id="_v1alpha1_certificatesigningrequestlist">v1alpha1.CertificateSigningRequ
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">items</p></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1alpha1_certificatesigningrequest">v1alpha1.CertificateSigningRequest</a> array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
Expand Down Expand Up @@ -1304,7 +1304,7 @@ <h3 id="_any">any</h3>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-06-30 07:06:23 UTC
Last updated 2016-07-22 19:31:19 UTC
</div>
</div>
</body>
Expand Down
43 changes: 18 additions & 25 deletions pkg/apis/certificates/v1alpha1/types.generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,14 +1391,13 @@ func (x *CertificateSigningRequestList) CodecEncodeSelf(e *codec1978.Encoder) {
_, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false
yyq2[0] = true
yyq2[1] = len(x.Items) != 0
yyq2[2] = x.Kind != ""
yyq2[3] = x.APIVersion != ""
var yynn2 int
if yyr2 || yy2arr2 {
r.EncodeArrayStart(4)
} else {
yynn2 = 0
yynn2 = 1
for _, b := range yyq2 {
if b {
yynn2++
Expand Down Expand Up @@ -1438,34 +1437,28 @@ func (x *CertificateSigningRequestList) CodecEncodeSelf(e *codec1978.Encoder) {
}
if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] {
if x.Items == nil {
r.EncodeNil()
if x.Items == nil {
r.EncodeNil()
} else {
yym9 := z.EncBinary()
_ = yym9
if false {
} else {
yym9 := z.EncBinary()
_ = yym9
if false {
} else {
h.encSliceCertificateSigningRequest(([]CertificateSigningRequest)(x.Items), e)
}
h.encSliceCertificateSigningRequest(([]CertificateSigningRequest)(x.Items), e)
}
} else {
r.EncodeNil()
}
} else {
if yyq2[1] {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("items"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Items == nil {
r.EncodeNil()
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("items"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Items == nil {
r.EncodeNil()
} else {
yym10 := z.EncBinary()
_ = yym10
if false {
} else {
yym10 := z.EncBinary()
_ = yym10
if false {
} else {
h.encSliceCertificateSigningRequest(([]CertificateSigningRequest)(x.Items), e)
}
h.encSliceCertificateSigningRequest(([]CertificateSigningRequest)(x.Items), e)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/certificates/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ type CertificateSigningRequestList struct {
unversioned.TypeMeta `json:",inline"`
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

Items []CertificateSigningRequest `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
Items []CertificateSigningRequest `json:"items" protobuf:"bytes,2,rep,name=items"`
}