github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94666 from soltysh/sort_nil

Browse Source 
Handle nil elements when sorting, instead of panicking
This commit is contained in:
Kubernetes Prow Robot 2020-09-21 04:06:30 -07:00 committed by GitHub
commit 2d8fbd61af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/kubectl/pkg/cmd/get/sorter.go
View File

@ -206,6 +206,13 @@ func isLess(i, j reflect.Value) (bool, error) {
return true, nil return true, nil
case reflect.Interface: case reflect.Interface:
if i.IsNil() && j.IsNil() {
return false, nil
} else if i.IsNil() {
return true, nil
} else if j.IsNil() {
return false, nil
}
switch itype := i.Interface().(type) { switch itype := i.Interface().(type) {
case uint8: case uint8:
if jtype, ok := j.Interface().(uint8); ok { if jtype, ok := j.Interface().(uint8); ok {

26
staging/src/k8s.io/kubectl/pkg/cmd/get/sorter_test.go
View File

@ -409,6 +409,32 @@ func TestSortingPrinter(t *testing.T) {
field: "{.invalid}", field: "{.invalid}",
expectedErr: "couldn't find any field with path \"{.invalid}\" in the list of objects", expectedErr: "couldn't find any field with path \"{.invalid}\" in the list of objects",
}, },
{
name: "empty fields",
obj: &corev1.EventList{
Items: []corev1.Event{
{
ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Unix(300, 0)},
LastTimestamp: metav1.Unix(300, 0),
},
{
ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Unix(200, 0)},
},
},
},
sort: &corev1.EventList{
Items: []corev1.Event{
{
ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Unix(200, 0)},
},
{
ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Unix(300, 0)},
LastTimestamp: metav1.Unix(300, 0),
},
},
},
field: "{.lastTimestamp}",
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name+" table", func(t *testing.T) { t.Run(tt.name+" table", func(t *testing.T) {