Skip to content

Commit ce8de94

Browse files
timebertttimebertt
committed
Fix wrong DoAndReturn usages
There were a lot of DoAndReturn usages in our tests that didn't correctly use the client func signatures. With golang/mock#558 this is now validated and tests fail, if the signature of the provided func literal is not the same as the one of the real func. This commit fixes our wrong usages to comply with the newest gomock behavior.
1 parent 160f2d3 commit ce8de94

File tree

13 files changed

+59
-59
lines changed

13 files changed

+59
-59
lines changed

‎extensions/pkg/util/shoot_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var _ = Describe("Shoot", func() {
9898
MaxTimes(2)
9999

100100
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).
101-
DoAndReturn(func(_ context.Context, _ *corev1.Secret) error {
101+
DoAndReturn(func(_ context.Context, _ *corev1.Secret, _ ...client.CreateOption) error {
102102
return nil
103103
})
104104

@@ -159,7 +159,7 @@ var _ = Describe("Shoot", func() {
159159
MaxTimes(2)
160160

161161
c.EXPECT().Update(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).
162-
DoAndReturn(func(_ context.Context, _ *corev1.Secret) error {
162+
DoAndReturn(func(_ context.Context, _ *corev1.Secret, _ ...client.UpdateOption) error {
163163
return nil
164164
})
165165

‎pkg/admissioncontroller/webhooks/admission/internaldomainsecret/admission_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ var _ = Describe("handler", func() {
162162
client.InNamespace(gardenNamespaceName),
163163
client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleInternalDomain},
164164
client.Limit(1),
165-
).DoAndReturn(func(_ context.Context, list client.ObjectList, inNamespace, internalDomainLabels, limitOne client.ListOption) error {
165+
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
166166
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
167167
return nil
168168
})
@@ -182,7 +182,7 @@ var _ = Describe("handler", func() {
182182
client.InNamespace(seedNamespace),
183183
client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleInternalDomain},
184184
client.Limit(1),
185-
).DoAndReturn(func(_ context.Context, list client.ObjectList, inNamespace, internalDomainLabels, limitOne client.ListOption) error {
185+
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
186186
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
187187
return nil
188188
})
@@ -387,7 +387,7 @@ var _ = Describe("handler", func() {
387387
gomock.AssignableToTypeOf(&metav1.PartialObjectMetadataList{}),
388388
client.Limit(1),
389389
client.MatchingFields{gardenercore.ShootSeedName: seedName},
390-
).DoAndReturn(func(_ context.Context, list client.ObjectList, limitOne, seedNameSelector client.ListOption) error {
390+
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
391391
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
392392
return nil
393393
})
@@ -474,7 +474,7 @@ var _ = Describe("handler", func() {
474474
gomock.AssignableToTypeOf(&metav1.PartialObjectMetadataList{}),
475475
client.Limit(1),
476476
client.MatchingFields{gardenercore.ShootSeedName: seedName},
477-
).DoAndReturn(func(_ context.Context, list client.ObjectList, limitOne, seedNameSelector client.ListOption) error {
477+
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
478478
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
479479
return nil
480480
})

‎pkg/controllermanager/controller/managedseedset/managedseedset_reconciler_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ var _ = Describe("Reconciler", func() {
107107
}
108108
expectPatchManagedSeedSet = func(expect func(*seedmanagementv1alpha1.ManagedSeedSet)) {
109109
c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeedSet{}), gomock.Any()).DoAndReturn(
110-
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch) error {
110+
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch, _ ...client.PatchOption) error {
111111
expect(mss)
112112
*set = *mss
113113
return nil
@@ -116,7 +116,7 @@ var _ = Describe("Reconciler", func() {
116116
}
117117
expectPatchManagedSeedSetStatus = func(expect func(*seedmanagementv1alpha1.ManagedSeedSet)) {
118118
sw.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeedSet{}), gomock.Any()).DoAndReturn(
119-
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch) error {
119+
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch, _ ...client.PatchOption) error {
120120
expect(mss)
121121
*set = *mss
122122
return nil

‎pkg/controllermanager/controller/managedseedset/managedseedset_replica_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ var _ = Describe("Replica", func() {
303303
Describe("#CreateShoot", func() {
304304
It("should create the shoot", func() {
305305
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{})).DoAndReturn(
306-
func(_ context.Context, s *gardencorev1beta1.Shoot) error {
306+
func(_ context.Context, s *gardencorev1beta1.Shoot, _ ...client.CreateOption) error {
307307
Expect(s).To(Equal(&gardencorev1beta1.Shoot{
308308
ObjectMeta: metav1.ObjectMeta{
309309
Name: replicaName,
@@ -335,7 +335,7 @@ var _ = Describe("Replica", func() {
335335
It("should create the managed seed", func() {
336336
shoot := shoot(nil, "", "", "", false)
337337
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn(
338-
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error {
338+
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error {
339339
Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{
340340
ObjectMeta: metav1.ObjectMeta{
341341
Name: replicaName,
@@ -382,14 +382,14 @@ var _ = Describe("Replica", func() {
382382
It("should clean the retries, confirm the deletion, and delete the shoot", func() {
383383
shoot := shoot(nil, "", "", "", false)
384384
c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
385-
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch) error {
385+
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
386386
Expect(s.Annotations).To(HaveKeyWithValue(gutil.ConfirmationDeletion, "true"))
387387
*shoot = *s
388388
return nil
389389
},
390390
)
391391
c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{})).DoAndReturn(
392-
func(_ context.Context, s *gardencorev1beta1.Shoot) error {
392+
func(_ context.Context, s *gardencorev1beta1.Shoot, _ ...client.DeleteOption) error {
393393
Expect(s).To(Equal(shoot))
394394
return nil
395395
},
@@ -405,7 +405,7 @@ var _ = Describe("Replica", func() {
405405
It("should delete the managed seed", func() {
406406
managedSeed := managedSeed(nil, false, false)
407407
c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn(
408-
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error {
408+
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.DeleteOption) error {
409409
Expect(ms).To(Equal(managedSeed))
410410
return nil
411411
},
@@ -421,7 +421,7 @@ var _ = Describe("Replica", func() {
421421
It("should set the operation to retry and the retries to 1", func() {
422422
shoot := shoot(nil, "", "", "", false)
423423
c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
424-
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch) error {
424+
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
425425
Expect(s.Annotations).To(HaveKeyWithValue(v1beta1constants.GardenerOperation, v1beta1constants.ShootOperationRetry))
426426
return nil
427427
},

‎pkg/controllermanager/controller/seed/seed_backup_bucket_reconcile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ var _ = Describe("BackupBucketReconciler", func() {
8181

8282
JustBeforeEach(func() {
8383
sw.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(seed), gomock.Any()).DoAndReturn(
84-
func(_ context.Context, obj client.Object, patch client.Patch) error {
84+
func(_ context.Context, obj client.Object, patch client.Patch, _ ...client.PatchOption) error {
8585
patchData, err := patch.Data(obj)
8686
Expect(err).NotTo(HaveOccurred())
8787
Expect(json.Unmarshal(patchData, seedPatch)).To(Succeed())

‎pkg/controllermanager/controller/shoot/shoot_reference_control_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ var _ = Describe("Shoot References", func() {
246246
return nil
247247
})
248248
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
249-
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
249+
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
250250
defer m.Unlock()
251251
m.Lock()
252252
updatedSecrets = append(updatedSecrets, secret)
253253
return nil
254254
})
255255
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
256-
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
256+
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
257257
defer m.Unlock()
258258
m.Lock()
259259
updatedSecrets = append(updatedSecrets, secret)
@@ -262,7 +262,7 @@ var _ = Describe("Shoot References", func() {
262262

263263
var updatedShoot *gardencorev1beta1.Shoot
264264
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
265-
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
265+
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
266266
updatedShoot = shoot
267267
return nil
268268
})
@@ -330,14 +330,14 @@ var _ = Describe("Shoot References", func() {
330330
return nil
331331
})
332332
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
333-
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
333+
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
334334
updatedSecret = secret
335335
return nil
336336
})
337337

338338
var updatedShoot *gardencorev1beta1.Shoot
339339
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
340-
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
340+
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
341341
updatedShoot = shoot
342342
return nil
343343
})
@@ -400,7 +400,7 @@ var _ = Describe("Shoot References", func() {
400400

401401
var updatedShoot *gardencorev1beta1.Shoot
402402
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
403-
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
403+
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
404404
updatedShoot = shoot
405405
return nil
406406
})
@@ -455,7 +455,7 @@ var _ = Describe("Shoot References", func() {
455455

456456
var updatedSecret *corev1.Secret
457457
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
458-
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
458+
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
459459
updatedSecret = secret
460460
return nil
461461
})
@@ -566,14 +566,14 @@ var _ = Describe("Shoot References", func() {
566566

567567
var updatedConfigMap *corev1.ConfigMap
568568
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn(
569-
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch) error {
569+
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error {
570570
updatedConfigMap = configMap
571571
return nil
572572
})
573573

574574
var updatedShoot *gardencorev1beta1.Shoot
575575
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
576-
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
576+
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
577577
updatedShoot = shoot
578578
return nil
579579
})
@@ -637,14 +637,14 @@ var _ = Describe("Shoot References", func() {
637637
return nil
638638
})
639639
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn(
640-
func(_ context.Context, cm *corev1.ConfigMap, _ client.Patch) error {
640+
func(_ context.Context, cm *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error {
641641
updatedConfigMap = cm
642642
return nil
643643
})
644644

645645
var updatedShoot *gardencorev1beta1.Shoot
646646
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
647-
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
647+
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
648648
updatedShoot = shoot
649649
return nil
650650
})
@@ -711,7 +711,7 @@ var _ = Describe("Shoot References", func() {
711711

712712
var updatedShoot *gardencorev1beta1.Shoot
713713
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
714-
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
714+
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
715715
updatedShoot = shoot
716716
return nil
717717
})
@@ -768,7 +768,7 @@ var _ = Describe("Shoot References", func() {
768768

769769
var updatedConfigMap *corev1.ConfigMap
770770
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn(
771-
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch) error {
771+
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error {
772772
updatedConfigMap = configMap
773773
return nil
774774
})

‎pkg/gardenlet/bootstrap/util/util_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ var _ = Describe("Util", func() {
201201
})
202202
c.EXPECT().Get(ctx, kutil.Key(metav1.NamespaceSystem, bootstrapTokenSecretName), gomock.AssignableToTypeOf(&corev1.Secret{})).Return(nil).Times(2)
203203

204-
c.EXPECT().Update(ctx, gomock.Any()).DoAndReturn(func(_ context.Context, s *corev1.Secret) error {
204+
c.EXPECT().Update(ctx, gomock.Any()).DoAndReturn(func(_ context.Context, s *corev1.Secret, _ ...client.UpdateOption) error {
205205
Expect(s.Name).To(Equal(bootstrapTokenSecretName))
206206
Expect(s.Namespace).To(Equal(metav1.NamespaceSystem))
207207
Expect(s.Type).To(Equal(bootstraptokenapi.SecretTypeBootstrapToken))
@@ -255,7 +255,7 @@ var _ = Describe("Util", func() {
255255
)
256256

257257
It("should fail because the service account token controller has not yet created a secret for the service account", func() {
258-
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount) error {
258+
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount, _ ...client.CreateOption) error {
259259
s.Name = serviceAccountName
260260
s.Namespace = "garden"
261261
s.Secrets = []corev1.ObjectReference{}
@@ -269,7 +269,7 @@ var _ = Describe("Util", func() {
269269

270270
It("should succeed", func() {
271271
// create service account
272-
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount) error {
272+
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount, _ ...client.CreateOption) error {
273273
Expect(s.Name).To(Equal(serviceAccountName))
274274
Expect(s.Namespace).To(Equal("garden"))
275275
s.Secrets = []corev1.ObjectReference{
@@ -294,7 +294,7 @@ var _ = Describe("Util", func() {
294294
Name: fmt.Sprintf("gardener.cloud:system:seed-bootstrapper:%s:%s", serviceAccountNamespace, serviceAccountName),
295295
},
296296
}
297-
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&rbacv1.ClusterRoleBinding{})).DoAndReturn(func(_ context.Context, s *rbacv1.ClusterRoleBinding) error {
297+
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&rbacv1.ClusterRoleBinding{})).DoAndReturn(func(_ context.Context, s *rbacv1.ClusterRoleBinding, _ ...client.CreateOption) error {
298298
expectedClusterRoleBinding := clusterRoleBinding
299299
expectedClusterRoleBinding.RoleRef = rbacv1.RoleRef{
300300
APIGroup: "rbac.authorization.k8s.io",

‎pkg/gardenlet/controller/managedseed/managedseed_actuator_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ var _ = Describe("Actuator", func() {
309309
},
310310
)
311311
shc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Namespace{})).DoAndReturn(
312-
func(_ context.Context, ns *corev1.Namespace) error {
312+
func(_ context.Context, ns *corev1.Namespace, _ ...client.CreateOption) error {
313313
Expect(ns.Name).To(Equal(v1beta1constants.GardenNamespace))
314314
return nil
315315
},
@@ -318,7 +318,7 @@ var _ = Describe("Actuator", func() {
318318

319319
expectDeleteGardenNamespace = func() {
320320
shc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Namespace{})).DoAndReturn(
321-
func(_ context.Context, ns *corev1.Namespace) error {
321+
func(_ context.Context, ns *corev1.Namespace, _ ...client.DeleteOption) error {
322322
Expect(ns.Name).To(Equal(v1beta1constants.GardenNamespace))
323323
return nil
324324
},
@@ -375,7 +375,7 @@ var _ = Describe("Actuator", func() {
375375
},
376376
)
377377
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
378-
func(_ context.Context, s *corev1.Secret) error {
378+
func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error {
379379
Expect(s).To(Equal(backupSecret))
380380
return nil
381381
},
@@ -389,7 +389,7 @@ var _ = Describe("Actuator", func() {
389389
},
390390
)
391391
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
392-
func(_ context.Context, s *corev1.Secret) error {
392+
func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error {
393393
Expect(s).To(Equal(seedSecret))
394394
return nil
395395
},
@@ -405,7 +405,7 @@ var _ = Describe("Actuator", func() {
405405
},
406406
)
407407
gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
408-
func(_ context.Context, s *corev1.Secret) error {
408+
func(_ context.Context, s *corev1.Secret, _ ...client.DeleteOption) error {
409409
Expect(s.Name).To(Equal(backupSecretName))
410410
Expect(s.Namespace).To(Equal(namespace))
411411
return nil
@@ -414,7 +414,7 @@ var _ = Describe("Actuator", func() {
414414

415415
// Delete seed secret
416416
gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
417-
func(_ context.Context, s *corev1.Secret) error {
417+
func(_ context.Context, s *corev1.Secret, _ ...client.DeleteOption) error {
418418
Expect(s.Name).To(Equal(seedSecretName))
419419
Expect(s.Namespace).To(Equal(namespace))
420420
return nil
@@ -448,7 +448,7 @@ var _ = Describe("Actuator", func() {
448448

449449
expectCreateSeed = func() {
450450
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Seed{})).DoAndReturn(
451-
func(_ context.Context, s *gardencorev1beta1.Seed) error {
451+
func(_ context.Context, s *gardencorev1beta1.Seed, _ ...client.CreateOption) error {
452452
Expect(s).To(Equal(seed))
453453
return nil
454454
},
@@ -457,7 +457,7 @@ var _ = Describe("Actuator", func() {
457457

458458
expectDeleteSeed = func() {
459459
gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Seed{})).DoAndReturn(
460-
func(_ context.Context, s *gardencorev1beta1.Seed) error {
460+
func(_ context.Context, s *gardencorev1beta1.Seed, _ ...client.DeleteOption) error {
461461
Expect(s.Name).To(Equal(name))
462462
return nil
463463
},
@@ -511,7 +511,7 @@ var _ = Describe("Actuator", func() {
511511
},
512512
).Times(3)
513513
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
514-
func(_ context.Context, s *corev1.Secret) error {
514+
func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error {
515515
Expect(s.Name).To(Equal("bootstrap-token-a82f8a"))
516516
Expect(s.Namespace).To(Equal(metav1.NamespaceSystem))
517517
Expect(s.Type).To(Equal(corev1.SecretTypeBootstrapToken))

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy