github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: update bazel, codec, and gofmt

Browse Source
This commit is contained in:
Clayton Coleman
2016-12-03 14:06:03 -05:00
parent 5df8cc39c9
commit 3454a8d52c
440 changed files with 8682 additions and 8706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apiserver/testing/types.generated.go
View File

@@ -26,7 +26,7 @@ import (
"fmt"
codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/kubernetes/pkg/api"
pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg3_types "k8s.io/kubernetes/pkg/types"
"reflect"
"runtime"
@@ -64,7 +64,7 @@ func init() {
}
if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta
var v1 pkg1_unversioned.TypeMeta
var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID
var v3 time.Time
_, _, _, _ = v0, v1, v2, v3
@@ -1361,7 +1361,7 @@ func (x *SimpleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "metadata":
if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{}
x.ListMeta = pkg1_v1.ListMeta{}
} else {
yyv119 := &x.ListMeta
yym120 := z.DecBinary()
@@ -1442,7 +1442,7 @@ func (x *SimpleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{}
x.ListMeta = pkg1_v1.ListMeta{}
} else {
yyv126 := &x.ListMeta
yym127 := z.DecBinary()

10
pkg/apiserver/testing/types.go
View File

@@ -24,7 +24,7 @@ import (
type Simple struct {
metav1.TypeMeta `json:",inline"`
api.ObjectMeta `json:"metadata"`
api.ObjectMeta `json:"metadata"`
// +optional
Other string `json:"other,omitempty"`
// +optional
@@ -35,7 +35,7 @@ func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
type SimpleRoot struct {
metav1.TypeMeta `json:",inline"`
api.ObjectMeta `json:"metadata"`
api.ObjectMeta `json:"metadata"`
// +optional
Other string `json:"other,omitempty"`
// +optional
@@ -46,9 +46,9 @@ func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta
type SimpleGetOptions struct {
metav1.TypeMeta `json:",inline"`
Param1 string `json:"param1"`
Param2 string `json:"param2"`
Path string `json:"atAPath"`
Param1 string `json:"param1"`
Param2 string `json:"param2"`
Path string `json:"atAPath"`
}
func (SimpleGetOptions) SwaggerDoc() map[string]string {