From 361ad9634c54b328d7e7a127bd369fc7129381de Mon Sep 17 00:00:00 2001
From: Craig Newton <newtondev@gmail.com>
Date: Tue, 26 Mar 2024 11:02:39 +0100
Subject: [PATCH] fix(fix-deps): added error checking; fixed deprecation in
 .golangci.yml

Signed-off-by: Craig Newton <newtondev@gmail.com>
---
 .golangci.yaml                             |  6 +++---
 pkg/controller/common/customize/manager.go |  6 +++++-
 pkg/controller/composite/controller.go     | 15 ++++++++++++---
 pkg/controller/decorator/controller.go     | 15 ++++++++++++---
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index 61010bc57f..a5b727a91b 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,8 +1,8 @@
-run:
-  skip-dirs:
+issues:
+  exclude-dirs:
     - pkg/client/generated
     - examples
 
 linters-settings:
   exhaustive:
-    default-signifies-exhaustive: true
\ No newline at end of file
+    default-signifies-exhaustive: true
diff --git a/pkg/controller/common/customize/manager.go b/pkg/controller/common/customize/manager.go
index 68e7dcfde5..b85c24b928 100644
--- a/pkg/controller/common/customize/manager.go
+++ b/pkg/controller/common/customize/manager.go
@@ -169,12 +169,16 @@ func (rm *Manager) getRelatedClient(apiVersion, resource string) (*dynamicclient
 			return nil, nil, fmt.Errorf("can't create informer for related resource: %w", err)
 		}
 
-		informer.Informer().AddEventHandler(clientgo_cache.ResourceEventHandlerFuncs{
+		_, err := informer.Informer().AddEventHandler(clientgo_cache.ResourceEventHandlerFuncs{
 			AddFunc:    rm.onRelatedAdd,
 			UpdateFunc: rm.onRelatedUpdate,
 			DeleteFunc: rm.onRelatedDelete,
 		})
 
+		if err != nil {
+			return nil, nil, fmt.Errorf("can't create informer for related resource: %w", err)
+		}
+
 		if !clientgo_cache.WaitForNamedCacheSync(rm.name, rm.stopCh, informer.Informer().HasSynced) {
 			rm.logger.Info("related Manager - cache sync never finished", "name", rm.name)
 		}
diff --git a/pkg/controller/composite/controller.go b/pkg/controller/composite/controller.go
index ae4fde56b6..e2ee82c542 100644
--- a/pkg/controller/composite/controller.go
+++ b/pkg/controller/composite/controller.go
@@ -232,16 +232,25 @@ func (pc *parentController) Start() {
 		if resyncPeriod < time.Second {
 			resyncPeriod = time.Second
 		}
-		pc.parentInformer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
+		_, err := pc.parentInformer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
+		if err != nil {
+			pc.logger.Error(err, "Unable to AddEventHandlerWithResyncPeriod Informer to Parent Informer", "controller", pc.cc.Name)
+		}
 	} else {
-		pc.parentInformer.Informer().AddEventHandler(parentHandlers)
+		_, err := pc.parentInformer.Informer().AddEventHandler(parentHandlers)
+		if err != nil {
+			pc.logger.Error(err, "Unable to AddEventHandler Informer to Parent Informer", "controller", pc.cc.Name)
+		}
 	}
 	for _, childInformer := range pc.childInformers {
-		childInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		_, err := childInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 			AddFunc:    pc.onChildAdd,
 			UpdateFunc: pc.onChildUpdate,
 			DeleteFunc: pc.onChildDelete,
 		})
+		if err != nil {
+			pc.logger.Error(err, "Unable to AddEventHandler Informer to Child Informer", "controller", pc.cc.Name)
+		}
 	}
 
 	go func() {
diff --git a/pkg/controller/decorator/controller.go b/pkg/controller/decorator/controller.go
index 4eb9fe483c..902ce86f50 100644
--- a/pkg/controller/decorator/controller.go
+++ b/pkg/controller/decorator/controller.go
@@ -223,17 +223,26 @@ func (c *decoratorController) Start() {
 	}
 	for _, informer := range c.parentInformers {
 		if resyncPeriod != 0 {
-			informer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
+			_, err := informer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
+			if err != nil {
+				c.logger.Error(err, "Unable to AddEventHandlerWithResyncPeriod Parent Informer to Informer", "controller", c.dc.Name)
+			}
 		} else {
-			informer.Informer().AddEventHandler(parentHandlers)
+			_, err := informer.Informer().AddEventHandler(parentHandlers)
+			if err != nil {
+				c.logger.Error(err, "Unable to AddEventHandler Parent Informer to Informer", "controller", c.dc.Name)
+			}
 		}
 	}
 	for _, informer := range c.childInformers {
-		informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		_, err := informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 			AddFunc:    c.onChildAdd,
 			UpdateFunc: c.onChildUpdate,
 			DeleteFunc: c.onChildDelete,
 		})
+		if err != nil {
+			c.logger.Error(err, "Unable to AddEventHandler Child Informer to Informer", "controller", c.dc.Name)
+		}
 	}
 
 	go func() {