From e1cedcbd843c6283ce3920956c3198dcd82dfd15 Mon Sep 17 00:00:00 2001 From: Saloni Date: Wed, 11 Sep 2024 15:06:05 -0600 Subject: [PATCH 1/4] add status to snippetFilters --- internal/mode/static/handler.go | 8 +- .../static/state/conditions/conditions.go | 11 ++ .../mode/static/status/prepare_requests.go | 29 +++++ .../static/status/prepare_requests_test.go | 120 ++++++++++++++++++ internal/mode/static/status/status_setters.go | 13 ++ .../mode/static/status/status_setters_test.go | 59 +++++++++ 6 files changed, 239 insertions(+), 1 deletion(-) diff --git a/internal/mode/static/handler.go b/internal/mode/static/handler.go index cf4410f013..1cf967d4c8 100644 --- a/internal/mode/static/handler.go +++ b/internal/mode/static/handler.go @@ -255,12 +255,18 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, logger logr.Logge polReqs := status.PrepareBackendTLSPolicyRequests(graph.BackendTLSPolicies, transitionTime, h.cfg.gatewayCtlrName) ngfPolReqs := status.PrepareNGFPolicyRequests(graph.NGFPolicies, transitionTime, h.cfg.gatewayCtlrName) + snippetFilterReqs := status.PrepareSnippetFilterRequests(graph.SnippetsFilters, transitionTime) - reqs := make([]frameworkStatus.UpdateRequest, 0, len(gcReqs)+len(routeReqs)+len(polReqs)+len(ngfPolReqs)) + reqs := make( + []frameworkStatus.UpdateRequest, + 0, + len(gcReqs)+len(routeReqs)+len(polReqs)+len(ngfPolReqs)+len(snippetFilterReqs), + ) reqs = append(reqs, gcReqs...) reqs = append(reqs, routeReqs...) reqs = append(reqs, polReqs...) reqs = append(reqs, ngfPolReqs...) + reqs = append(reqs, snippetFilterReqs...) h.cfg.statusUpdater.UpdateGroup(ctx, groupAllExceptGateways, reqs...) diff --git a/internal/mode/static/state/conditions/conditions.go b/internal/mode/static/state/conditions/conditions.go index 21f3007264..72325ad2b1 100644 --- a/internal/mode/static/state/conditions/conditions.go +++ b/internal/mode/static/state/conditions/conditions.go @@ -744,3 +744,14 @@ func NewSnippetsFilterInvalid(msg string) conditions.Condition { Message: msg, } } + +// NewSnippetFilterAccepted returns a Condition that indicates that the SnippetsFilter is accepted because it is +// valid. +func NewSnippetFilterAccepted() conditions.Condition { + return conditions.Condition{ + Type: string(ngfAPI.SnippetsFilterConditionTypeAccepted), + Status: metav1.ConditionTrue, + Reason: string(ngfAPI.SnippetsFilterConditionReasonAccepted), + Message: "The snippetFilter is accepted", + } +} diff --git a/internal/mode/static/status/prepare_requests.go b/internal/mode/static/status/prepare_requests.go index b7b13b4261..b50df57743 100644 --- a/internal/mode/static/status/prepare_requests.go +++ b/internal/mode/static/status/prepare_requests.go @@ -406,6 +406,35 @@ func PrepareBackendTLSPolicyRequests( return reqs } +// PrepareSnippetFilterRequests prepares status UpdateRequests for the given SnippetsFilters. +func PrepareSnippetFilterRequests( + snippetFilters map[types.NamespacedName]*graph.SnippetsFilter, + transitionTime metav1.Time, +) []frameworkStatus.UpdateRequest { + reqs := make([]frameworkStatus.UpdateRequest, 0, len(snippetFilters)) + + for nsname, snippetFilter := range snippetFilters { + allConds := make([]conditions.Condition, 0, len(snippetFilter.Conditions)+1) + + allConds = append(allConds, staticConds.NewSnippetFilterAccepted()) + allConds = append(allConds, snippetFilter.Conditions...) + + conds := conditions.DeduplicateConditions(allConds) + apiConds := conditions.ConvertConditions(conds, snippetFilter.Source.GetGeneration(), transitionTime) + status := ngfAPI.SnippetsFilterStatus{ + Conditions: apiConds, + } + + reqs = append(reqs, frameworkStatus.UpdateRequest{ + NsName: nsname, + ResourceType: snippetFilter.Source, + Setter: newSnippetsFilterStatusSetter(status), + }) + } + + return reqs +} + // ControlPlaneUpdateResult describes the result of a control plane update. type ControlPlaneUpdateResult struct { // Error is the error that occurred during the update. diff --git a/internal/mode/static/status/prepare_requests_test.go b/internal/mode/static/status/prepare_requests_test.go index 3e98e777c1..43934f47c3 100644 --- a/internal/mode/static/status/prepare_requests_test.go +++ b/internal/mode/static/status/prepare_requests_test.go @@ -1768,3 +1768,123 @@ func TestBuildNGFPolicyStatuses(t *testing.T) { }) } } + +func TestBuildSnippetFilterStatuses(t *testing.T) { + transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now()) + + validSnippet := &graph.SnippetsFilter{ + Source: &ngfAPI.SnippetsFilter{ + ObjectMeta: metav1.ObjectMeta{ + Name: "valid-snippet", + Namespace: "test", + Generation: 1, + }, + Spec: ngfAPI.SnippetsFilterSpec{ + Snippets: []ngfAPI.Snippet{ + { + Context: ngfAPI.NginxContextHTTP, + Value: "proxy_buffer on;", + }, + }, + }, + }, + Conditions: []conditions.Condition{staticConds.NewSnippetFilterAccepted()}, + Valid: true, + } + + invalidSnippet := &graph.SnippetsFilter{ + Source: &ngfAPI.SnippetsFilter{ + ObjectMeta: metav1.ObjectMeta{ + Name: "invalid-snippet", + Namespace: "test", + Generation: 1, + }, + }, + Conditions: []conditions.Condition{staticConds.NewSnippetsFilterInvalid("invalid snippet filter")}, + Valid: false, + } + + tests := []struct { + snippetsFilters map[types.NamespacedName]*graph.SnippetsFilter + expected map[types.NamespacedName]ngfAPI.SnippetsFilterStatus + name string + expectedReqs int + }{ + { + name: "nil snippetsFilters", + expectedReqs: 0, + expected: map[types.NamespacedName]ngfAPI.SnippetsFilterStatus{}, + }, + { + name: "valid snippet", + snippetsFilters: map[types.NamespacedName]*graph.SnippetsFilter{ + {Namespace: "test", Name: "valid-snippet"}: validSnippet, + }, + expectedReqs: 1, + expected: map[types.NamespacedName]ngfAPI.SnippetsFilterStatus{ + {Namespace: "test", Name: "valid-snippet"}: { + Conditions: []metav1.Condition{ + { + Type: string(ngfAPI.SnippetsFilterConditionTypeAccepted), + Status: metav1.ConditionTrue, + ObservedGeneration: 1, + LastTransitionTime: transitionTime, + Reason: string(ngfAPI.SnippetsFilterConditionReasonAccepted), + Message: "The snippetFilter is accepted", + }, + }, + }, + }, + }, + { + name: "invalid snippet", + snippetsFilters: map[types.NamespacedName]*graph.SnippetsFilter{ + {Namespace: "test", Name: "invalid-snippet"}: invalidSnippet, + }, + expectedReqs: 1, + expected: map[types.NamespacedName]ngfAPI.SnippetsFilterStatus{ + {Namespace: "test", Name: "invalid-snippet"}: { + Conditions: []metav1.Condition{ + { + Type: string(ngfAPI.SnippetsFilterConditionTypeAccepted), + Status: metav1.ConditionFalse, + ObservedGeneration: 1, + LastTransitionTime: transitionTime, + Reason: string(ngfAPI.SnippetsFilterConditionReasonInvalid), + Message: "invalid snippet filter", + }, + }, + }, + }, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + g := NewWithT(t) + + k8sClient := createK8sClientFor(&ngfAPI.SnippetsFilter{}) + + for _, snippets := range test.snippetsFilters { + err := k8sClient.Create(context.Background(), snippets.Source) + g.Expect(err).ToNot(HaveOccurred()) + } + + updater := statusFramework.NewUpdater(k8sClient, zap.New()) + + reqs := PrepareSnippetFilterRequests(test.snippetsFilters, transitionTime) + + g.Expect(reqs).To(HaveLen(test.expectedReqs)) + + updater.Update(context.Background(), reqs...) + + for nsname, expected := range test.expected { + var snippets ngfAPI.SnippetsFilter + + err := k8sClient.Get(context.Background(), nsname, &snippets) + g.Expect(err).ToNot(HaveOccurred()) + g.Expect(helpers.Diff(expected, snippets.Status)).To(BeEmpty()) + } + }) + } +} diff --git a/internal/mode/static/status/status_setters.go b/internal/mode/static/status/status_setters.go index dc64490502..54bcdbbbf8 100644 --- a/internal/mode/static/status/status_setters.go +++ b/internal/mode/static/status/status_setters.go @@ -333,3 +333,16 @@ func ancestorStatusEqual(p1, p2 v1alpha2.PolicyAncestorStatus) bool { return frameworkStatus.ConditionsEqual(p1.Conditions, p2.Conditions) } + +func newSnippetsFilterStatusSetter(status ngfAPI.SnippetsFilterStatus) frameworkStatus.Setter { + return func(obj client.Object) (wasSet bool) { + sf := helpers.MustCastObject[*ngfAPI.SnippetsFilter](obj) + + if frameworkStatus.ConditionsEqual(sf.Status.Conditions, status.Conditions) { + return false + } + + sf.Status = status + return true + } +} diff --git a/internal/mode/static/status/status_setters_test.go b/internal/mode/static/status/status_setters_test.go index d91c610ff7..5927f8cde6 100644 --- a/internal/mode/static/status/status_setters_test.go +++ b/internal/mode/static/status/status_setters_test.go @@ -1563,3 +1563,62 @@ func TestPolicyStatusEqual(t *testing.T) { }) } } + +func TestNewSnippetFilterStatusSetter(t *testing.T) { + tests := []struct { + name string + status, expStatus, newStatus ngfAPI.SnippetsFilterStatus + expStatusSet bool + }{ + { + name: "SnippetFilter has no status", + newStatus: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "new condition"}}, + }, + expStatusSet: true, + expStatus: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "new condition"}}, + }, + }, + { + name: "SnippetFilter has old status", + status: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "old condition"}}, + }, + newStatus: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "new condition"}}, + }, + expStatusSet: true, + expStatus: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "new condition"}}, + }, + }, + { + name: "SnippetFilter has same status", + status: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "same condition"}}, + }, + newStatus: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "same condition"}}, + }, + expStatusSet: false, + expStatus: ngfAPI.SnippetsFilterStatus{ + Conditions: []metav1.Condition{{Message: "same condition"}}, + }, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + g := NewWithT(t) + + setter := newSnippetsFilterStatusSetter(test.newStatus) + obj := &ngfAPI.SnippetsFilter{Status: test.status} + + statusSet := setter(obj) + + g.Expect(statusSet).To(Equal(test.expStatusSet)) + g.Expect(obj.Status).To(Equal(test.expStatus)) + }) + } +} From b37f71a33b517286a7c6a629ac7a04f5d2c7272b Mon Sep 17 00:00:00 2001 From: Saloni Date: Thu, 12 Sep 2024 10:26:13 -0600 Subject: [PATCH 2/4] update based on reviews --- internal/mode/static/handler.go | 2 +- internal/mode/static/state/conditions/conditions.go | 2 +- internal/mode/static/status/prepare_requests.go | 13 ++++++++----- .../mode/static/status/prepare_requests_test.go | 11 +++++------ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/internal/mode/static/handler.go b/internal/mode/static/handler.go index 1cf967d4c8..fcc28931b9 100644 --- a/internal/mode/static/handler.go +++ b/internal/mode/static/handler.go @@ -255,7 +255,7 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, logger logr.Logge polReqs := status.PrepareBackendTLSPolicyRequests(graph.BackendTLSPolicies, transitionTime, h.cfg.gatewayCtlrName) ngfPolReqs := status.PrepareNGFPolicyRequests(graph.NGFPolicies, transitionTime, h.cfg.gatewayCtlrName) - snippetFilterReqs := status.PrepareSnippetFilterRequests(graph.SnippetsFilters, transitionTime) + snippetFilterReqs := status.PrepareSnippetsFilterRequests(graph.SnippetsFilters, transitionTime) reqs := make( []frameworkStatus.UpdateRequest, diff --git a/internal/mode/static/state/conditions/conditions.go b/internal/mode/static/state/conditions/conditions.go index 72325ad2b1..049b7a6cf3 100644 --- a/internal/mode/static/state/conditions/conditions.go +++ b/internal/mode/static/state/conditions/conditions.go @@ -752,6 +752,6 @@ func NewSnippetFilterAccepted() conditions.Condition { Type: string(ngfAPI.SnippetsFilterConditionTypeAccepted), Status: metav1.ConditionTrue, Reason: string(ngfAPI.SnippetsFilterConditionReasonAccepted), - Message: "The snippetFilter is accepted", + Message: "SnippetsFilter is accepted", } } diff --git a/internal/mode/static/status/prepare_requests.go b/internal/mode/static/status/prepare_requests.go index b50df57743..3f5694ec07 100644 --- a/internal/mode/static/status/prepare_requests.go +++ b/internal/mode/static/status/prepare_requests.go @@ -406,16 +406,19 @@ func PrepareBackendTLSPolicyRequests( return reqs } -// PrepareSnippetFilterRequests prepares status UpdateRequests for the given SnippetsFilters. -func PrepareSnippetFilterRequests( - snippetFilters map[types.NamespacedName]*graph.SnippetsFilter, +// PrepareSnippetsFilterRequests prepares status UpdateRequests for the given SnippetsFilters. +func PrepareSnippetsFilterRequests( + snippetsFilter map[types.NamespacedName]*graph.SnippetsFilter, transitionTime metav1.Time, ) []frameworkStatus.UpdateRequest { - reqs := make([]frameworkStatus.UpdateRequest, 0, len(snippetFilters)) + reqs := make([]frameworkStatus.UpdateRequest, 0, len(snippetsFilter)) - for nsname, snippetFilter := range snippetFilters { + for nsname, snippetFilter := range snippetsFilter { allConds := make([]conditions.Condition, 0, len(snippetFilter.Conditions)+1) + // The order of conditions matters here. + // We add the default condition first, followed by the snippetsFilter conditions. + // DeduplicateConditions will ensure the last condition wins. allConds = append(allConds, staticConds.NewSnippetFilterAccepted()) allConds = append(allConds, snippetFilter.Conditions...) diff --git a/internal/mode/static/status/prepare_requests_test.go b/internal/mode/static/status/prepare_requests_test.go index 43934f47c3..7883b17632 100644 --- a/internal/mode/static/status/prepare_requests_test.go +++ b/internal/mode/static/status/prepare_requests_test.go @@ -1788,8 +1788,7 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { }, }, }, - Conditions: []conditions.Condition{staticConds.NewSnippetFilterAccepted()}, - Valid: true, + Valid: true, } invalidSnippet := &graph.SnippetsFilter{ @@ -1800,7 +1799,7 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { Generation: 1, }, }, - Conditions: []conditions.Condition{staticConds.NewSnippetsFilterInvalid("invalid snippet filter")}, + Conditions: []conditions.Condition{staticConds.NewSnippetsFilterInvalid("invalid snippetsFilter")}, Valid: false, } @@ -1830,7 +1829,7 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { ObservedGeneration: 1, LastTransitionTime: transitionTime, Reason: string(ngfAPI.SnippetsFilterConditionReasonAccepted), - Message: "The snippetFilter is accepted", + Message: "SnippetsFilter is accepted", }, }, }, @@ -1851,7 +1850,7 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { ObservedGeneration: 1, LastTransitionTime: transitionTime, Reason: string(ngfAPI.SnippetsFilterConditionReasonInvalid), - Message: "invalid snippet filter", + Message: "invalid snippetsFilter", }, }, }, @@ -1872,7 +1871,7 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { updater := statusFramework.NewUpdater(k8sClient, zap.New()) - reqs := PrepareSnippetFilterRequests(test.snippetsFilters, transitionTime) + reqs := PrepareSnippetsFilterRequests(test.snippetsFilters, transitionTime) g.Expect(reqs).To(HaveLen(test.expectedReqs)) From 693ba4814653330c1233363345f31f862b521e97 Mon Sep 17 00:00:00 2001 From: Saloni Date: Fri, 13 Sep 2024 10:11:08 -0600 Subject: [PATCH 3/4] rename variables --- internal/mode/static/handler.go | 6 +++--- .../mode/static/state/conditions/conditions.go | 4 ++-- internal/mode/static/status/prepare_requests.go | 16 ++++++++-------- .../mode/static/status/prepare_requests_test.go | 6 +++--- .../mode/static/status/status_setters_test.go | 14 +++++++------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/internal/mode/static/handler.go b/internal/mode/static/handler.go index fcc28931b9..3681083af1 100644 --- a/internal/mode/static/handler.go +++ b/internal/mode/static/handler.go @@ -255,18 +255,18 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, logger logr.Logge polReqs := status.PrepareBackendTLSPolicyRequests(graph.BackendTLSPolicies, transitionTime, h.cfg.gatewayCtlrName) ngfPolReqs := status.PrepareNGFPolicyRequests(graph.NGFPolicies, transitionTime, h.cfg.gatewayCtlrName) - snippetFilterReqs := status.PrepareSnippetsFilterRequests(graph.SnippetsFilters, transitionTime) + snippetsFilterReqs := status.PrepareSnippetsFilterRequests(graph.SnippetsFilters, transitionTime) reqs := make( []frameworkStatus.UpdateRequest, 0, - len(gcReqs)+len(routeReqs)+len(polReqs)+len(ngfPolReqs)+len(snippetFilterReqs), + len(gcReqs)+len(routeReqs)+len(polReqs)+len(ngfPolReqs)+len(snippetsFilterReqs), ) reqs = append(reqs, gcReqs...) reqs = append(reqs, routeReqs...) reqs = append(reqs, polReqs...) reqs = append(reqs, ngfPolReqs...) - reqs = append(reqs, snippetFilterReqs...) + reqs = append(reqs, snippetsFilterReqs...) h.cfg.statusUpdater.UpdateGroup(ctx, groupAllExceptGateways, reqs...) diff --git a/internal/mode/static/state/conditions/conditions.go b/internal/mode/static/state/conditions/conditions.go index 049b7a6cf3..0cb959db6a 100644 --- a/internal/mode/static/state/conditions/conditions.go +++ b/internal/mode/static/state/conditions/conditions.go @@ -745,9 +745,9 @@ func NewSnippetsFilterInvalid(msg string) conditions.Condition { } } -// NewSnippetFilterAccepted returns a Condition that indicates that the SnippetsFilter is accepted because it is +// NewSnippetsFilterAccepted returns a Condition that indicates that the SnippetsFilter is accepted because it is // valid. -func NewSnippetFilterAccepted() conditions.Condition { +func NewSnippetsFilterAccepted() conditions.Condition { return conditions.Condition{ Type: string(ngfAPI.SnippetsFilterConditionTypeAccepted), Status: metav1.ConditionTrue, diff --git a/internal/mode/static/status/prepare_requests.go b/internal/mode/static/status/prepare_requests.go index 3f5694ec07..82924dd21b 100644 --- a/internal/mode/static/status/prepare_requests.go +++ b/internal/mode/static/status/prepare_requests.go @@ -408,29 +408,29 @@ func PrepareBackendTLSPolicyRequests( // PrepareSnippetsFilterRequests prepares status UpdateRequests for the given SnippetsFilters. func PrepareSnippetsFilterRequests( - snippetsFilter map[types.NamespacedName]*graph.SnippetsFilter, + snippetsFilters map[types.NamespacedName]*graph.SnippetsFilter, transitionTime metav1.Time, ) []frameworkStatus.UpdateRequest { - reqs := make([]frameworkStatus.UpdateRequest, 0, len(snippetsFilter)) + reqs := make([]frameworkStatus.UpdateRequest, 0, len(snippetsFilters)) - for nsname, snippetFilter := range snippetsFilter { - allConds := make([]conditions.Condition, 0, len(snippetFilter.Conditions)+1) + for nsname, snippetsFilter := range snippetsFilters { + allConds := make([]conditions.Condition, 0, len(snippetsFilter.Conditions)+1) // The order of conditions matters here. // We add the default condition first, followed by the snippetsFilter conditions. // DeduplicateConditions will ensure the last condition wins. - allConds = append(allConds, staticConds.NewSnippetFilterAccepted()) - allConds = append(allConds, snippetFilter.Conditions...) + allConds = append(allConds, staticConds.NewSnippetsFilterAccepted()) + allConds = append(allConds, snippetsFilter.Conditions...) conds := conditions.DeduplicateConditions(allConds) - apiConds := conditions.ConvertConditions(conds, snippetFilter.Source.GetGeneration(), transitionTime) + apiConds := conditions.ConvertConditions(conds, snippetsFilter.Source.GetGeneration(), transitionTime) status := ngfAPI.SnippetsFilterStatus{ Conditions: apiConds, } reqs = append(reqs, frameworkStatus.UpdateRequest{ NsName: nsname, - ResourceType: snippetFilter.Source, + ResourceType: snippetsFilter.Source, Setter: newSnippetsFilterStatusSetter(status), }) } diff --git a/internal/mode/static/status/prepare_requests_test.go b/internal/mode/static/status/prepare_requests_test.go index 7883b17632..7dd4f71a50 100644 --- a/internal/mode/static/status/prepare_requests_test.go +++ b/internal/mode/static/status/prepare_requests_test.go @@ -1878,11 +1878,11 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { updater.Update(context.Background(), reqs...) for nsname, expected := range test.expected { - var snippets ngfAPI.SnippetsFilter + var snippetsFilter ngfAPI.SnippetsFilter - err := k8sClient.Get(context.Background(), nsname, &snippets) + err := k8sClient.Get(context.Background(), nsname, &snippetsFilter) g.Expect(err).ToNot(HaveOccurred()) - g.Expect(helpers.Diff(expected, snippets.Status)).To(BeEmpty()) + g.Expect(helpers.Diff(expected, snippetsFilter.Status)).To(BeEmpty()) } }) } diff --git a/internal/mode/static/status/status_setters_test.go b/internal/mode/static/status/status_setters_test.go index 5927f8cde6..5b6bbbf6a1 100644 --- a/internal/mode/static/status/status_setters_test.go +++ b/internal/mode/static/status/status_setters_test.go @@ -1564,14 +1564,14 @@ func TestPolicyStatusEqual(t *testing.T) { } } -func TestNewSnippetFilterStatusSetter(t *testing.T) { +func TestBuildSnippetsFilterStatuses(t *testing.T) { tests := []struct { name string status, expStatus, newStatus ngfAPI.SnippetsFilterStatus expStatusSet bool }{ { - name: "SnippetFilter has no status", + name: "SnippetsFilter has no status", newStatus: ngfAPI.SnippetsFilterStatus{ Conditions: []metav1.Condition{{Message: "new condition"}}, }, @@ -1581,7 +1581,7 @@ func TestNewSnippetFilterStatusSetter(t *testing.T) { }, }, { - name: "SnippetFilter has old status", + name: "SnippetsFilter has old status", status: ngfAPI.SnippetsFilterStatus{ Conditions: []metav1.Condition{{Message: "old condition"}}, }, @@ -1594,7 +1594,7 @@ func TestNewSnippetFilterStatusSetter(t *testing.T) { }, }, { - name: "SnippetFilter has same status", + name: "SnippetsFilter has same status", status: ngfAPI.SnippetsFilterStatus{ Conditions: []metav1.Condition{{Message: "same condition"}}, }, @@ -1613,12 +1613,12 @@ func TestNewSnippetFilterStatusSetter(t *testing.T) { g := NewWithT(t) setter := newSnippetsFilterStatusSetter(test.newStatus) - obj := &ngfAPI.SnippetsFilter{Status: test.status} + sf := &ngfAPI.SnippetsFilter{Status: test.status} - statusSet := setter(obj) + statusSet := setter(sf) g.Expect(statusSet).To(Equal(test.expStatusSet)) - g.Expect(obj.Status).To(Equal(test.expStatus)) + g.Expect(sf.Status).To(Equal(test.expStatus)) }) } } From 49ec411dcec8cebb09bc0dff2ee93406072e6e38 Mon Sep 17 00:00:00 2001 From: Saloni Date: Fri, 13 Sep 2024 10:12:12 -0600 Subject: [PATCH 4/4] rename variables --- .../mode/static/status/prepare_requests_test.go | 14 +++++++------- internal/mode/static/status/status_setters_test.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/mode/static/status/prepare_requests_test.go b/internal/mode/static/status/prepare_requests_test.go index 7dd4f71a50..5aafea0085 100644 --- a/internal/mode/static/status/prepare_requests_test.go +++ b/internal/mode/static/status/prepare_requests_test.go @@ -1769,10 +1769,10 @@ func TestBuildNGFPolicyStatuses(t *testing.T) { } } -func TestBuildSnippetFilterStatuses(t *testing.T) { +func TestBuildSnippetsFilterStatuses(t *testing.T) { transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now()) - validSnippet := &graph.SnippetsFilter{ + validSnippetsFilter := &graph.SnippetsFilter{ Source: &ngfAPI.SnippetsFilter{ ObjectMeta: metav1.ObjectMeta{ Name: "valid-snippet", @@ -1791,7 +1791,7 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { Valid: true, } - invalidSnippet := &graph.SnippetsFilter{ + invalidSnippetsFilter := &graph.SnippetsFilter{ Source: &ngfAPI.SnippetsFilter{ ObjectMeta: metav1.ObjectMeta{ Name: "invalid-snippet", @@ -1815,9 +1815,9 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { expected: map[types.NamespacedName]ngfAPI.SnippetsFilterStatus{}, }, { - name: "valid snippet", + name: "valid snippetsFilter", snippetsFilters: map[types.NamespacedName]*graph.SnippetsFilter{ - {Namespace: "test", Name: "valid-snippet"}: validSnippet, + {Namespace: "test", Name: "valid-snippet"}: validSnippetsFilter, }, expectedReqs: 1, expected: map[types.NamespacedName]ngfAPI.SnippetsFilterStatus{ @@ -1836,9 +1836,9 @@ func TestBuildSnippetFilterStatuses(t *testing.T) { }, }, { - name: "invalid snippet", + name: "invalid snippetsFilter", snippetsFilters: map[types.NamespacedName]*graph.SnippetsFilter{ - {Namespace: "test", Name: "invalid-snippet"}: invalidSnippet, + {Namespace: "test", Name: "invalid-snippet"}: invalidSnippetsFilter, }, expectedReqs: 1, expected: map[types.NamespacedName]ngfAPI.SnippetsFilterStatus{ diff --git a/internal/mode/static/status/status_setters_test.go b/internal/mode/static/status/status_setters_test.go index 5b6bbbf6a1..3673b71555 100644 --- a/internal/mode/static/status/status_setters_test.go +++ b/internal/mode/static/status/status_setters_test.go @@ -1564,7 +1564,7 @@ func TestPolicyStatusEqual(t *testing.T) { } } -func TestBuildSnippetsFilterStatuses(t *testing.T) { +func TestNewSnippetsFilterStatusSetter(t *testing.T) { tests := []struct { name string status, expStatus, newStatus ngfAPI.SnippetsFilterStatus