🐛 Fix builders WithLogger method (#1166)

* Fix builders WithLogger method

Signed-off-by: Fabian Ruff <[email protected]>

* Add a test for WithLogger

Signed-off-by: Fabian Ruff <[email protected]>

Author: databus23

pkg/builder/controller.go

@@ -47,7 +47,6 @@ type Builder struct {
 	config           *rest.Config
 	ctrl             controller.Controller
 	ctrlOptions      controller.Options
-	log              logr.Logger
 	name             string
 }
 
@@ -132,7 +131,7 @@ func (blder *Builder) WithOptions(options controller.Options) *Builder {
 
 // WithLogger overrides the controller options's logger used.
 func (blder *Builder) WithLogger(log logr.Logger) *Builder {
-	blder.log = log
+	blder.ctrlOptions.Log = log
 	return blder
 }
 

pkg/builder/controller_test.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 	"sync/atomic"
 
+	"github.com/go-logr/logr"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -48,6 +49,17 @@ func (typedNoop) Reconcile(context.Context, reconcile.Request) (reconcile.Result
 	return reconcile.Result{}, nil
 }
 
+type testLogger struct {
+	logr.Logger
+}
+
+func (l *testLogger) WithName(_ string) logr.Logger {
+	return l
+}
+func (l *testLogger) WithValues(_ ...interface{}) logr.Logger {
+	return l
+}
+
 var _ = Describe("application", func() {
 	var stop chan struct{}
 
@@ -160,6 +172,29 @@ var _ = Describe("application", func() {
 			Expect(instance).NotTo(BeNil())
 		})
 
+		It("should override logger during creation of controller", func() {
+
+			logger := &testLogger{}
+			newController = func(name string, mgr manager.Manager, options controller.Options) (controller.Controller, error) {
+				if options.Log == logger {
+					return controller.New(name, mgr, options)
+				}
+				return nil, fmt.Errorf("logger expected %T but found %T", logger, options.Log)
+			}
+
+			By("creating a controller manager")
+			m, err := manager.New(cfg, manager.Options{})
+			Expect(err).NotTo(HaveOccurred())
+
+			instance, err := ControllerManagedBy(m).
+				For(&appsv1.ReplicaSet{}).
+				Owns(&appsv1.ReplicaSet{}).
+				WithLogger(logger).
+				Build(noop)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(instance).NotTo(BeNil())
+		})
+
 		It("should prefer reconciler from options during creation of controller", func() {
 			newController = func(name string, mgr manager.Manager, options controller.Options) (controller.Controller, error) {
 				if options.Reconciler != (typedNoop{}) {