From 822c0da84474c50ac640629e7cb9cad01904c2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Wiesm=C3=BCller?= Date: Thu, 28 Feb 2019 14:24:02 +0100 Subject: [PATCH] start implementing managedFields sorting --- .../fieldmanager/internal/managedfields.go | 4 +++ .../internal/managedfields_test.go | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go index 0c20d97b92..4c2ee77639 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go @@ -146,6 +146,10 @@ func encodeManagedFields(managedFields fieldpath.ManagedFields) (encodedManagedF } encodedManagedFields = append(encodedManagedFields, *v) } + return sortEncodedManagedFields(encodedManagedFields) +} + +func sortEncodedManagedFields(encodedManagedFields []metav1.ManagedFieldsEntry) (sortedManagedFields []metav1.ManagedFieldsEntry, err error) { return encodedManagedFields, nil } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields_test.go index 1712b3b23a..1caac62399 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields_test.go @@ -198,3 +198,33 @@ time: "2001-02-03T04:05:06Z" }) } } + +func TestSortEncodedManagedFields(t *testing.T) { + tests := []struct { + name string + managedFields []metav1.ManagedFieldsEntry + expected []metav1.ManagedFieldsEntry + }{ + { + name: "remains untouched", + managedFields: []metav1.ManagedFieldsEntry{ + {Manager: "a", Operation: metav1.ManagedFieldsOperationApply, Time: &metav1.Time{}}, + }, + expected: []metav1.ManagedFieldsEntry{ + {Manager: "a", Operation: metav1.ManagedFieldsOperationApply, Time: &metav1.Time{}}, + }, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + sorted, err := sortEncodedManagedFields(test.managedFields) + if err != nil { + t.Fatalf("did not expect error when sorting but got: %v", err) + } + if !reflect.DeepEqual(sorted, test.expected) { + t.Fatalf("expected:\n%v\nbut got:\n%v", test.expected, sorted) + } + }) + } +}