From ac904454c24bebd9501ea4701d38f55f25ec9c33 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Maan Date: Fri, 31 Dec 2021 15:15:18 -0800 Subject: [PATCH 1/3] Preserve metadata for fake dynamic client unstructured lists Signed-off-by: Harsimran Singh Maan --- staging/src/k8s.io/client-go/dynamic/fake/simple.go | 3 +++ staging/src/k8s.io/client-go/dynamic/fake/simple_test.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple.go b/staging/src/k8s.io/client-go/dynamic/fake/simple.go index 02a797ad336..ee44c129f95 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple.go @@ -387,7 +387,10 @@ func (c *dynamicResourceClient) List(ctx context.Context, opts metav1.ListOption } list := &unstructured.UnstructuredList{} + list.SetRemainingItemCount(entireList.GetRemainingItemCount()) + list.SetSelfLink(entireList.GetSelfLink()) list.SetResourceVersion(entireList.GetResourceVersion()) + list.SetContinue(entireList.GetContinue()) list.GetObjectKind().SetGroupVersionKind(listGVK) for i := range entireList.Items { item := &entireList.Items[i] diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go index bedacf94ac9..2bbf3221b42 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go @@ -178,7 +178,9 @@ func Test_ListKind(t *testing.T) { "apiVersion": "group/version", "kind": "TheKindList", "metadata": map[string]interface{}{ + "continue": "", "resourceVersion": "", + "selfLink": "", }, }, Items: []unstructured.Unstructured{ From c8714ebd118760f8d68e9b536d0350129af12d9b Mon Sep 17 00:00:00 2001 From: Harsimran Singh Maan Date: Tue, 22 Feb 2022 16:05:40 -0800 Subject: [PATCH 2/3] fix failing test assertions --- staging/src/k8s.io/client-go/dynamic/fake/simple_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go index 2bbf3221b42..567951a580d 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go @@ -335,6 +335,8 @@ func TestListWithUnstructuredObjectsAndTypedScheme(t *testing.T) { expectedList := &unstructured.UnstructuredList{} expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version + expectedList.SetContinue("") + expectedList.SetSelfLink("") expectedList.Items = append(expectedList.Items, u) if diff := cmp.Diff(expectedList, list); diff != "" { @@ -363,6 +365,8 @@ func TestListWithNoFixturesAndTypedScheme(t *testing.T) { expectedList := &unstructured.UnstructuredList{} expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version + expectedList.SetContinue("") + expectedList.SetSelfLink("") if diff := cmp.Diff(expectedList, list); diff != "" { t.Fatal("unexpected diff (-want, +got): ", diff) @@ -395,6 +399,8 @@ func TestListWithNoScheme(t *testing.T) { expectedList := &unstructured.UnstructuredList{} expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version + expectedList.SetContinue("") + expectedList.SetSelfLink("") expectedList.Items = append(expectedList.Items, u) if diff := cmp.Diff(expectedList, list); diff != "" { @@ -437,6 +443,8 @@ func TestListWithTypedFixtures(t *testing.T) { expectedList := &unstructured.UnstructuredList{} expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version + expectedList.SetContinue("") + expectedList.SetSelfLink("") expectedList.Items = []unstructured.Unstructured{u} if diff := cmp.Diff(expectedList, list); diff != "" { From 5da368d012f7635f9718876061bec864b7dcf8e6 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Maan Date: Mon, 17 Oct 2022 09:19:21 -0700 Subject: [PATCH 3/3] remove selflink as per review feedback --- staging/src/k8s.io/client-go/dynamic/fake/simple.go | 1 - staging/src/k8s.io/client-go/dynamic/fake/simple_test.go | 5 ----- 2 files changed, 6 deletions(-) diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple.go b/staging/src/k8s.io/client-go/dynamic/fake/simple.go index ee44c129f95..5d0a6f69f2a 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple.go @@ -388,7 +388,6 @@ func (c *dynamicResourceClient) List(ctx context.Context, opts metav1.ListOption list := &unstructured.UnstructuredList{} list.SetRemainingItemCount(entireList.GetRemainingItemCount()) - list.SetSelfLink(entireList.GetSelfLink()) list.SetResourceVersion(entireList.GetResourceVersion()) list.SetContinue(entireList.GetContinue()) list.GetObjectKind().SetGroupVersionKind(listGVK) diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go index 567951a580d..e74b6ff0414 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go @@ -180,7 +180,6 @@ func Test_ListKind(t *testing.T) { "metadata": map[string]interface{}{ "continue": "", "resourceVersion": "", - "selfLink": "", }, }, Items: []unstructured.Unstructured{ @@ -336,7 +335,6 @@ func TestListWithUnstructuredObjectsAndTypedScheme(t *testing.T) { expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version expectedList.SetContinue("") - expectedList.SetSelfLink("") expectedList.Items = append(expectedList.Items, u) if diff := cmp.Diff(expectedList, list); diff != "" { @@ -366,7 +364,6 @@ func TestListWithNoFixturesAndTypedScheme(t *testing.T) { expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version expectedList.SetContinue("") - expectedList.SetSelfLink("") if diff := cmp.Diff(expectedList, list); diff != "" { t.Fatal("unexpected diff (-want, +got): ", diff) @@ -400,7 +397,6 @@ func TestListWithNoScheme(t *testing.T) { expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version expectedList.SetContinue("") - expectedList.SetSelfLink("") expectedList.Items = append(expectedList.Items, u) if diff := cmp.Diff(expectedList, list); diff != "" { @@ -444,7 +440,6 @@ func TestListWithTypedFixtures(t *testing.T) { expectedList.SetGroupVersionKind(listGVK) expectedList.SetResourceVersion("") // by product of the fake setting resource version expectedList.SetContinue("") - expectedList.SetSelfLink("") expectedList.Items = []unstructured.Unstructured{u} if diff := cmp.Diff(expectedList, list); diff != "" {