controllers: replace `logr.NewContext` shims

Signed-off-by: Hidde Beydals <hello@hidde.co>

controllers/bucket_controller_test.go

@@ -32,7 +32,8 @@ import (
 	"time"
 
 	"github.com/darkowlzz/controller-check/status"
-	"github.com/go-logr/logr"
+	"github.com/fluxcd/pkg/apis/meta"
+	"github.com/fluxcd/pkg/runtime/conditions"
 	. "github.com/onsi/gomega"
 	raw "google.golang.org/api/storage/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -41,10 +42,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/pkg/runtime/conditions"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 	sreconcile "github.com/fluxcd/source-controller/internal/reconcile"
@@ -959,9 +956,7 @@ func TestBucketReconciler_reconcileArtifact(t *testing.T) {
 				tt.beforeFunc(g, obj, artifact, tmpDir)
 			}
 
-			dlog := log.NewDelegatingLogSink(log.NullLogSink{})
+			got, err := r.reconcileArtifact(context.TODO(), obj, &artifact, tmpDir)
-			nullLogger := logr.New(dlog)
-			got, err := r.reconcileArtifact(logr.NewContext(ctx, nullLogger), obj, &artifact, tmpDir)
 			g.Expect(err != nil).To(Equal(tt.wantErr))
 			g.Expect(got).To(Equal(tt.want))
 

controllers/gitrepository_controller_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package controllers
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"os"
@@ -26,13 +27,17 @@ import (
 	"time"
 
 	"github.com/darkowlzz/controller-check/status"
+	"github.com/fluxcd/pkg/apis/meta"
+	"github.com/fluxcd/pkg/gittestserver"
+	"github.com/fluxcd/pkg/runtime/conditions"
+	"github.com/fluxcd/pkg/ssh"
+	"github.com/fluxcd/pkg/testserver"
 	"github.com/go-git/go-billy/v5/memfs"
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/storage/memory"
-	"github.com/go-logr/logr"
 	. "github.com/onsi/gomega"
 	sshtestdata "golang.org/x/crypto/ssh/testdata"
 	corev1 "k8s.io/api/core/v1"
@@ -45,13 +50,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/pkg/gittestserver"
-	"github.com/fluxcd/pkg/runtime/conditions"
-	"github.com/fluxcd/pkg/ssh"
-	"github.com/fluxcd/pkg/testserver"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 	sreconcile "github.com/fluxcd/source-controller/internal/reconcile"
@@ -499,9 +497,8 @@ func TestGitRepositoryReconciler_reconcileSource_authStrategy(t *testing.T) {
 
 					var artifact sourcev1.Artifact
 					var includes artifactSet
-					dlog := log.NewDelegatingLogSink(log.NullLogSink{})
+
-					nullLogger := logr.New(dlog)
+					got, err := r.reconcileSource(context.TODO(), obj, &artifact, &includes, tmpDir)
-					got, err := r.reconcileSource(logr.NewContext(ctx, nullLogger), obj, &artifact, &includes, tmpDir)
 					g.Expect(obj.Status.Conditions).To(conditions.MatchConditions(tt.assertConditions))
 					g.Expect(err != nil).To(Equal(tt.wantErr))
 					g.Expect(got).To(Equal(tt.want))
@@ -1209,9 +1206,7 @@ func TestGitRepositoryReconciler_verifyCommitSignature(t *testing.T) {
 				tt.beforeFunc(obj)
 			}
 
-			dlog := log.NewDelegatingLogSink(log.NullLogSink{})
+			got, err := r.verifyCommitSignature(context.TODO(), obj, tt.commit)
-			nullLogger := logr.New(dlog)
-			got, err := r.verifyCommitSignature(logr.NewContext(ctx, nullLogger), obj, tt.commit)
 			g.Expect(obj.Status.Conditions).To(conditions.MatchConditions(tt.assertConditions))
 			g.Expect(err != nil).To(Equal(tt.wantErr))
 			g.Expect(got).To(Equal(tt.want))
@@ -1335,9 +1330,7 @@ func TestGitRepositoryReconciler_ConditionsUpdate(t *testing.T) {
 			}
 
 			key := client.ObjectKeyFromObject(obj)
-			dlog := log.NewDelegatingLogSink(log.NullLogSink{})
+			res, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key})
-			nullLogger := logr.New(dlog)
-			res, err := r.Reconcile(logr.NewContext(ctx, nullLogger), ctrl.Request{NamespacedName: key})
 			g.Expect(err != nil).To(Equal(tt.wantErr))
 			g.Expect(res).To(Equal(tt.want))
 

controllers/helmrepository_controller_test.go

@@ -27,7 +27,10 @@ import (
 	"time"
 
 	"github.com/darkowlzz/controller-check/status"
-	"github.com/go-logr/logr"
+	"github.com/fluxcd/pkg/apis/meta"
+	"github.com/fluxcd/pkg/helmtestserver"
+	"github.com/fluxcd/pkg/runtime/conditions"
+	"github.com/fluxcd/pkg/runtime/patch"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -35,12 +38,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/pkg/helmtestserver"
-	"github.com/fluxcd/pkg/runtime/conditions"
-	"github.com/fluxcd/pkg/runtime/patch"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 	serror "github.com/fluxcd/source-controller/internal/error"
@@ -596,9 +593,8 @@ func TestHelmRepositoryReconciler_reconcileArtifact(t *testing.T) {
 			if tt.beforeFunc != nil {
 				tt.beforeFunc(g, obj, artifact, chartRepo)
 			}
-			dlog := log.NewDelegatingLogSink(log.NullLogSink{})
+
-			nullLogger := logr.New(dlog)
+			got, err := r.reconcileArtifact(context.TODO(), obj, &artifact, chartRepo)
-			got, err := r.reconcileArtifact(logr.NewContext(ctx, nullLogger), obj, &artifact, chartRepo)
 			g.Expect(err != nil).To(Equal(tt.wantErr))
 			g.Expect(got).To(Equal(tt.want))