github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3093 from derekwaynecarr/more_client_updates

Browse Source 
Follow-up review comments from 3066
This commit is contained in:
Brendan Burns 2014-12-22 10:05:15 -08:00
commit 95d4da98bb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/client_test.go
View File

@ -162,7 +162,7 @@ func (c *testClient) ValidateCommon(t *testing.T, err error) {
} }
} }
// buildResourcePath is a convenience function for knowing if a namespace should in a path param or not // buildResourcePath is a convenience function for knowing if a namespace should be in a path param or not
func buildResourcePath(namespace, resource string) string { func buildResourcePath(namespace, resource string) string {
if len(namespace) > 0 { if len(namespace) > 0 {
if NamespaceInPathFor(testapi.Version()) { if NamespaceInPathFor(testapi.Version()) {
@ -172,7 +172,7 @@ func buildResourcePath(namespace, resource string) string {
return resource return resource
} }
// buildQueryValues is a convenience function for knowing if a namespace should go in a query param or not // buildQueryValues is a convenience function for knowing if a namespace should be in a query param or not
func buildQueryValues(namespace string, query url.Values) url.Values { func buildQueryValues(namespace string, query url.Values) url.Values {
v := url.Values{} v := url.Values{}
if query != nil { if query != nil {

10
pkg/client/request.go
View File

@ -96,8 +96,8 @@ type Request struct {
sync bool sync bool
timeout time.Duration timeout time.Duration
// flag to control how to use namespace in urls // If true, put ns/<namespace> in path; if false, add "?namespace=<namespace>" as a query parameter
namespaceAsPath bool namespaceInPath bool
// output // output
err error err error
@ -105,13 +105,13 @@ type Request struct {
} }
// NewRequest creates a new request with the core attributes. // NewRequest creates a new request with the core attributes.
func NewRequest(client HTTPClient, verb string, baseURL *url.URL, codec runtime.Codec, namespaceAsPath bool) *Request { func NewRequest(client HTTPClient, verb string, baseURL *url.URL, codec runtime.Codec, namespaceInPath bool) *Request {
return &Request{ return &Request{
client: client, client: client,
verb: verb, verb: verb,
baseURL: baseURL, baseURL: baseURL,
codec: codec, codec: codec,
namespaceAsPath: namespaceAsPath, namespaceInPath: namespaceInPath,
path: baseURL.Path, path: baseURL.Path,
} }
} }
@ -141,7 +141,7 @@ func (r *Request) Namespace(namespace string) *Request {
} }
if len(namespace) > 0 { if len(namespace) > 0 {
if r.namespaceAsPath { if r.namespaceInPath {
return r.Path("ns").Path(namespace) return r.Path("ns").Path(namespace)
} else { } else {
return r.setParam("namespace", namespace) return r.setParam("namespace", namespace)