Skip to content

Commit 5a1e175

Browse files
mdboothmdbooth
committed
Remove logger from scope
Scope encapsulates an initialised OpenStack client which can be safely shared between reconciles which share the same credentials. The logger is initialised with context specific to an individual reconcile, so it cannot be shared between reconciles. To avoid code churn we preserve the previous interface of Scope with the creation of scope.WithLogger, which changes the initialisation to ensure that the returned logger always comes from the current reconcile even if the scope was cached. While touching logging in tests, we also take the opportunity to replace uses of logr.Discard with GinkgoLogr or logr/testr as appropriate, so test logs are now captured.
1 parent 05d4e9b commit 5a1e175

23 files changed

+143
-94
lines changed

‎controllers/openstackcluster_controller.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@ func (r *OpenStackClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
116116
}
117117
}()
118118

119-
scope, err := r.ScopeFactory.NewClientScopeFromCluster(ctx, r.Client, openStackCluster, r.CaCertificates, log)
119+
clientScope, err := r.ScopeFactory.NewClientScopeFromCluster(ctx, r.Client, openStackCluster, r.CaCertificates, log)
120120
if err != nil {
121121
return reconcile.Result{}, err
122122
}
123+
scope := scope.NewWithLogger(clientScope, log)
123124

124125
// Resolve and store referenced & dependent resources for the bastion
125126
if openStackCluster.Spec.Bastion != nil && openStackCluster.Spec.Bastion.Enabled {
@@ -154,7 +155,7 @@ func (r *OpenStackClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
154155
return reconcileNormal(scope, cluster, openStackCluster)
155156
}
156157

157-
func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
158+
func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
158159
scope.Logger().Info("Reconciling Cluster delete")
159160

160161
// Wait for machines to be deleted before removing the finalizer as they
@@ -232,7 +233,7 @@ func contains(arr []string, target string) bool {
232233
return false
233234
}
234235

235-
func deleteBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
236+
func deleteBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
236237
scope.Logger().Info("Deleting Bastion")
237238

238239
computeService, err := compute.NewService(scope)
@@ -313,7 +314,7 @@ func deleteBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackClust
313314
return nil
314315
}
315316

316-
func reconcileNormal(scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) { //nolint:unparam
317+
func reconcileNormal(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) { //nolint:unparam
317318
scope.Logger().Info("Reconciling Cluster")
318319

319320
// If the OpenStackCluster doesn't have our finalizer, add it.
@@ -364,7 +365,7 @@ func reconcileNormal(scope scope.Scope, cluster *clusterv1.Cluster, openStackClu
364365
return reconcile.Result{}, nil
365366
}
366367

367-
func reconcileBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
368+
func reconcileBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (ctrl.Result, error) {
368369
scope.Logger().Info("Reconciling Bastion")
369370

370371
if openStackCluster.Spec.Bastion == nil || !openStackCluster.Spec.Bastion.Enabled {
@@ -542,7 +543,7 @@ func getBastionSecurityGroups(openStackCluster *infrav1.OpenStackCluster) []infr
542543
return instanceSpecSecurityGroups
543544
}
544545

545-
func getOrCreateBastionPorts(scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, networkingService *networking.Service, clusterName string) error {
546+
func getOrCreateBastionPorts(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, networkingService *networking.Service, clusterName string) error {
546547
scope.Logger().Info("Reconciling ports for bastion", "bastion", bastionName(openStackCluster.Name))
547548

548549
if openStackCluster.Status.Bastion == nil {
@@ -584,7 +585,7 @@ func bastionHashHasChanged(computeHash string, clusterAnnotations map[string]str
584585
return latestHash != computeHash
585586
}
586587

587-
func reconcileNetworkComponents(scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
588+
func reconcileNetworkComponents(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
588589
clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
589590

590591
networkingService, err := networking.NewService(scope)

‎controllers/openstackcluster_controller_test.go

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"reflect"
2323
"testing"
2424

25-
"github.com/go-logr/logr"
2625
"github.com/golang/mock/gomock"
2726
"github.com/gophercloud/gophercloud"
2827
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
@@ -105,7 +104,7 @@ var _ = Describe("OpenStackCluster controller", func() {
105104
framework.CreateNamespace(ctx, input)
106105

107106
mockCtrl = gomock.NewController(GinkgoT())
108-
mockScopeFactory = scope.NewMockScopeFactory(mockCtrl, "", logr.Discard())
107+
mockScopeFactory = scope.NewMockScopeFactory(mockCtrl, "")
109108
reconciler = func() *OpenStackClusterReconciler {
110109
return &OpenStackClusterReconciler{
111110
Client: k8sClient,
@@ -207,8 +206,10 @@ var _ = Describe("OpenStackCluster controller", func() {
207206
}
208207
err = k8sClient.Status().Update(ctx, testCluster)
209208
Expect(err).To(BeNil())
210-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
209+
log := GinkgoLogr
210+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
211211
Expect(err).To(BeNil())
212+
scope := scope.NewWithLogger(clientScope, log)
212213

213214
computeClientRecorder := mockScopeFactory.ComputeClient.EXPECT()
214215
computeClientRecorder.GetServer("bastion-uuid").Return(nil, gophercloud.ErrResourceNotFound{})
@@ -258,8 +259,10 @@ var _ = Describe("OpenStackCluster controller", func() {
258259
err = k8sClient.Status().Update(ctx, testCluster)
259260
Expect(err).To(BeNil())
260261

261-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
262+
log := GinkgoLogr
263+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
262264
Expect(err).To(BeNil())
265+
scope := scope.NewWithLogger(clientScope, log)
263266

264267
server := clients.ServerExt{}
265268
server.ID = "adopted-bastion-uuid"
@@ -342,8 +345,10 @@ var _ = Describe("OpenStackCluster controller", func() {
342345
err = k8sClient.Status().Update(ctx, testCluster)
343346
Expect(err).To(BeNil())
344347

345-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
348+
log := GinkgoLogr
349+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
346350
Expect(err).To(BeNil())
351+
scope := scope.NewWithLogger(clientScope, log)
347352

348353
server := clients.ServerExt{}
349354
server.ID = "adopted-fip-bastion-uuid"
@@ -425,8 +430,10 @@ var _ = Describe("OpenStackCluster controller", func() {
425430
err = k8sClient.Status().Update(ctx, testCluster)
426431
Expect(err).To(BeNil())
427432

428-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
433+
log := GinkgoLogr
434+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
429435
Expect(err).To(BeNil())
436+
scope := scope.NewWithLogger(clientScope, log)
430437

431438
server := clients.ServerExt{}
432439
server.ID = "requeue-bastion-uuid"
@@ -484,8 +491,10 @@ var _ = Describe("OpenStackCluster controller", func() {
484491
err = k8sClient.Status().Update(ctx, testCluster)
485492
Expect(err).To(BeNil())
486493

487-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
494+
log := GinkgoLogr
495+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
488496
Expect(err).To(BeNil())
497+
scope := scope.NewWithLogger(clientScope, log)
489498

490499
server := clients.ServerExt{}
491500
server.ID = "delete-bastion-uuid"
@@ -534,8 +543,11 @@ var _ = Describe("OpenStackCluster controller", func() {
534543
Expect(err).To(BeNil())
535544
err = k8sClient.Create(ctx, capiCluster)
536545
Expect(err).To(BeNil())
537-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
546+
547+
log := GinkgoLogr
548+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
538549
Expect(err).To(BeNil())
550+
scope := scope.NewWithLogger(clientScope, log)
539551

540552
networkClientRecorder := mockScopeFactory.NetworkClient.EXPECT()
541553

@@ -614,8 +626,11 @@ var _ = Describe("OpenStackCluster controller", func() {
614626
Expect(err).To(BeNil())
615627
err = k8sClient.Create(ctx, capiCluster)
616628
Expect(err).To(BeNil())
617-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
629+
630+
log := GinkgoLogr
631+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
618632
Expect(err).To(BeNil())
633+
scope := scope.NewWithLogger(clientScope, log)
619634

620635
networkClientRecorder := mockScopeFactory.NetworkClient.EXPECT()
621636

@@ -675,8 +690,11 @@ var _ = Describe("OpenStackCluster controller", func() {
675690
Expect(err).To(BeNil())
676691
err = k8sClient.Create(ctx, capiCluster)
677692
Expect(err).To(BeNil())
678-
scope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, logr.Discard())
693+
694+
log := GinkgoLogr
695+
clientScope, err := mockScopeFactory.NewClientScopeFromCluster(ctx, k8sClient, testCluster, nil, log)
679696
Expect(err).To(BeNil())
697+
scope := scope.NewWithLogger(clientScope, log)
680698

681699
networkClientRecorder := mockScopeFactory.NetworkClient.EXPECT()
682700

‎controllers/openstackfloatingippool_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,11 @@ func (r *OpenStackFloatingIPPoolReconciler) Reconcile(ctx context.Context, req c
8383
return ctrl.Result{}, client.IgnoreNotFound(err)
8484
}
8585

86-
scope, err := r.ScopeFactory.NewClientScopeFromFloatingIPPool(ctx, r.Client, pool, r.CaCertificates, log)
86+
clientScope, err := r.ScopeFactory.NewClientScopeFromFloatingIPPool(ctx, r.Client, pool, r.CaCertificates, log)
8787
if err != nil {
8888
return reconcile.Result{}, err
8989
}
90+
scope := scope.NewWithLogger(clientScope, log)
9091

9192
// This is done before deleting the pool, because we want to handle deleted IPs before we delete the pool
9293
if err := r.reconcileIPAddresses(ctx, scope, pool); err != nil {
@@ -203,7 +204,7 @@ func (r *OpenStackFloatingIPPoolReconciler) Reconcile(ctx context.Context, req c
203204
return ctrl.Result{}, r.Client.Status().Update(ctx, pool)
204205
}
205206

206-
func (r *OpenStackFloatingIPPoolReconciler) reconcileDelete(ctx context.Context, scope scope.Scope, pool *infrav1alpha1.OpenStackFloatingIPPool) error {
207+
func (r *OpenStackFloatingIPPoolReconciler) reconcileDelete(ctx context.Context, scope *scope.WithLogger, pool *infrav1alpha1.OpenStackFloatingIPPool) error {
207208
log := ctrl.LoggerFrom(ctx)
208209
ipAddresses := &ipamv1.IPAddressList{}
209210
if err := r.Client.List(ctx, ipAddresses, client.InNamespace(pool.Namespace), client.MatchingFields{infrav1alpha1.OpenStackFloatingIPPoolNameIndex: pool.Name}); err != nil {
@@ -267,7 +268,7 @@ func diff(a []string, b []string) []string {
267268
return result
268269
}
269270

270-
func (r *OpenStackFloatingIPPoolReconciler) reconcileIPAddresses(ctx context.Context, scope scope.Scope, pool *infrav1alpha1.OpenStackFloatingIPPool) error {
271+
func (r *OpenStackFloatingIPPoolReconciler) reconcileIPAddresses(ctx context.Context, scope *scope.WithLogger, pool *infrav1alpha1.OpenStackFloatingIPPool) error {
271272
ipAddresses := &ipamv1.IPAddressList{}
272273
if err := r.Client.List(ctx, ipAddresses, client.InNamespace(pool.Namespace), client.MatchingFields{infrav1alpha1.OpenStackFloatingIPPoolNameIndex: pool.Name}); err != nil {
273274
return err
@@ -309,7 +310,7 @@ func (r *OpenStackFloatingIPPoolReconciler) reconcileIPAddresses(ctx context.Con
309310
return nil
310311
}
311312

312-
func (r *OpenStackFloatingIPPoolReconciler) getIP(ctx context.Context, scope scope.Scope, pool *infrav1alpha1.OpenStackFloatingIPPool) (string, error) {
313+
func (r *OpenStackFloatingIPPoolReconciler) getIP(ctx context.Context, scope *scope.WithLogger, pool *infrav1alpha1.OpenStackFloatingIPPool) (string, error) {
313314
// There's a potential leak of IPs here, if the reconcile loop fails after we claim an IP but before we create the IPAddress object.
314315
var ip string
315316

@@ -388,7 +389,7 @@ func (r *OpenStackFloatingIPPoolReconciler) getIP(ctx context.Context, scope sco
388389
return ip, nil
389390
}
390391

391-
func (r *OpenStackFloatingIPPoolReconciler) reconcileFloatingIPNetwork(scope scope.Scope, pool *infrav1alpha1.OpenStackFloatingIPPool) error {
392+
func (r *OpenStackFloatingIPPoolReconciler) reconcileFloatingIPNetwork(scope *scope.WithLogger, pool *infrav1alpha1.OpenStackFloatingIPPool) error {
392393
// If the pool already has a network, we don't need to do anything
393394
if pool.Status.FloatingIPNetwork != nil {
394395
return nil

‎controllers/openstackmachine_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,11 @@ func (r *OpenStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
142142
}
143143
}()
144144

145-
scope, err := r.ScopeFactory.NewClientScopeFromMachine(ctx, r.Client, openStackMachine, infraCluster, r.CaCertificates, log)
145+
clientScope, err := r.ScopeFactory.NewClientScopeFromMachine(ctx, r.Client, openStackMachine, infraCluster, r.CaCertificates, log)
146146
if err != nil {
147147
return reconcile.Result{}, err
148148
}
149+
scope := scope.NewWithLogger(clientScope, log)
149150

150151
// Resolve and store referenced resources
151152
changed, err := compute.ResolveReferencedMachineResources(scope, infraCluster, &openStackMachine.Spec, &openStackMachine.Status.ReferencedResources)
@@ -240,7 +241,7 @@ func (r *OpenStackMachineReconciler) SetupWithManager(ctx context.Context, mgr c
240241
Complete(r)
241242
}
242243

243-
func (r *OpenStackMachineReconciler) reconcileDelete(scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (ctrl.Result, error) { //nolint:unparam
244+
func (r *OpenStackMachineReconciler) reconcileDelete(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (ctrl.Result, error) { //nolint:unparam
244245
scope.Logger().Info("Reconciling Machine delete")
245246

246247
clusterName := fmt.Sprintf("%s-%s", cluster.ObjectMeta.Namespace, cluster.Name)
@@ -333,7 +334,7 @@ func GetPortIDs(ports []infrav1.PortStatus) []string {
333334
return portIDs
334335
}
335336

336-
func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope scope.Scope, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (_ ctrl.Result, reterr error) {
337+
func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (_ ctrl.Result, reterr error) {
337338
var err error
338339

339340
// If the OpenStackMachine is in an error state, return early.
@@ -489,7 +490,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
489490
return ctrl.Result{}, nil
490491
}
491492

492-
func getOrCreateMachinePorts(scope scope.Scope, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, networkingService *networking.Service, clusterName string) error {
493+
func getOrCreateMachinePorts(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, networkingService *networking.Service, clusterName string) error {
493494
scope.Logger().Info("Reconciling ports for machine", "machine", machine.Name)
494495
var machinePortsStatus []infrav1.PortStatus
495496
var err error
@@ -647,7 +648,7 @@ func getManagedSecurityGroups(openStackCluster *infrav1.OpenStackCluster, machin
647648
return machineSpecSecurityGroups
648649
}
649650

650-
func (r *OpenStackMachineReconciler) reconcileLoadBalancerMember(scope scope.Scope, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {
651+
func (r *OpenStackMachineReconciler) reconcileLoadBalancerMember(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {
651652
ip := instanceNS.IP(openStackCluster.Status.Network.Name)
652653
loadbalancerService, err := loadbalancer.NewService(scope)
653654
if err != nil {

‎controllers/suite_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"path/filepath"
2323
"testing"
2424

25-
"github.com/go-logr/logr"
2625
"github.com/golang/mock/gomock"
2726
. "github.com/onsi/ginkgo/v2"
2827
. "github.com/onsi/gomega"
@@ -127,8 +126,9 @@ var _ = Describe("EnvTest sanity check", func() {
127126
})
128127

129128
var _ = Describe("When calling getOrCreate", func() {
129+
logger := GinkgoLogr
130+
130131
var (
131-
logger logr.Logger
132132
reconsiler OpenStackMachineReconciler
133133
mockCtrl *gomock.Controller
134134
mockScopeFactory *scope.MockScopeFactory
@@ -138,11 +138,10 @@ var _ = Describe("When calling getOrCreate", func() {
138138

139139
BeforeEach(func() {
140140
ctx = context.Background()
141-
logger = logr.Discard()
142141
reconsiler = OpenStackMachineReconciler{}
143142
mockCtrl = gomock.NewController(GinkgoT())
144-
mockScopeFactory = scope.NewMockScopeFactory(mockCtrl, "1234", logger)
145-
computeService, err = compute.NewService(mockScopeFactory)
143+
mockScopeFactory = scope.NewMockScopeFactory(mockCtrl, "1234")
144+
computeService, err = compute.NewService(scope.NewWithLogger(mockScopeFactory, logger))
146145
Expect(err).NotTo(HaveOccurred())
147146
})
148147

‎pkg/cloud/services/compute/dependent_resources.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
2323
)
2424

25-
func ResolveDependentMachineResources(scope scope.Scope, openStackMachine *infrav1.OpenStackMachine) (changed bool, err error) {
25+
func ResolveDependentMachineResources(scope *scope.WithLogger, openStackMachine *infrav1.OpenStackMachine) (changed bool, err error) {
2626
changed = false
2727

2828
networkingService, err := networking.NewService(scope)
@@ -33,7 +33,7 @@ func ResolveDependentMachineResources(scope scope.Scope, openStackMachine *infra
3333
return networkingService.AdoptMachinePorts(scope, openStackMachine, openStackMachine.Status.ReferencedResources.PortsOpts)
3434
}
3535

36-
func ResolveDependentBastionResources(scope scope.Scope, openStackCluster *infrav1.OpenStackCluster, bastionName string) (changed bool, err error) {
36+
func ResolveDependentBastionResources(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, bastionName string) (changed bool, err error) {
3737
changed = false
3838

3939
networkingService, err := networking.NewService(scope)

‎pkg/cloud/services/compute/dependent_resources_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package compute
1919
import (
2020
"testing"
2121

22-
"github.com/go-logr/logr"
22+
"github.com/go-logr/logr/testr"
2323
"github.com/golang/mock/gomock"
2424
"github.com/google/go-cmp/cmp"
2525
. "github.com/onsi/gomega"
@@ -93,8 +93,9 @@ func Test_ResolveDependentMachineResources(t *testing.T) {
9393
for _, tt := range tests {
9494
t.Run(tt.testName, func(t *testing.T) {
9595
g := NewWithT(t)
96+
log := testr.New(t)
9697
mockCtrl := gomock.NewController(t)
97-
mockScopeFactory := scope.NewMockScopeFactory(mockCtrl, "", logr.Discard())
98+
mockScopeFactory := scope.NewMockScopeFactory(mockCtrl, "")
9899

99100
defaultOpenStackMachine := &infrav1.OpenStackMachine{
100101
ObjectMeta: metav1.ObjectMeta{
@@ -103,7 +104,7 @@ func Test_ResolveDependentMachineResources(t *testing.T) {
103104
Status: tt.openStackMachineStatus,
104105
}
105106

106-
_, err := ResolveDependentMachineResources(mockScopeFactory, defaultOpenStackMachine)
107+
_, err := ResolveDependentMachineResources(scope.NewWithLogger(mockScopeFactory, log), defaultOpenStackMachine)
107108
if tt.wantErr {
108109
g.Expect(err).Error()
109110
return
@@ -192,10 +193,11 @@ func TestResolveDependentBastionResources(t *testing.T) {
192193
for _, tt := range tests {
193194
t.Run(tt.testName, func(t *testing.T) {
194195
g := NewWithT(t)
196+
log := testr.New(t)
195197
mockCtrl := gomock.NewController(t)
196-
mockScopeFactory := scope.NewMockScopeFactory(mockCtrl, "", logr.Discard())
198+
mockScopeFactory := scope.NewMockScopeFactory(mockCtrl, "")
197199

198-
_, err := ResolveDependentBastionResources(mockScopeFactory, tt.openStackCluster, bastionName)
200+
_, err := ResolveDependentBastionResources(scope.NewWithLogger(mockScopeFactory, log), tt.openStackCluster, bastionName)
199201
if tt.wantErr {
200202
g.Expect(err).Error()
201203
return

0 commit comments

Comments
 (0)