mirror of https://github.com/k3s-io/k3s
Merge pull request #39834 from liggitt/empty-list
Automatic merge from submit-queue Ensure empty lists don't return nil items fields Fixes #39822 ```release-note Fixes API compatibility issue with empty lists incorrectly returning a null `items` field instead of an empty array. ```pull/6/head
commit
effeb20a60
|
@ -334,6 +334,13 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
trace.Step("Self-linking done")
|
trace.Step("Self-linking done")
|
||||||
|
// Ensure empty lists return a non-nil items slice
|
||||||
|
if numberOfItems == 0 {
|
||||||
|
if err := meta.SetList(result, []runtime.Object{}); err != nil {
|
||||||
|
scope.err(err, res.ResponseWriter, req.Request)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
responsewriters.WriteObject(http.StatusOK, scope.Kind.GroupVersion(), scope.Serializer, result, w, req.Request)
|
responsewriters.WriteObject(http.StatusOK, scope.Kind.GroupVersion(), scope.Serializer, result, w, req.Request)
|
||||||
trace.Step(fmt.Sprintf("Writing http response done (%d items)", numberOfItems))
|
trace.Step(fmt.Sprintf("Writing http response done (%d items)", numberOfItems))
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,6 +76,34 @@ func TestExtensionsPrefix(t *testing.T) {
|
||||||
testPrefix(t, "/apis/extensions/")
|
testPrefix(t, "/apis/extensions/")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEmptyList(t *testing.T) {
|
||||||
|
_, s := framework.RunAMaster(nil)
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
|
u := s.URL + "/api/v1/namespaces/default/pods"
|
||||||
|
resp, err := http.Get(u)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error getting %s: %v", u, err)
|
||||||
|
}
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
data, _ := ioutil.ReadAll(resp.Body)
|
||||||
|
decodedData := map[string]interface{}{}
|
||||||
|
if err := json.Unmarshal(data, &decodedData); err != nil {
|
||||||
|
t.Logf("body: %s", string(data))
|
||||||
|
t.Fatalf("got error decoding data: %v", err)
|
||||||
|
}
|
||||||
|
if items, ok := decodedData["items"]; !ok {
|
||||||
|
t.Logf("body: %s", string(data))
|
||||||
|
t.Fatalf("missing items field in empty list (all lists should return an items field)")
|
||||||
|
} else if items == nil {
|
||||||
|
t.Logf("body: %s", string(data))
|
||||||
|
t.Fatalf("nil items field from empty list (all lists should return non-nil empty items lists)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestWatchSucceedsWithoutArgs(t *testing.T) {
|
func TestWatchSucceedsWithoutArgs(t *testing.T) {
|
||||||
_, s := framework.RunAMaster(nil)
|
_, s := framework.RunAMaster(nil)
|
||||||
defer s.Close()
|
defer s.Close()
|
||||||
|
|
Loading…
Reference in New Issue