From 4bb90a6fbfa33c336571f0e64d97f0f61a49fa96 Mon Sep 17 00:00:00 2001 From: Raul Cabello Martin Date: Thu, 20 Apr 2023 16:36:54 +0200 Subject: [PATCH] Improve comments and style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Corentin Néau --- modules/agent/pkg/deployer/monitor.go | 9 +++++---- modules/agent/pkg/deployer/monitor_test.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/agent/pkg/deployer/monitor.go b/modules/agent/pkg/deployer/monitor.go index 520be8a101..1914c0df5c 100644 --- a/modules/agent/pkg/deployer/monitor.go +++ b/modules/agent/pkg/deployer/monitor.go @@ -277,9 +277,8 @@ func nonReady(plan apply.Plan, ignoreOptions fleet.IgnoreOptions) (result []flee } if u, ok := obj.(*unstructured.Unstructured); ok { if ignoreOptions.Conditions != nil { - err := excludeIgnoredConditions(u, ignoreOptions) - if err != nil { - logrus.Errorf("failed to ignore conditions: %v", err) + if err := excludeIgnoredConditions(u, ignoreOptions); err != nil { + logrus.Errorf("failed to ignore conditions: %w", err) } } @@ -300,7 +299,7 @@ func nonReady(plan apply.Plan, ignoreOptions fleet.IgnoreOptions) (result []flee return result } -// excludeIgnoredConditions remove the conditions that are included in ignoreOptions from the object passed as a parameter +// excludeIgnoredConditions removes the conditions that are included in ignoreOptions from the object passed as a parameter func excludeIgnoredConditions(obj *unstructured.Unstructured, ignoreOptions fleet.IgnoreOptions) error { conditions, _, err := unstructured.NestedSlice(obj.Object, "status", "conditions") if err != nil { @@ -338,10 +337,12 @@ func shouldExcludeCondition(conditions map[string]interface{}, ignoredConditions if len(ignoredConditions) > len(conditions) { return false } + for k, v := range ignoredConditions { if vc, found := conditions[k]; !found || vc != v { return false } } + return true } diff --git a/modules/agent/pkg/deployer/monitor_test.go b/modules/agent/pkg/deployer/monitor_test.go index 3e353acec0..45f373dbb4 100644 --- a/modules/agent/pkg/deployer/monitor_test.go +++ b/modules/agent/pkg/deployer/monitor_test.go @@ -23,7 +23,7 @@ func TestExcludeIgnoredConditions(t *testing.T) { }} uPodInitialized, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&podInitialized) if err != nil { - t.Errorf("can't convert podInitializedAndNotReady to unstructured: %v", err) + t.Errorf("can't convert podInitialized to unstructured: %v", err) } tests := map[string]struct { obj *unstructured.Unstructured