github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 22:20:18 +00:00
Code Issues Projects Releases Wiki Activity

Use codec to encode/decode api objects in client and kubecfg parser

Browse Source
This commit is contained in:
csrwng
2014-08-29 13:53:14 -04:00
parent d7f84aef82
commit 6551f4e0f0
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/client/request.go
View File

@@ -206,7 +206,7 @@ func (r *Request) Body(obj interface{}) *Request {
case io.Reader:
r.body = t
case runtime.Object:
data, err := runtime.DefaultCodec.Encode(t)
data, err := r.c.Codec.Encode(t)
if err != nil {
r.err = err
return r
@@ -301,14 +301,15 @@ func (r *Request) Do() Result {
}
}
}
return Result{respBody, err}
return Result{respBody, err, r.c.Codec}
}
}
// Result contains the result of calling Request.Do().
type Result struct {
body []byte
err error
body []byte
err error
codec runtime.Codec
}
// Raw returns the raw result.
@@ -321,7 +322,7 @@ func (r Result) Get() (runtime.Object, error) {
if r.err != nil {
return nil, r.err
}
return runtime.DefaultCodec.Decode(r.body)
return r.codec.Decode(r.body)
}
// Into stores the result into obj, if possible.
@@ -329,7 +330,7 @@ func (r Result) Into(obj runtime.Object) error {
if r.err != nil {
return r.err
}
return runtime.DefaultCodec.DecodeInto(r.body, obj)
return r.codec.DecodeInto(r.body, obj)
}
// Error returns the error executing the request, nil if no error occurred.