From 8a64e5f3bd788d79be2396d21a29551fc49e46a8 Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Fri, 7 Jul 2023 09:33:21 -0700 Subject: [PATCH] :seedling: Update golangc-lint to v1.53 Signed-off-by: Vince Prignano --- .github/workflows/golangci-lint.yml | 2 +- .golangci.yml | 6 +- pkg/cache/cache_test.go | 30 +-- pkg/cache/informer_cache_unit_test.go | 2 +- pkg/certwatcher/certwatcher_test.go | 10 +- pkg/client/apiutil/restmapper_test.go | 6 +- pkg/client/client_test.go | 2 +- pkg/client/fake/client_test.go | 226 +++++++++--------- pkg/client/namespaced_client_test.go | 4 +- pkg/client/options_test.go | 6 +- pkg/config/config_test.go | 6 +- pkg/controller/controller_suite_test.go | 2 +- .../controllerutil/controllerutil_test.go | 4 +- pkg/envtest/webhook_test.go | 8 +- pkg/finalizer/finalizer_test.go | 58 ++--- pkg/internal/controller/controller_test.go | 6 +- pkg/internal/recorder/recorder_test.go | 2 +- .../testing/process/bin_path_finder_test.go | 6 +- pkg/manager/manager_test.go | 40 ++-- pkg/source/source_test.go | 2 +- .../workflows/workflows_testutils_test.go | 6 +- 21 files changed, 215 insertions(+), 219 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index bcc3b26eb9..6029069458 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,5 +22,5 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.52.1 + version: v1.53.3 working-directory: ${{matrix.working-directory}} diff --git a/.golangci.yml b/.golangci.yml index 817c2c723b..deb6a783da 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,7 +5,6 @@ linters: - asciicheck - bidichk - bodyclose - - depguard - dogsled - dupl - errcheck @@ -13,6 +12,7 @@ linters: - errorlint - exhaustive - exportloopref + - ginkgolinter - goconst - gocritic - gocyclo @@ -62,10 +62,6 @@ linters-settings: go: "1.20" stylecheck: go: "1.20" - depguard: - include-go-root: true - packages: - - io/ioutil # https://go.dev/doc/go1.16#ioutil revive: rules: # The following rules are recommended https://github.com/mgechev/revive#recommended-configuration diff --git a/pkg/cache/cache_test.go b/pkg/cache/cache_test.go index 7f9ed975d6..100825854a 100644 --- a/pkg/cache/cache_test.go +++ b/pkg/cache/cache_test.go @@ -193,7 +193,7 @@ var _ = Describe("Cache with transformers", func() { Expect(obj).NotTo(BeNil()) accessor, err := meta.Accessor(obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) annotations := accessor.GetAnnotations() if _, exists := annotations["transformed"]; exists { @@ -214,7 +214,7 @@ var _ = Describe("Cache with transformers", func() { obj := i.(runtime.Object) Expect(obj).NotTo(BeNil()) accessor, err := meta.Accessor(obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) annotations := accessor.GetAnnotations() if _, exists := annotations["transformed"]; exists { @@ -401,7 +401,7 @@ var _ = Describe("Cache with selectors", func() { var sas corev1.ServiceAccountList err := informerCache.List(informerCacheCtx, &sas) Expect(err).NotTo(HaveOccurred()) - Expect(len(sas.Items)).To(Equal(1)) + Expect(sas.Items).To(HaveLen(1)) Expect(sas.Items[0].Namespace).To(Equal(testNamespaceOne)) }) @@ -409,7 +409,7 @@ var _ = Describe("Cache with selectors", func() { var svcs corev1.ServiceList err := informerCache.List(informerCacheCtx, &svcs) Expect(err).NotTo(HaveOccurred()) - Expect(len(svcs.Items)).To(Equal(1)) + Expect(svcs.Items).To(HaveLen(1)) Expect(svcs.Items[0].Namespace).To(Equal(testNamespaceTwo)) }) }) @@ -618,7 +618,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca Expect(informerCache.List(context.Background(), outList2, client.InNamespace(testNamespaceOne))).To(Succeed()) By("verifying the pointer fields in pod have the same addresses") - Expect(len(outList1.Items)).To(Equal(len(outList2.Items))) + Expect(outList1.Items).To(HaveLen(len(outList2.Items))) sort.SliceStable(outList1.Items, func(i, j int) bool { return outList1.Items[i].Name <= outList1.Items[j].Name }) sort.SliceStable(outList2.Items, func(i, j int) bool { return outList2.Items[i].Name <= outList2.Items[j].Name }) for i := range outList1.Items { @@ -798,7 +798,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(namespacedCache.Start(informerCacheCtx)).To(Succeed()) }() - Expect(namespacedCache.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(namespacedCache.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("listing pods in all namespaces") out := &unstructured.UnstructuredList{} @@ -893,7 +893,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca Expect(informerCache.List(context.Background(), outList2, client.InNamespace(testNamespaceOne))).To(Succeed()) By("verifying the pointer fields in pod have the same addresses") - Expect(len(outList1.Items)).To(Equal(len(outList2.Items))) + Expect(outList1.Items).To(HaveLen(len(outList2.Items))) sort.SliceStable(outList1.Items, func(i, j int) bool { return outList1.Items[i].GetName() <= outList1.Items[j].GetName() }) sort.SliceStable(outList2.Items, func(i, j int) bool { return outList2.Items[i].GetName() <= outList2.Items[j].GetName() }) for i := range outList1.Items { @@ -940,7 +940,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(m.Start(informerCacheCtx)).To(Succeed()) }() - Expect(m.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(m.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("should be able to fetch cluster scoped resource") node := &corev1.Node{} @@ -1079,7 +1079,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(namespacedCache.Start(informerCacheCtx)).To(Succeed()) }() - Expect(namespacedCache.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(namespacedCache.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("listing pods in all namespaces") out := &metav1.PartialObjectMetadataList{} @@ -1179,7 +1179,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca Expect(informerCache.List(context.Background(), outList2, client.InNamespace(testNamespaceOne))).To(Succeed()) By("verifying the pointer fields in pod have the same addresses") - Expect(len(outList1.Items)).To(Equal(len(outList2.Items))) + Expect(outList1.Items).To(HaveLen(len(outList2.Items))) sort.SliceStable(outList1.Items, func(i, j int) bool { return outList1.Items[i].Name <= outList1.Items[j].Name }) sort.SliceStable(outList2.Items, func(i, j int) bool { return outList2.Items[i].Name <= outList2.Items[j].Name }) for i := range outList1.Items { @@ -1238,7 +1238,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(informer.Start(informerCacheCtx)).To(Succeed()) }() - Expect(informer.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(informer.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("Checking with structured") obtainedStructuredPodList := corev1.PodList{} @@ -1415,7 +1415,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(informer.Start(informerCacheCtx)).To(Succeed()) }() - Expect(informer.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(informer.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("listing Pods with restartPolicyOnFailure") listObj := &corev1.PodList{} @@ -1484,7 +1484,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(informer.Start(informerCacheCtx)).To(Succeed()) }() - Expect(informer.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(informer.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("listing Namespaces with fixed indexer") listObj := &corev1.NamespaceList{} @@ -1574,7 +1574,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(informer.Start(informerCacheCtx)).To(Succeed()) }() - Expect(informer.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(informer.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("listing Pods with restartPolicyOnFailure") listObj := &unstructured.UnstructuredList{} @@ -1687,7 +1687,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca defer GinkgoRecover() Expect(informer.Start(informerCacheCtx)).To(Succeed()) }() - Expect(informer.WaitForCacheSync(informerCacheCtx)).NotTo(BeFalse()) + Expect(informer.WaitForCacheSync(informerCacheCtx)).To(BeTrue()) By("listing Pods with restartPolicyOnFailure") listObj := &metav1.PartialObjectMetadataList{} diff --git a/pkg/cache/informer_cache_unit_test.go b/pkg/cache/informer_cache_unit_test.go index 130059bc40..4772223748 100644 --- a/pkg/cache/informer_cache_unit_test.go +++ b/pkg/cache/informer_cache_unit_test.go @@ -93,7 +93,7 @@ var _ = Describe("ip.objectTypeForListObject", func() { &controllertest.UnconventionalListType{}, &controllertest.UnconventionalListTypeList{}, ).AddToScheme(ip.scheme) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) By("calling objectTypeForListObject", func() { diff --git a/pkg/certwatcher/certwatcher_test.go b/pkg/certwatcher/certwatcher_test.go index 7eef9d8b0e..7e12e42679 100644 --- a/pkg/certwatcher/certwatcher_test.go +++ b/pkg/certwatcher/certwatcher_test.go @@ -42,7 +42,7 @@ var _ = Describe("CertWatcher", func() { var _ = Describe("certwatcher New", func() { It("should errors without cert/key", func() { _, err := certwatcher.New("", "") - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) }) }) @@ -57,7 +57,7 @@ var _ = Describe("CertWatcher", func() { ctx, ctxCancel = context.WithCancel(context.Background()) err := writeCerts(certPath, keyPath, "127.0.0.1") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Eventually(func() error { for _, file := range []string{certPath, keyPath} { @@ -72,7 +72,7 @@ var _ = Describe("CertWatcher", func() { }).Should(Succeed()) watcher, err = certwatcher.New(certPath, keyPath) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) startWatcher := func() (done <-chan struct{}) { @@ -108,7 +108,7 @@ var _ = Describe("CertWatcher", func() { firstcert, _ := watcher.GetCertificate(nil) err := writeCerts(certPath, keyPath, "192.168.0.1") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Eventually(func() bool { secondcert, _ := watcher.GetCertificate(nil) @@ -157,7 +157,7 @@ var _ = Describe("CertWatcher", func() { return nil }, "4s").Should(Succeed()) - Expect(os.Remove(keyPath)).To(BeNil()) + Expect(os.Remove(keyPath)).To(Succeed()) Eventually(func() error { readCertificateTotalAfter := testutil.ToFloat64(metrics.ReadCertificateTotal) diff --git a/pkg/client/apiutil/restmapper_test.go b/pkg/client/apiutil/restmapper_test.go index 782a8ce478..265313be7e 100644 --- a/pkg/client/apiutil/restmapper_test.go +++ b/pkg/client/apiutil/restmapper_test.go @@ -110,7 +110,7 @@ func TestLazyRestMapperProvider(t *testing.T) { mappings, err := lazyRestMapper.RESTMappings(schema.GroupKind{Group: "", Kind: "pod"}, "v1") g.Expect(err).NotTo(gmg.HaveOccurred()) - g.Expect(len(mappings)).To(gmg.Equal(1)) + g.Expect(mappings).To(gmg.HaveLen(1)) g.Expect(mappings[0].GroupVersionKind.Kind).To(gmg.Equal("pod")) g.Expect(crt.GetRequestCount()).To(gmg.Equal(2)) @@ -121,7 +121,7 @@ func TestLazyRestMapperProvider(t *testing.T) { kinds, err := lazyRestMapper.KindsFor(schema.GroupVersionResource{Group: "authentication.k8s.io", Version: "v1", Resource: "tokenreviews"}) g.Expect(err).NotTo(gmg.HaveOccurred()) - g.Expect(len(kinds)).To(gmg.Equal(1)) + g.Expect(kinds).To(gmg.HaveLen(1)) g.Expect(kinds[0].Kind).To(gmg.Equal("TokenReview")) g.Expect(crt.GetRequestCount()).To(gmg.Equal(4)) @@ -132,7 +132,7 @@ func TestLazyRestMapperProvider(t *testing.T) { resources, err := lazyRestMapper.ResourcesFor(schema.GroupVersionResource{Group: "policy", Version: "v1", Resource: "poddisruptionbudgets"}) g.Expect(err).NotTo(gmg.HaveOccurred()) - g.Expect(len(resources)).To(gmg.Equal(1)) + g.Expect(resources).To(gmg.HaveLen(1)) g.Expect(resources[0].Resource).To(gmg.Equal("poddisruptionbudgets")) g.Expect(crt.GetRequestCount()).To(gmg.Equal(6)) }) diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index bd368e7a3f..d8b3995050 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -778,7 +778,7 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC Expect(actual.Labels["foo"]).To(Equal("bar")) By("validating patch options were applied") - Expect(testOption.applied).To(Equal(true)) + Expect(testOption.applied).To(BeTrue()) }) }) }) diff --git a/pkg/client/fake/client_test.go b/pkg/client/fake/client_test.go index 705e7b9645..8fd27f29e9 100644 --- a/pkg/client/fake/client_test.go +++ b/pkg/client/fake/client_test.go @@ -113,7 +113,7 @@ var _ = Describe("Fake client", func() { } obj := &appsv1.Deployment{} err := cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(dep)) }) @@ -127,14 +127,14 @@ var _ = Describe("Fake client", func() { obj.SetAPIVersion("apps/v1") obj.SetKind("Deployment") err := cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) It("should be able to List", func() { By("Listing all deployments in a namespace") list := &appsv1.DeploymentList{} err := cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(2)) Expect(list.Items).To(ConsistOf(*dep, *dep2)) }) @@ -145,7 +145,7 @@ var _ = Describe("Fake client", func() { list.SetAPIVersion("apps/v1") list.SetKind("DeploymentList") err := cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(2)) }) @@ -155,7 +155,7 @@ var _ = Describe("Fake client", func() { list.SetAPIVersion("apps/v1") list.SetKind("Deployment") err := cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(2)) }) @@ -166,7 +166,7 @@ var _ = Describe("Fake client", func() { list.SetAPIVersion("v1") list.SetKind("EndpointsList") err := cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) } @@ -182,25 +182,25 @@ var _ = Describe("Fake client", func() { By("Adding the object during client initialization") cl = NewFakeClient(unstructuredEndpoint()) list() - Expect(cl.Delete(context.Background(), unstructuredEndpoint())).To(BeNil()) + Expect(cl.Delete(context.Background(), unstructuredEndpoint())).To(Succeed()) By("Creating an object") item := unstructuredEndpoint() err := cl.Create(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) list() By("Updating the object") item.SetAnnotations(map[string]string{"foo": "bar"}) err = cl.Update(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) list() By("Patching the object") old := item.DeepCopy() item.SetAnnotations(map[string]string{"bar": "baz"}) err = cl.Patch(context.Background(), item, client.MergeFrom(old)) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) list() }) @@ -210,7 +210,7 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err := cl.Create(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) It("should be able to Get an unregisted type using unstructured", func() { @@ -220,7 +220,7 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err := cl.Create(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting and the object") item = &unstructured.Unstructured{} @@ -228,7 +228,7 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err = cl.Get(context.Background(), client.ObjectKeyFromObject(item), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) It("should be able to List an unregistered type using unstructured", func() { @@ -236,7 +236,7 @@ var _ = Describe("Fake client", func() { list.SetAPIVersion("custom/v3") list.SetKind("ImageList") err := cl.List(context.Background(), list) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) It("should be able to List an unregistered type using unstructured", func() { @@ -244,7 +244,7 @@ var _ = Describe("Fake client", func() { list.SetAPIVersion("custom/v4") list.SetKind("Image") err := cl.List(context.Background(), list) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) It("should be able to Update an unregistered type using unstructured", func() { @@ -254,13 +254,13 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err := cl.Create(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Updating the object") err = unstructured.SetNestedField(item.Object, int64(2), "spec", "replicas") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) err = cl.Update(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") item = &unstructured.Unstructured{} @@ -268,11 +268,11 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err = cl.Get(context.Background(), client.ObjectKeyFromObject(item), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Inspecting the object") value, found, err := unstructured.NestedInt64(item.Object, "spec", "replicas") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(found).To(BeTrue()) Expect(value).To(Equal(int64(2))) }) @@ -284,14 +284,14 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err := cl.Create(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Updating the object") original := item.DeepCopy() err = unstructured.SetNestedField(item.Object, int64(2), "spec", "replicas") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) err = cl.Patch(context.Background(), item, client.MergeFrom(original)) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") item = &unstructured.Unstructured{} @@ -299,11 +299,11 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err = cl.Get(context.Background(), client.ObjectKeyFromObject(item), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Inspecting the object") value, found, err := unstructured.NestedInt64(item.Object, "spec", "replicas") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(found).To(BeTrue()) Expect(value).To(Equal(int64(2))) }) @@ -315,11 +315,11 @@ var _ = Describe("Fake client", func() { item.SetKind("Image") item.SetName("my-item") err := cl.Create(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Deleting the object") err = cl.Delete(context.Background(), item) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") item = &unstructured.Unstructured{} @@ -337,7 +337,7 @@ var _ = Describe("Fake client", func() { client.MatchingLabels(map[string]string{ "test-label": "label-value", })) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) Expect(list.Items).To(ConsistOf(*dep2)) }) @@ -347,7 +347,7 @@ var _ = Describe("Fake client", func() { list := &appsv1.DeploymentList{} err := cl.List(context.Background(), list, client.InNamespace("ns1"), client.HasLabels{"test-label"}) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) Expect(list.Items).To(ConsistOf(*dep2)) }) @@ -365,7 +365,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newcm) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the new configmap") namespacedName := types.NamespacedName{ @@ -374,7 +374,7 @@ var _ = Describe("Fake client", func() { } obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(newcm)) Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1")) }) @@ -398,7 +398,7 @@ var _ = Describe("Fake client", func() { submitted.ResourceVersion = "" submittedReference := submitted.DeepCopy() err := cl.Create(context.Background(), submitted) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(apierrors.IsAlreadyExists(err)).To(BeTrue()) Expect(submitted).To(Equal(submittedReference)) }) @@ -449,7 +449,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newcm) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Listing configmaps with a particular label") list := &corev1.ConfigMapList{} @@ -457,7 +457,7 @@ var _ = Describe("Fake client", func() { client.MatchingLabels(map[string]string{ "test-label": "label-value", })) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) Expect(list.Items[0].Name).NotTo(BeEmpty()) }) @@ -479,7 +479,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Update(context.Background(), newcm) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the new configmap") namespacedName := types.NamespacedName{ @@ -488,7 +488,7 @@ var _ = Describe("Fake client", func() { } obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(newcm)) Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1000")) }) @@ -509,7 +509,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Update(context.Background(), newcm) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the configmap") namespacedName := types.NamespacedName{ @@ -518,7 +518,7 @@ var _ = Describe("Fake client", func() { } obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(newcm)) Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1000")) }) @@ -627,7 +627,7 @@ var _ = Describe("Fake client", func() { } obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(cm)) Expect(obj.ObjectMeta.ResourceVersion).To(Equal(trackerAddResourceVersion)) }) @@ -640,7 +640,7 @@ var _ = Describe("Fake client", func() { list := &appsv1.DeploymentList{} err = cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(2)) Expect(list.Items).To(ConsistOf(*dep, *dep2)) }) @@ -649,11 +649,11 @@ var _ = Describe("Fake client", func() { goodRV := trackerAddResourceVersion By("Deleting with a matching ResourceVersion Precondition") err := cl.Delete(context.Background(), dep, client.Preconditions{ResourceVersion: &goodRV}) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) list := &appsv1.DeploymentList{} err = cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) Expect(list.Items).To(ConsistOf(*dep2)) }) @@ -661,12 +661,12 @@ var _ = Describe("Fake client", func() { It("should be able to Delete with no ResourceVersion Precondition", func() { By("Deleting a deployment") err := cl.Delete(context.Background(), dep) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Listing all deployments in the namespace") list := &appsv1.DeploymentList{} err = cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) Expect(list.Items).To(ConsistOf(*dep2)) }) @@ -676,12 +676,12 @@ var _ = Describe("Fake client", func() { depCopy := dep.DeepCopy() depCopy.ResourceVersion = "bogus" err := cl.Delete(context.Background(), depCopy) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Listing all deployments in the namespace") list := &appsv1.DeploymentList{} err = cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(HaveLen(1)) Expect(list.Items).To(ConsistOf(*dep2)) }) @@ -703,22 +703,22 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Deleting the object") err = cl.Delete(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj.DeletionTimestamp).NotTo(BeNil()) By("Removing the finalizer") obj.Finalizers = []string{} err = cl.Update(context.Background(), obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") obj = &corev1.ConfigMap{} @@ -742,47 +742,47 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj.DeletionTimestamp).To(BeNil()) By("Adding deletionTimestamp") now := metav1.Now() obj.DeletionTimestamp = &now err = cl.Update(context.Background(), obj) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) By("Deleting the object") err = cl.Delete(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Changing the deletionTimestamp to new value") obj = &corev1.ConfigMap{} t := metav1.NewTime(time.Now().Add(time.Second)) obj.DeletionTimestamp = &t err = cl.Update(context.Background(), obj) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) By("Removing deletionTimestamp") obj.DeletionTimestamp = nil err = cl.Update(context.Background(), obj) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) It("should be able to Delete a Collection", func() { By("Deleting a deploymentList") err := cl.DeleteAllOf(context.Background(), &appsv1.Deployment{}, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Listing all deployments in the namespace") list := &appsv1.DeploymentList{} err = cl.List(context.Background(), list, client.InNamespace("ns1")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(list.Items).To(BeEmpty()) }) @@ -804,18 +804,18 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) } By("Deleting the object") err := cl.DeleteAllOf(context.Background(), &corev1.ConfigMap{}, client.InNamespace("delete-collection-with-finalizers")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) configmaps := corev1.ConfigMapList{} err = cl.List(context.Background(), &configmaps, client.InNamespace("delete-collection-with-finalizers")) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) - Expect(len(configmaps.Items)).To(Equal(5)) + Expect(configmaps.Items).To(HaveLen(5)) for _, cm := range configmaps.Items { Expect(cm.DeletionTimestamp).NotTo(BeNil()) } @@ -857,7 +857,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newcm, client.DryRunAll) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the new configmap") namespacedName := types.NamespacedName{ @@ -884,7 +884,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Update(context.Background(), newcm, client.DryRunAll) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the new configmap") namespacedName := types.NamespacedName{ @@ -893,7 +893,7 @@ var _ = Describe("Fake client", func() { } obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(cm)) Expect(obj.ObjectMeta.ResourceVersion).To(Equal(trackerAddResourceVersion)) }) @@ -901,11 +901,11 @@ var _ = Describe("Fake client", func() { It("Should not Delete the object", func() { By("Deleting a configmap with DryRun with Delete()") err := cl.Delete(context.Background(), cm, client.DryRunAll) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Deleting a configmap with DryRun with DeleteAllOf()") err = cl.DeleteAllOf(context.Background(), cm, client.DryRunAll) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the configmap") namespacedName := types.NamespacedName{ @@ -914,7 +914,7 @@ var _ = Describe("Fake client", func() { } obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(cm)) Expect(obj.ObjectMeta.ResourceVersion).To(Equal(trackerAddResourceVersion)) }) @@ -965,12 +965,12 @@ var _ = Describe("Fake client", func() { } err := cl.Create(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") obj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj.DeletionTimestamp).To(BeNil()) }) @@ -1013,7 +1013,7 @@ var _ = Describe("Fake client", func() { By("Getting the object") obj = &corev1.ConfigMap{} err := cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) @@ -1035,7 +1035,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Add a deletionTimestamp") obj := &corev1.ConfigMap{ @@ -1047,16 +1047,16 @@ var _ = Describe("Fake client", func() { }, } err = cl.Patch(context.Background(), obj, client.MergeFrom(newObj)) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) By("Deleting the object") err = cl.Delete(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") obj = &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj.DeletionTimestamp).NotTo(BeNil()) By("Changing the deletionTimestamp to new value") @@ -1064,7 +1064,7 @@ var _ = Describe("Fake client", func() { t := metav1.NewTime(time.Now().Add(time.Second)) newObj.DeletionTimestamp = &t err = cl.Patch(context.Background(), newObj, client.MergeFrom(obj)) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) By("Removing deletionTimestamp") newObj = &corev1.ConfigMap{ @@ -1075,7 +1075,7 @@ var _ = Describe("Fake client", func() { }, } err = cl.Patch(context.Background(), newObj, client.MergeFrom(obj)) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) @@ -1096,11 +1096,11 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Deleting the object") err = cl.Delete(context.Background(), newObj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Removing the finalizer") obj := &corev1.ConfigMap{ @@ -1111,7 +1111,7 @@ var _ = Describe("Fake client", func() { }, } err = cl.Patch(context.Background(), obj, client.MergeFrom(newObj)) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Getting the object") obj = &corev1.ConfigMap{} @@ -1136,7 +1136,7 @@ var _ = Describe("Fake client", func() { }, } err := cl.Create(context.Background(), obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Removing the finalizer") mergePatch, err := json.Marshal(map[string]interface{}{ @@ -1146,18 +1146,18 @@ var _ = Describe("Fake client", func() { }, }, }) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) err = cl.Patch(context.Background(), obj, client.RawPatch(types.StrategicMergePatchType, mergePatch)) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) By("Check the finalizer has been removed in the object") - Expect(len(obj.Finalizers)).To(Equal(0)) + Expect(obj.Finalizers).To(BeEmpty()) By("Check the finalizer has been removed in client") newObj := &corev1.ConfigMap{} err = cl.Get(context.Background(), namespacedName, newObj) - Expect(err).To(BeNil()) - Expect(len(newObj.Finalizers)).To(Equal(0)) + Expect(err).ToNot(HaveOccurred()) + Expect(newObj.Finalizers).To(BeEmpty()) }) } @@ -1229,7 +1229,7 @@ var _ = Describe("Fake client", func() { FieldSelector: fields.OneTermEqualSelector("key", "val"), } err := cl.List(context.Background(), &corev1.ConfigMapList{}, listOpts) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) It("errors when there's no Index matching the field name", func() { @@ -1237,7 +1237,7 @@ var _ = Describe("Fake client", func() { FieldSelector: fields.OneTermEqualSelector("spec.paused", "false"), } err := cl.List(context.Background(), &appsv1.DeploymentList{}, listOpts) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) It("errors when field selector uses two requirements", func() { @@ -1247,7 +1247,7 @@ var _ = Describe("Fake client", func() { fields.OneTermEqualSelector("spec.strategy.type", string(appsv1.RecreateDeploymentStrategyType)), )} err := cl.List(context.Background(), &appsv1.DeploymentList{}, listOpts) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) It("returns two deployments that match the only field selector requirement", func() { @@ -1335,7 +1335,7 @@ var _ = Describe("Fake client", func() { fields.OneTermEqualSelector("spec.strategy.type", string(appsv1.RecreateDeploymentStrategyType)), )} err := cl.List(context.Background(), &appsv1.DeploymentList{}, listOpts) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) }) }) @@ -1371,12 +1371,12 @@ var _ = Describe("Fake client", func() { } obj := &appsv1.Deployment{} err := cl.Get(context.Background(), namespacedName, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(dep)) By("Getting a deployment from clientSet") csDep2, err := clientSet.AppsV1().Deployments("ns1").Get(context.Background(), "test-deployment-2", metav1.GetOptions{}) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(csDep2).To(Equal(dep2)) By("Getting a new deployment") @@ -1401,11 +1401,11 @@ var _ = Describe("Fake client", func() { } _, err = clientSet.AppsV1().Deployments("ns1").Create(context.Background(), dep3, metav1.CreateOptions{}) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) obj = &appsv1.Deployment{} err = cl.Get(context.Background(), namespacedName3, obj) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(obj).To(Equal(dep3)) }) @@ -1421,9 +1421,9 @@ var _ = Describe("Fake client", func() { cl := NewClientBuilder().WithStatusSubresource(obj).WithObjects(obj).Build() obj.Status.NodeInfo.MachineID = "updated-machine-id" - Expect(cl.Update(context.Background(), obj)).To(BeNil()) + Expect(cl.Update(context.Background(), obj)).To(Succeed()) - Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(BeNil()) + Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed()) Expect(obj.Status).To(BeEquivalentTo(corev1.NodeStatus{NodeInfo: corev1.NodeSystemInfo{MachineID: "machine-id"}})) }) @@ -1485,13 +1485,13 @@ var _ = Describe("Fake client", func() { }, }, } - Expect(cl.Create(context.Background(), obj)).To(BeNil()) + Expect(cl.Create(context.Background(), obj)).To(Succeed()) original := obj.DeepCopy() obj.Status.NodeInfo.MachineID = "machine-id-from-patch" - Expect(cl.Patch(context.Background(), obj, client.MergeFrom(original))).To(BeNil()) + Expect(cl.Patch(context.Background(), obj, client.MergeFrom(original))).To(Succeed()) - Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(BeNil()) + Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed()) Expect(obj.Status).To(BeEquivalentTo(corev1.NodeStatus{NodeInfo: corev1.NodeSystemInfo{MachineID: "machine-id"}})) }) @@ -1534,11 +1534,11 @@ var _ = Describe("Fake client", func() { cl := NewClientBuilder().WithStatusSubresource(obj).WithObjects(obj).Build() err = unstructured.SetNestedField(obj.Object, map[string]any{"state": "new"}, "status") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) - Expect(cl.Update(context.Background(), obj)).To(BeNil()) + Expect(cl.Update(context.Background(), obj)).To(Succeed()) - Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(BeNil()) + Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed()) Expect(obj.Object["status"]).To(BeEquivalentTo(map[string]any{"state": "old"})) }) @@ -1557,10 +1557,10 @@ var _ = Describe("Fake client", func() { err = unstructured.SetNestedField(obj.Object, "from-status-update", "spec") Expect(err).NotTo(HaveOccurred()) err = unstructured.SetNestedField(obj.Object, map[string]any{"state": "new"}, "status") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) - Expect(cl.Status().Update(context.Background(), obj)).To(BeNil()) - Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(BeNil()) + Expect(cl.Status().Update(context.Background(), obj)).To(Succeed()) + Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed()) Expect(obj.Object["status"]).To(BeEquivalentTo(map[string]any{"state": "new"})) Expect(obj.Object["spec"]).To(BeEquivalentTo("original")) @@ -1573,14 +1573,14 @@ var _ = Describe("Fake client", func() { obj.SetName("a-foo") cl := NewClientBuilder().WithStatusSubresource(obj).Build() - Expect(cl.Create(context.Background(), obj)).To(BeNil()) + Expect(cl.Create(context.Background(), obj)).To(Succeed()) original := obj.DeepCopy() err := unstructured.SetNestedField(obj.Object, map[string]interface{}{"count": int64(2)}, "status") - Expect(err).To(BeNil()) - Expect(cl.Patch(context.Background(), obj, client.MergeFrom(original))).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) + Expect(cl.Patch(context.Background(), obj, client.MergeFrom(original))).To(Succeed()) - Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(BeNil()) + Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed()) Expect(obj.Object["status"]).To(BeNil()) @@ -1601,10 +1601,10 @@ var _ = Describe("Fake client", func() { err = unstructured.SetNestedField(obj.Object, "from-status-update", "spec") Expect(err).NotTo(HaveOccurred()) err = unstructured.SetNestedField(obj.Object, map[string]any{"state": "new"}, "status") - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) - Expect(cl.Status().Patch(context.Background(), obj, client.MergeFrom(original))).To(BeNil()) - Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(BeNil()) + Expect(cl.Status().Patch(context.Background(), obj, client.MergeFrom(original))).To(Succeed()) + Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed()) Expect(obj.Object["status"]).To(BeEquivalentTo(map[string]any{"state": "new"})) Expect(obj.Object["spec"]).To(BeEquivalentTo("original")) @@ -1659,7 +1659,7 @@ var _ = Describe("Fake client", func() { cl := NewClientBuilder().Build() err := cl.SubResource("eviction-subresource").Create(context.Background(), &corev1.Namespace{}, tp) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) }) } diff --git a/pkg/client/namespaced_client_test.go b/pkg/client/namespaced_client_test.go index 1692b7fcd9..6e1c2641a3 100644 --- a/pkg/client/namespaced_client_test.go +++ b/pkg/client/namespaced_client_test.go @@ -47,9 +47,9 @@ var _ = Describe("NamespacedClient", func() { var sch = runtime.NewScheme() err := rbacv1.AddToScheme(sch) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) err = appsv1.AddToScheme(sch) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) nonNamespacedClient, err := client.New(cfg, client.Options{Scheme: sch}) Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/client/options_test.go b/pkg/client/options_test.go index a1208f1bfd..8a90c14dda 100644 --- a/pkg/client/options_test.go +++ b/pkg/client/options_test.go @@ -233,7 +233,7 @@ var _ = Describe("MatchingLabels", func() { r, _ := listOpts.LabelSelector.Requirements() _, err := labels.NewRequirement(r[0].Key(), r[0].Operator(), r[0].Values().List()) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) expectedErrMsg := `values[0][k]: Invalid value: "axahm2EJ8Phiephe2eixohbee9eGeiyees1thuozi1xoh0GiuH3diewi8iem7Nui": must be no more than 63 characters` Expect(err.Error()).To(Equal(expectedErrMsg)) }) @@ -296,13 +296,13 @@ var _ = Describe("ForceOwnership", func() { o := &client.PatchOptions{} t := client.ForceOwnership t.ApplyToPatch(o) - Expect(*o.Force).To(Equal(true)) + Expect(*o.Force).To(BeTrue()) }) It("Should apply to SubResourcePatchOptions", func() { o := &client.SubResourcePatchOptions{PatchOptions: client.PatchOptions{}} t := client.ForceOwnership t.ApplyToSubResourcePatch(o) - Expect(*o.Force).To(Equal(true)) + Expect(*o.Force).To(BeTrue()) }) }) diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 329c0296c5..a38de41076 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -26,7 +26,7 @@ var _ = Describe("config", func() { It("should error loading from non existent file", func() { loader := config.File() _, err := loader.Complete() - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) }) It("should load a config from file", func() { @@ -35,9 +35,9 @@ var _ = Describe("config", func() { Expect(conf.CacheNamespace).To(Equal("")) _, err := loader.Complete() - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) - Expect(*conf.LeaderElection.LeaderElect).To(Equal(true)) + Expect(*conf.LeaderElection.LeaderElect).To(BeTrue()) Expect(conf.CacheNamespace).To(Equal("default")) Expect(conf.Metrics.BindAddress).To(Equal(":8081")) }) diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go index af818d12cd..f0a981651d 100644 --- a/pkg/controller/controller_suite_test.go +++ b/pkg/controller/controller_suite_test.go @@ -57,7 +57,7 @@ var _ = BeforeSuite(func() { &controllertest.UnconventionalListType{}, &controllertest.UnconventionalListTypeList{}, ).AddToScheme(scheme.Scheme) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) testenv = &envtest.Environment{ CRDDirectoryPaths: []string{"testdata/crds"}, diff --git a/pkg/controller/controllerutil/controllerutil_test.go b/pkg/controller/controllerutil/controllerutil_test.go index d176c4fb6a..a058ce0714 100644 --- a/pkg/controller/controllerutil/controllerutil_test.go +++ b/pkg/controller/controllerutil/controllerutil_test.go @@ -758,12 +758,12 @@ var _ = Describe("Controllerutil", func() { Describe("ContainsFinalizer", func() { It("should check that finalizer is present", func() { controllerutil.AddFinalizer(deploy, testFinalizer) - Expect(controllerutil.ContainsFinalizer(deploy, testFinalizer)).To(Equal(true)) + Expect(controllerutil.ContainsFinalizer(deploy, testFinalizer)).To(BeTrue()) }) It("should check that finalizer is not present after RemoveFinalizer call", func() { controllerutil.RemoveFinalizer(deploy, testFinalizer) - Expect(controllerutil.ContainsFinalizer(deploy, testFinalizer)).To(Equal(false)) + Expect(controllerutil.ContainsFinalizer(deploy, testFinalizer)).To(BeFalse()) }) }) }) diff --git a/pkg/envtest/webhook_test.go b/pkg/envtest/webhook_test.go index 2cbc9ab9c8..3a87052580 100644 --- a/pkg/envtest/webhook_test.go +++ b/pkg/envtest/webhook_test.go @@ -100,8 +100,8 @@ var _ = Describe("Test", func() { } err := parseWebhook(&installOptions) Expect(err).NotTo(HaveOccurred()) - Expect(len(installOptions.MutatingWebhooks)).To(Equal(2)) - Expect(len(installOptions.ValidatingWebhooks)).To(Equal(2)) + Expect(installOptions.MutatingWebhooks).To(HaveLen(2)) + Expect(installOptions.ValidatingWebhooks).To(HaveLen(2)) }) It("should load webhooks from files", func() { @@ -110,8 +110,8 @@ var _ = Describe("Test", func() { } err := parseWebhook(&installOptions) Expect(err).NotTo(HaveOccurred()) - Expect(len(installOptions.MutatingWebhooks)).To(Equal(2)) - Expect(len(installOptions.ValidatingWebhooks)).To(Equal(2)) + Expect(installOptions.MutatingWebhooks).To(HaveLen(2)) + Expect(installOptions.ValidatingWebhooks).To(HaveLen(2)) }) }) }) diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go index eb85bd020a..02fbdf003c 100644 --- a/pkg/finalizer/finalizer_test.go +++ b/pkg/finalizer/finalizer_test.go @@ -41,16 +41,16 @@ var _ = Describe("TestFinalizer", func() { Describe("Register", func() { It("successfully registers a finalizer", func() { err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) }) It("should fail when trying to register a finalizer that was already registered", func() { err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) // calling Register again with the same key should return an error err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("already registered")) }) @@ -59,16 +59,16 @@ var _ = Describe("TestFinalizer", func() { Describe("Finalize", func() { It("successfully finalizes and returns true for Updated when deletion timestamp is nil and finalizer does not exist", func() { err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) pod.DeletionTimestamp = nil pod.Finalizers = []string{} result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(result.Updated).To(BeTrue()) // when deletion timestamp is nil and finalizer is not present, the registered finalizer would be added to the obj - Expect(len(pod.Finalizers)).To(Equal(1)) + Expect(pod.Finalizers).To(HaveLen(1)) Expect(pod.Finalizers[0]).To(Equal("finalizers.sigs.k8s.io/testfinalizer")) }) @@ -78,15 +78,15 @@ var _ = Describe("TestFinalizer", func() { pod.DeletionTimestamp = &now err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) pod.Finalizers = []string{"finalizers.sigs.k8s.io/testfinalizer"} result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(result.Updated).To(BeTrue()) // finalizer will be removed from the obj upon successful finalization - Expect(len(pod.Finalizers)).To(Equal(0)) + Expect(pod.Finalizers).To(BeEmpty()) }) It("should return no error and return false for Updated when deletion timestamp is nil and finalizer doesn't exist", func() { @@ -94,9 +94,9 @@ var _ = Describe("TestFinalizer", func() { pod.Finalizers = []string{} result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(result.Updated).To(BeFalse()) - Expect(len(pod.Finalizers)).To(Equal(0)) + Expect(pod.Finalizers).To(BeEmpty()) }) @@ -106,9 +106,9 @@ var _ = Describe("TestFinalizer", func() { pod.Finalizers = []string{} result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(result.Updated).To(BeFalse()) - Expect(len(pod.Finalizers)).To(Equal(0)) + Expect(pod.Finalizers).To(BeEmpty()) }) @@ -117,18 +117,18 @@ var _ = Describe("TestFinalizer", func() { pod.DeletionTimestamp = &now err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) err = finalizers.Register("finalizers.sigs.k8s.io/newtestfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) pod.Finalizers = []string{"finalizers.sigs.k8s.io/testfinalizer", "finalizers.sigs.k8s.io/newtestfinalizer"} result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(result.Updated).To(BeTrue()) Expect(result.StatusUpdated).To(BeFalse()) - Expect(len(pod.Finalizers)).To(Equal(0)) + Expect(pod.Finalizers).To(BeEmpty()) }) It("should return result as false and a non-nil error", func() { @@ -141,14 +141,14 @@ var _ = Describe("TestFinalizer", func() { f.err = fmt.Errorf("finalizer failed for %q", pod.Finalizers[0]) err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("finalizer failed")) Expect(result.Updated).To(BeFalse()) Expect(result.StatusUpdated).To(BeFalse()) - Expect(len(pod.Finalizers)).To(Equal(1)) + Expect(pod.Finalizers).To(HaveLen(1)) Expect(pod.Finalizers[0]).To(Equal("finalizers.sigs.k8s.io/testfinalizer")) }) @@ -167,15 +167,15 @@ var _ = Describe("TestFinalizer", func() { f.result.StatusUpdated = false f.err = nil err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer1", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) result, err := finalizers.Finalize(context.TODO(), pod) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(result.Updated).To(BeTrue()) Expect(result.StatusUpdated).To(BeFalse()) // `finalizers.sigs.k8s.io/testfinalizer1` will be removed from the list // of finalizers, so length will be 2. - Expect(len(pod.Finalizers)).To(Equal(2)) + Expect(pod.Finalizers).To(HaveLen(2)) Expect(pod.Finalizers[0]).To(Equal("finalizers.sigs.k8s.io/testfinalizer2")) Expect(pod.Finalizers[1]).To(Equal("finalizers.sigs.k8s.io/testfinalizer3")) @@ -184,14 +184,14 @@ var _ = Describe("TestFinalizer", func() { f.result.StatusUpdated = false f.err = fmt.Errorf("finalizer failed") err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer2", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) result, err = finalizers.Finalize(context.TODO(), pod) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("finalizer failed")) Expect(result.Updated).To(BeFalse()) Expect(result.StatusUpdated).To(BeFalse()) - Expect(len(pod.Finalizers)).To(Equal(2)) + Expect(pod.Finalizers).To(HaveLen(2)) Expect(pod.Finalizers[0]).To(Equal("finalizers.sigs.k8s.io/testfinalizer2")) Expect(pod.Finalizers[1]).To(Equal("finalizers.sigs.k8s.io/testfinalizer3")) @@ -200,14 +200,14 @@ var _ = Describe("TestFinalizer", func() { f.result.StatusUpdated = true f.err = fmt.Errorf("finalizer failed") err = finalizers.Register("finalizers.sigs.k8s.io/testfinalizer3", f) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) result, err = finalizers.Finalize(context.TODO(), pod) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("finalizer failed")) Expect(result.Updated).To(BeTrue()) Expect(result.StatusUpdated).To(BeTrue()) - Expect(len(pod.Finalizers)).To(Equal(2)) + Expect(pod.Finalizers).To(HaveLen(2)) Expect(pod.Finalizers[0]).To(Equal("finalizers.sigs.k8s.io/testfinalizer2")) Expect(pod.Finalizers[1]).To(Equal("finalizers.sigs.k8s.io/testfinalizer3")) }) diff --git a/pkg/internal/controller/controller_test.go b/pkg/internal/controller/controller_test.go index d669b1acf0..05f84dc7b3 100644 --- a/pkg/internal/controller/controller_test.go +++ b/pkg/internal/controller/controller_test.go @@ -259,7 +259,7 @@ var _ = Describe("controller", func() { }} e := ctrl.Start(ctx) - Expect(e).NotTo(BeNil()) + Expect(e).To(HaveOccurred()) Expect(e.Error()).To(ContainSubstring("must specify Channel.Source")) }) @@ -305,9 +305,9 @@ var _ = Describe("controller", func() { // Use a cancelled context so Start doesn't block ctx, cancel := context.WithCancel(context.Background()) cancel() - Expect(ctrl.Start(ctx)).To(BeNil()) + Expect(ctrl.Start(ctx)).To(Succeed()) err := ctrl.Start(ctx) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("controller was started more than once. This is likely to be caused by being added to a manager multiple times")) }) diff --git a/pkg/internal/recorder/recorder_test.go b/pkg/internal/recorder/recorder_test.go index 804bdb3d21..e226e165a3 100644 --- a/pkg/internal/recorder/recorder_test.go +++ b/pkg/internal/recorder/recorder_test.go @@ -39,7 +39,7 @@ var _ = Describe("recorder.Provider", func() { cfg1 := *cfg cfg1.Host = "invalid host" _, err := recorder.NewProvider(&cfg1, httpClient, scheme.Scheme, logr.Discard(), makeBroadcaster) - Expect(err).NotTo(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("failed to init client")) }) }) diff --git a/pkg/internal/testing/process/bin_path_finder_test.go b/pkg/internal/testing/process/bin_path_finder_test.go index 1b15941840..425459e3aa 100644 --- a/pkg/internal/testing/process/bin_path_finder_test.go +++ b/pkg/internal/testing/process/bin_path_finder_test.go @@ -28,12 +28,12 @@ var _ = Describe("BinPathFinder", func() { BeforeEach(func() { prevAssetPath = os.Getenv(EnvAssetsPath) Expect(os.Unsetenv(EnvAssetsPath)).To(Succeed()) - Expect(os.Unsetenv(EnvAssetOverridePrefix + "_SOME_FAKE")) - Expect(os.Unsetenv(EnvAssetOverridePrefix + "OTHERFAKE")) + Expect(os.Unsetenv(EnvAssetOverridePrefix + "_SOME_FAKE")).To(Succeed()) + Expect(os.Unsetenv(EnvAssetOverridePrefix + "OTHERFAKE")).To(Succeed()) }) AfterEach(func() { if prevAssetPath != "" { - Expect(os.Setenv(EnvAssetsPath, prevAssetPath)) + Expect(os.Setenv(EnvAssetsPath, prevAssetPath)).To(Succeed()) } }) Context("when individual overrides are present", func() { diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go index 86118ca0a6..0186f46f8b 100644 --- a/pkg/manager/manager_test.go +++ b/pkg/manager/manager_test.go @@ -154,7 +154,7 @@ var _ = Describe("manger.Manager", func() { } m, err := Options{}.AndFrom(&fakeDeferredLoader{ccfg}) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(*m.SyncPeriod).To(Equal(duration.Duration)) Expect(m.LeaderElection).To(Equal(leaderElect)) @@ -233,10 +233,10 @@ var _ = Describe("manger.Manager", func() { TLSOpts: optionsTlSOptsFuncs, }), }.AndFrom(&fakeDeferredLoader{ccfg}) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(m.SyncPeriod.String()).To(Equal(optDuration.String())) - Expect(m.LeaderElection).To(Equal(true)) + Expect(m.LeaderElection).To(BeTrue()) Expect(m.LeaderElectionResourceLock).To(Equal("configmaps")) Expect(m.LeaderElectionNamespace).To(Equal("ctrl")) Expect(m.LeaderElectionID).To(Equal("ctrl-configmap")) @@ -319,7 +319,7 @@ var _ = Describe("manger.Manager", func() { MetricsBindAddress: "0", PprofBindAddress: "0", }) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) runnableDone := make(chan struct{}) slowRunnable := RunnableFunc(func(ctx context.Context) error { @@ -328,7 +328,7 @@ var _ = Describe("manger.Manager", func() { close(runnableDone) return nil }) - Expect(m.Add(slowRunnable)).To(BeNil()) + Expect(m.Add(slowRunnable)).To(Succeed()) cm := m.(*controllerManager) cm.gracefulShutdownTimeout = time.Second @@ -341,7 +341,7 @@ var _ = Describe("manger.Manager", func() { mgrDone := make(chan struct{}) go func() { defer GinkgoRecover() - Expect(m.Start(ctx)).To(BeNil()) + Expect(m.Start(ctx)).To(Succeed()) close(mgrDone) }() <-cm.Elected() @@ -365,7 +365,7 @@ var _ = Describe("manger.Manager", func() { MetricsBindAddress: "0", PprofBindAddress: "0", }) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -373,7 +373,7 @@ var _ = Describe("manger.Manager", func() { go func() { defer GinkgoRecover() err := m.Start(ctx) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("leader election lost")) close(mgrDone) }() @@ -525,7 +525,7 @@ var _ = Describe("manger.Manager", func() { return rl, err }, }) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) ctx, cancel := context.WithCancel(context.Background()) doneCh := make(chan struct{}) @@ -541,7 +541,7 @@ var _ = Describe("manger.Manager", func() { ctx, cancel = context.WithCancel(context.Background()) defer cancel() record, _, err := rl.Get(ctx) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(record.HolderIdentity).To(BeEmpty()) }) When("using a custom LeaderElectionResourceLockInterface", func() { @@ -821,7 +821,7 @@ var _ = Describe("manger.Manager", func() { ctx, cancel := context.WithCancel(context.Background()) defer cancel() err = m.Start(ctx) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("expected error")) }) @@ -993,7 +993,7 @@ var _ = Describe("manger.Manager", func() { m.(*controllerManager).gracefulShutdownTimeout = 1 * time.Nanosecond Expect(m.Add(RunnableFunc(func(context.Context) error { return runnableError{} - }))) + }))).To(Succeed()) testDone := make(chan struct{}) defer close(testDone) Expect(m.Add(RunnableFunc(func(ctx context.Context) error { @@ -1006,11 +1006,11 @@ var _ = Describe("manger.Manager", func() { case <-timer.C: return nil } - }))) + }))).To(Succeed()) ctx, cancel := context.WithCancel(context.Background()) defer cancel() err = m.Start(ctx) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) eMsg := "[not feeling like that, failed waiting for all runnables to end within grace period of 1ns: context deadline exceeded]" Expect(err.Error()).To(Equal(eMsg)) Expect(errors.Is(err, context.DeadlineExceeded)).To(BeTrue()) @@ -1027,7 +1027,7 @@ var _ = Describe("manger.Manager", func() { Expect(m.Add(RunnableFunc(func(ctx context.Context) error { <-ctx.Done() return nil - }))) + }))).To(Succeed()) testDone := make(chan struct{}) defer close(testDone) Expect(m.Add(RunnableFunc(func(ctx context.Context) error { @@ -1040,7 +1040,7 @@ var _ = Describe("manger.Manager", func() { case <-timer.C: return nil } - }))).NotTo(HaveOccurred()) + }))).To(Succeed()) ctx, cancel := context.WithCancel(context.Background()) managerStopDone := make(chan struct{}) go func() { err = m.Start(ctx); close(managerStopDone) }() @@ -1049,7 +1049,7 @@ var _ = Describe("manger.Manager", func() { <-m.(*controllerManager).elected cancel() <-managerStopDone - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("failed waiting for all runnables to end within grace period of 1ns: context deadline exceeded")) Expect(errors.Is(err, context.DeadlineExceeded)).To(BeTrue()) Expect(errors.Is(err, runnableError{})).ToNot(BeTrue()) @@ -1063,11 +1063,11 @@ var _ = Describe("manger.Manager", func() { } Expect(m.Add(RunnableFunc(func(context.Context) error { return runnableError{} - }))) + }))).To(Succeed()) ctx, cancel := context.WithCancel(context.Background()) defer cancel() err = m.Start(ctx) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("not feeling like that")) Expect(errors.Is(err, context.DeadlineExceeded)).ToNot(BeTrue()) Expect(errors.Is(err, runnableError{})).To(BeTrue()) @@ -1669,7 +1669,7 @@ var _ = Describe("manger.Manager", func() { }).Should(BeTrue()) err = m.Start(ctx) - Expect(err).ToNot(BeNil()) + Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("manager already started")) }) diff --git a/pkg/source/source_test.go b/pkg/source/source_test.go index 1e0e3afed3..f5e231d540 100644 --- a/pkg/source/source_test.go +++ b/pkg/source/source_test.go @@ -213,7 +213,7 @@ var _ = Describe("Source", func() { instance := source.Kind(ic, &corev1.Pod{}) err := instance.Start(ctx, handler.Funcs{}, q) Expect(err).NotTo(HaveOccurred()) - Eventually(instance.WaitForSync(context.Background())).Should(HaveOccurred()) + Eventually(instance.WaitForSync).WithArguments(context.Background()).Should(HaveOccurred()) }) }) diff --git a/tools/setup-envtest/workflows/workflows_testutils_test.go b/tools/setup-envtest/workflows/workflows_testutils_test.go index f236ce460e..93e832d763 100644 --- a/tools/setup-envtest/workflows/workflows_testutils_test.go +++ b/tools/setup-envtest/workflows/workflows_testutils_test.go @@ -176,14 +176,14 @@ func fakeStore(fs afero.Afero, dir string) { } By("making some fake non-store paths") - Expect(fs.Mkdir(filepath.Join(dir, "missing-binaries"), 0755)) + Expect(fs.Mkdir(filepath.Join(dir, "missing-binaries"), 0755)).To(Succeed()) - Expect(fs.Mkdir(filepath.Join(dir, "wrong-version"), 0755)) + Expect(fs.Mkdir(filepath.Join(dir, "wrong-version"), 0755)).To(Succeed()) Expect(fs.WriteFile(filepath.Join(dir, "wrong-version", "kube-apiserver"), nil, 0755)).To(Succeed()) Expect(fs.WriteFile(filepath.Join(dir, "wrong-version", "kubectl"), nil, 0755)).To(Succeed()) Expect(fs.WriteFile(filepath.Join(dir, "wrong-version", "etcd"), nil, 0755)).To(Succeed()) - Expect(fs.Mkdir(filepath.Join(dir, "good-version"), 0755)) + Expect(fs.Mkdir(filepath.Join(dir, "good-version"), 0755)).To(Succeed()) Expect(fs.WriteFile(filepath.Join(dir, "good-version", "kube-apiserver"), nil, 0755)).To(Succeed()) Expect(fs.WriteFile(filepath.Join(dir, "good-version", "kubectl"), nil, 0755)).To(Succeed()) Expect(fs.WriteFile(filepath.Join(dir, "good-version", "etcd"), nil, 0755)).To(Succeed())