Skip to content

Commit

Permalink
Fix wrong DoAndReturn usages
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
timebertt committed Jun 14, 2021
1 parent 160f2d3 commit ce8de94
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions extensions/pkg/util/shoot_test.go
Expand Up @@ -98,7 +98,7 @@ var _ = Describe("Shoot", func() {
MaxTimes(2)

c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).
DoAndReturn(func(_ context.Context, _ *corev1.Secret) error {
DoAndReturn(func(_ context.Context, _ *corev1.Secret, _ ...client.CreateOption) error {
return nil
})

Expand Down Expand Up @@ -159,7 +159,7 @@ var _ = Describe("Shoot", func() {
MaxTimes(2)

c.EXPECT().Update(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).
DoAndReturn(func(_ context.Context, _ *corev1.Secret) error {
DoAndReturn(func(_ context.Context, _ *corev1.Secret, _ ...client.UpdateOption) error {
return nil
})

Expand Down
Expand Up @@ -162,7 +162,7 @@ var _ = Describe("handler", func() {
client.InNamespace(gardenNamespaceName),
client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleInternalDomain},
client.Limit(1),
).DoAndReturn(func(_ context.Context, list client.ObjectList, inNamespace, internalDomainLabels, limitOne client.ListOption) error {
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
return nil
})
Expand All @@ -182,7 +182,7 @@ var _ = Describe("handler", func() {
client.InNamespace(seedNamespace),
client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleInternalDomain},
client.Limit(1),
).DoAndReturn(func(_ context.Context, list client.ObjectList, inNamespace, internalDomainLabels, limitOne client.ListOption) error {
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
return nil
})
Expand Down Expand Up @@ -387,7 +387,7 @@ var _ = Describe("handler", func() {
gomock.AssignableToTypeOf(&metav1.PartialObjectMetadataList{}),
client.Limit(1),
client.MatchingFields{gardenercore.ShootSeedName: seedName},
).DoAndReturn(func(_ context.Context, list client.ObjectList, limitOne, seedNameSelector client.ListOption) error {
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
return nil
})
Expand Down Expand Up @@ -474,7 +474,7 @@ var _ = Describe("handler", func() {
gomock.AssignableToTypeOf(&metav1.PartialObjectMetadataList{}),
client.Limit(1),
client.MatchingFields{gardenercore.ShootSeedName: seedName},
).DoAndReturn(func(_ context.Context, list client.ObjectList, limitOne, seedNameSelector client.ListOption) error {
).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
(&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList))
return nil
})
Expand Down
Expand Up @@ -107,7 +107,7 @@ var _ = Describe("Reconciler", func() {
}
expectPatchManagedSeedSet = func(expect func(*seedmanagementv1alpha1.ManagedSeedSet)) {
c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeedSet{}), gomock.Any()).DoAndReturn(
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch) error {
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch, _ ...client.PatchOption) error {
expect(mss)
*set = *mss
return nil
Expand All @@ -116,7 +116,7 @@ var _ = Describe("Reconciler", func() {
}
expectPatchManagedSeedSetStatus = func(expect func(*seedmanagementv1alpha1.ManagedSeedSet)) {
sw.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeedSet{}), gomock.Any()).DoAndReturn(
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch) error {
func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch, _ ...client.PatchOption) error {
expect(mss)
*set = *mss
return nil
Expand Down
Expand Up @@ -303,7 +303,7 @@ var _ = Describe("Replica", func() {
Describe("#CreateShoot", func() {
It("should create the shoot", func() {
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{})).DoAndReturn(
func(_ context.Context, s *gardencorev1beta1.Shoot) error {
func(_ context.Context, s *gardencorev1beta1.Shoot, _ ...client.CreateOption) error {
Expect(s).To(Equal(&gardencorev1beta1.Shoot{
ObjectMeta: metav1.ObjectMeta{
Name: replicaName,
Expand Down Expand Up @@ -335,7 +335,7 @@ var _ = Describe("Replica", func() {
It("should create the managed seed", func() {
shoot := shoot(nil, "", "", "", false)
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn(
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error {
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error {
Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{
ObjectMeta: metav1.ObjectMeta{
Name: replicaName,
Expand Down Expand Up @@ -382,14 +382,14 @@ var _ = Describe("Replica", func() {
It("should clean the retries, confirm the deletion, and delete the shoot", func() {
shoot := shoot(nil, "", "", "", false)
c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
Expect(s.Annotations).To(HaveKeyWithValue(gutil.ConfirmationDeletion, "true"))
*shoot = *s
return nil
},
)
c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{})).DoAndReturn(
func(_ context.Context, s *gardencorev1beta1.Shoot) error {
func(_ context.Context, s *gardencorev1beta1.Shoot, _ ...client.DeleteOption) error {
Expect(s).To(Equal(shoot))
return nil
},
Expand All @@ -405,7 +405,7 @@ var _ = Describe("Replica", func() {
It("should delete the managed seed", func() {
managedSeed := managedSeed(nil, false, false)
c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn(
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error {
func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.DeleteOption) error {
Expect(ms).To(Equal(managedSeed))
return nil
},
Expand All @@ -421,7 +421,7 @@ var _ = Describe("Replica", func() {
It("should set the operation to retry and the retries to 1", func() {
shoot := shoot(nil, "", "", "", false)
c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
Expect(s.Annotations).To(HaveKeyWithValue(v1beta1constants.GardenerOperation, v1beta1constants.ShootOperationRetry))
return nil
},
Expand Down
Expand Up @@ -81,7 +81,7 @@ var _ = Describe("BackupBucketReconciler", func() {

JustBeforeEach(func() {
sw.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(seed), gomock.Any()).DoAndReturn(
func(_ context.Context, obj client.Object, patch client.Patch) error {
func(_ context.Context, obj client.Object, patch client.Patch, _ ...client.PatchOption) error {
patchData, err := patch.Data(obj)
Expect(err).NotTo(HaveOccurred())
Expect(json.Unmarshal(patchData, seedPatch)).To(Succeed())
Expand Down
Expand Up @@ -246,14 +246,14 @@ var _ = Describe("Shoot References", func() {
return nil
})
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
defer m.Unlock()
m.Lock()
updatedSecrets = append(updatedSecrets, secret)
return nil
})
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
defer m.Unlock()
m.Lock()
updatedSecrets = append(updatedSecrets, secret)
Expand All @@ -262,7 +262,7 @@ var _ = Describe("Shoot References", func() {

var updatedShoot *gardencorev1beta1.Shoot
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
updatedShoot = shoot
return nil
})
Expand Down Expand Up @@ -330,14 +330,14 @@ var _ = Describe("Shoot References", func() {
return nil
})
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
updatedSecret = secret
return nil
})

var updatedShoot *gardencorev1beta1.Shoot
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
updatedShoot = shoot
return nil
})
Expand Down Expand Up @@ -400,7 +400,7 @@ var _ = Describe("Shoot References", func() {

var updatedShoot *gardencorev1beta1.Shoot
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
updatedShoot = shoot
return nil
})
Expand Down Expand Up @@ -455,7 +455,7 @@ var _ = Describe("Shoot References", func() {

var updatedSecret *corev1.Secret
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn(
func(_ context.Context, secret *corev1.Secret, _ client.Patch) error {
func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error {
updatedSecret = secret
return nil
})
Expand Down Expand Up @@ -566,14 +566,14 @@ var _ = Describe("Shoot References", func() {

var updatedConfigMap *corev1.ConfigMap
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn(
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch) error {
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error {
updatedConfigMap = configMap
return nil
})

var updatedShoot *gardencorev1beta1.Shoot
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
updatedShoot = shoot
return nil
})
Expand Down Expand Up @@ -637,14 +637,14 @@ var _ = Describe("Shoot References", func() {
return nil
})
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn(
func(_ context.Context, cm *corev1.ConfigMap, _ client.Patch) error {
func(_ context.Context, cm *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error {
updatedConfigMap = cm
return nil
})

var updatedShoot *gardencorev1beta1.Shoot
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
updatedShoot = shoot
return nil
})
Expand Down Expand Up @@ -711,7 +711,7 @@ var _ = Describe("Shoot References", func() {

var updatedShoot *gardencorev1beta1.Shoot
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn(
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error {
func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error {
updatedShoot = shoot
return nil
})
Expand Down Expand Up @@ -768,7 +768,7 @@ var _ = Describe("Shoot References", func() {

var updatedConfigMap *corev1.ConfigMap
cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn(
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch) error {
func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error {
updatedConfigMap = configMap
return nil
})
Expand Down
8 changes: 4 additions & 4 deletions pkg/gardenlet/bootstrap/util/util_test.go
Expand Up @@ -201,7 +201,7 @@ var _ = Describe("Util", func() {
})
c.EXPECT().Get(ctx, kutil.Key(metav1.NamespaceSystem, bootstrapTokenSecretName), gomock.AssignableToTypeOf(&corev1.Secret{})).Return(nil).Times(2)

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

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

It("should succeed", func() {
// create service account
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount) error {
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount, _ ...client.CreateOption) error {
Expect(s.Name).To(Equal(serviceAccountName))
Expect(s.Namespace).To(Equal("garden"))
s.Secrets = []corev1.ObjectReference{
Expand All @@ -294,7 +294,7 @@ var _ = Describe("Util", func() {
Name: fmt.Sprintf("gardener.cloud:system:seed-bootstrapper:%s:%s", serviceAccountNamespace, serviceAccountName),
},
}
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&rbacv1.ClusterRoleBinding{})).DoAndReturn(func(_ context.Context, s *rbacv1.ClusterRoleBinding) error {
c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&rbacv1.ClusterRoleBinding{})).DoAndReturn(func(_ context.Context, s *rbacv1.ClusterRoleBinding, _ ...client.CreateOption) error {
expectedClusterRoleBinding := clusterRoleBinding
expectedClusterRoleBinding.RoleRef = rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Expand Down
Expand Up @@ -309,7 +309,7 @@ var _ = Describe("Actuator", func() {
},
)
shc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Namespace{})).DoAndReturn(
func(_ context.Context, ns *corev1.Namespace) error {
func(_ context.Context, ns *corev1.Namespace, _ ...client.CreateOption) error {
Expect(ns.Name).To(Equal(v1beta1constants.GardenNamespace))
return nil
},
Expand All @@ -318,7 +318,7 @@ var _ = Describe("Actuator", func() {

expectDeleteGardenNamespace = func() {
shc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Namespace{})).DoAndReturn(
func(_ context.Context, ns *corev1.Namespace) error {
func(_ context.Context, ns *corev1.Namespace, _ ...client.DeleteOption) error {
Expect(ns.Name).To(Equal(v1beta1constants.GardenNamespace))
return nil
},
Expand Down Expand Up @@ -375,7 +375,7 @@ var _ = Describe("Actuator", func() {
},
)
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
func(_ context.Context, s *corev1.Secret) error {
func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error {
Expect(s).To(Equal(backupSecret))
return nil
},
Expand All @@ -389,7 +389,7 @@ var _ = Describe("Actuator", func() {
},
)
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
func(_ context.Context, s *corev1.Secret) error {
func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error {
Expect(s).To(Equal(seedSecret))
return nil
},
Expand All @@ -405,7 +405,7 @@ var _ = Describe("Actuator", func() {
},
)
gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
func(_ context.Context, s *corev1.Secret) error {
func(_ context.Context, s *corev1.Secret, _ ...client.DeleteOption) error {
Expect(s.Name).To(Equal(backupSecretName))
Expect(s.Namespace).To(Equal(namespace))
return nil
Expand All @@ -414,7 +414,7 @@ var _ = Describe("Actuator", func() {

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

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

expectDeleteSeed = func() {
gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Seed{})).DoAndReturn(
func(_ context.Context, s *gardencorev1beta1.Seed) error {
func(_ context.Context, s *gardencorev1beta1.Seed, _ ...client.DeleteOption) error {
Expect(s.Name).To(Equal(name))
return nil
},
Expand Down Expand Up @@ -511,7 +511,7 @@ var _ = Describe("Actuator", func() {
},
).Times(3)
gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(
func(_ context.Context, s *corev1.Secret) error {
func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error {
Expect(s.Name).To(Equal("bootstrap-token-a82f8a"))
Expect(s.Namespace).To(Equal(metav1.NamespaceSystem))
Expect(s.Type).To(Equal(corev1.SecretTypeBootstrapToken))
Expand Down

0 comments on commit ce8de94

Please sign in to comment.