Do not set empty field or label selectors on requests

Default behavior for "" is already "everything"
This commit is contained in:
Clayton Coleman 2014-12-30 19:30:18 -05:00
parent a99bb4823b
commit 502204ad6d
2 changed files with 7 additions and 4 deletions

View File

@ -180,6 +180,9 @@ func (r *Request) SelectorParam(paramName string, s labels.Selector) *Request {
if r.err != nil {
return r
}
if s.Empty() {
return r
}
return r.setParam(paramName, s.String())
}

View File

@ -55,7 +55,7 @@ func TestCreateLists(t *testing.T) {
}{
// Minion
{
location: "/api/" + testapi.Version() + "/minions?fields=",
location: "/api/" + testapi.Version() + "/minions",
factory: factory.createMinionLW,
},
// Assigned pod
@ -95,15 +95,15 @@ func TestCreateWatches(t *testing.T) {
// Minion watch
{
rv: "",
location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=",
location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=",
factory: factory.createMinionLW,
}, {
rv: "0",
location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=0",
location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=0",
factory: factory.createMinionLW,
}, {
rv: "42",
location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=42",
location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=42",
factory: factory.createMinionLW,
},
// Assigned pod watches