From 54ca1eb7f632f66f1890e0ead71f0f1e515ea802 Mon Sep 17 00:00:00 2001 From: KevFan Date: Wed, 25 Sep 2024 13:19:06 +0100 Subject: [PATCH] refactor: policy machinery v0.2.0 Signed-off-by: KevFan --- controllers/state_of_the_world.go | 13 ++++++++++--- go.mod | 4 ++-- go.sum | 4 ++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/controllers/state_of_the_world.go b/controllers/state_of_the_world.go index 563db511d..94013a117 100644 --- a/controllers/state_of_the_world.go +++ b/controllers/state_of_the_world.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "strings" + "sync" "github.com/go-logr/logr" "github.com/google/go-cmp/cmp" @@ -84,7 +85,7 @@ func NewTopologyFileReconciler(client *dynamic.DynamicClient, namespace string) return &TopologyFileReconciler{Client: client, Namespace: namespace} } -func (r *TopologyFileReconciler) Reconcile(ctx context.Context, _ []controller.ResourceEvent, topology *machinery.Topology, _ error) { +func (r *TopologyFileReconciler) Reconcile(ctx context.Context, _ []controller.ResourceEvent, topology *machinery.Topology, _ error, _ *sync.Map) error { logger := controller.LoggerFromContext(ctx).WithName("topology file") cm := &corev1.ConfigMap{ @@ -100,6 +101,7 @@ func (r *TopologyFileReconciler) Reconcile(ctx context.Context, _ []controller.R unstructuredCM, err := controller.Destruct(cm) if err != nil { logger.Error(err, "failed to destruct topology configmap") + return err } existingTopologyConfigMaps := topology.Objects().Items(func(object machinery.Object) bool { @@ -111,7 +113,7 @@ func (r *TopologyFileReconciler) Reconcile(ctx context.Context, _ []controller.R if err != nil { logger.Error(err, "failed to write topology configmap") } - return + return err } if len(existingTopologyConfigMaps) > 1 { @@ -125,7 +127,10 @@ func (r *TopologyFileReconciler) Reconcile(ctx context.Context, _ []controller.R if err != nil { logger.Error(err, "failed to update topology configmap") } + return err } + + return nil } type EventLogger struct{} @@ -134,7 +139,7 @@ func NewEventLogger() *EventLogger { return &EventLogger{} } -func (e *EventLogger) Log(ctx context.Context, resourceEvents []controller.ResourceEvent, _ *machinery.Topology, err error) { +func (e *EventLogger) Log(ctx context.Context, resourceEvents []controller.ResourceEvent, _ *machinery.Topology, err error, _ *sync.Map) error { logger := controller.LoggerFromContext(ctx).WithName("event logger") for _, event := range resourceEvents { // log the event @@ -156,4 +161,6 @@ func (e *EventLogger) Log(ctx context.Context, resourceEvents []controller.Resou logger.Error(err, "error passed to reconcile") } } + + return nil } diff --git a/go.mod b/go.mod index 09d5c0fac..41a95aef0 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/kuadrant/authorino-operator v0.11.1 github.com/kuadrant/dns-operator v0.0.0-20240809151102-e79ebbca8f70 github.com/kuadrant/limitador-operator v0.9.0 - github.com/kuadrant/policy-machinery v0.1.1 + github.com/kuadrant/policy-machinery v0.2.0 github.com/martinlindhe/base36 v1.1.1 github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.1 @@ -157,7 +157,7 @@ require ( golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.7.0 // indirect + golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/go.sum b/go.sum index df6e89a15..9308c8244 100644 --- a/go.sum +++ b/go.sum @@ -253,6 +253,8 @@ github.com/kuadrant/limitador-operator v0.9.0 h1:hTQ6CFPayf/sL7cIzwWjCoU8uTn6fzW github.com/kuadrant/limitador-operator v0.9.0/go.mod h1:DQOlg9qFOcnWPrwO529JRCMLLOEXJQxkmOes952S/Hw= github.com/kuadrant/policy-machinery v0.1.1 h1:8NPwL5U79Y+amCpJpyAJBUqWfntfDrce0JK31ueRMns= github.com/kuadrant/policy-machinery v0.1.1/go.mod h1:fbBqBlh7iyFdU6dRCzaPadypaI/BSHWKiUVl5kesrYY= +github.com/kuadrant/policy-machinery v0.2.0 h1:6kACb+bdEwHXz2tvTs6dlLgvxFgFrowvGTZKMI9p0Qo= +github.com/kuadrant/policy-machinery v0.2.0/go.mod h1:ZV4xS0CCxPgu/Xg6gz+YUaS9zqEXKOiAj33bZ67B6Lo= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= @@ -526,6 +528,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=