Merge pull request #125802 from mmorel-35/testifylint/len+empty

fix: enable empty and len rules from testifylint on pkg and staging package Kubernetes-commit: 2d4514e1690dc5babb144542da799f6b331afd1b

Author: k8s-publishing-bot

go.mod

@@ -25,8 +25,8 @@ require (
 go.uber.org/zap v1.26.0
 golang.org/x/sys v0.21.0
 gopkg.in/yaml.v2 v2.4.0
-k8s.io/apimachinery v0.0.0-20240707022528-c1f240355706
-k8s.io/client-go v0.0.0-20240707023231-354ed1bc9f1f
+k8s.io/apimachinery v0.0.0-20240711222537-4524748494bf
+k8s.io/client-go v0.0.0-20240712063246-53b8be7ceab5
 k8s.io/klog/v2 v2.130.1
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
@@ -75,7 +75,7 @@ require (
 google.golang.org/protobuf v1.34.2 // indirect
 gopkg.in/inf.v0 v0.9.1 // indirect
 gopkg.in/yaml.v3 v3.0.1 // indirect
-k8s.io/api v0.0.0-20240707022826-2cf4612580d3 // indirect
+k8s.io/api v0.0.0-20240712023323-4badb3333d55 // indirect
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 sigs.k8s.io/yaml v1.4.0 // indirect

go.sum

@@ -204,12 +204,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.0.0-20240707022826-2cf4612580d3 h1:2bHi5SAn7dRf6oJGO29yFEtMyIN9oCD86In1R70UnXA=
-k8s.io/api v0.0.0-20240707022826-2cf4612580d3/go.mod h1:TeZW9JsLR2mmT3LA7JsD/4i5g40HHrREIdaD0QCEP1Y=
-k8s.io/apimachinery v0.0.0-20240707022528-c1f240355706 h1:17r0OQj+n4pHLABJJ5Sb5GeSSZy4NF0YSaEy2qsPLLY=
-k8s.io/apimachinery v0.0.0-20240707022528-c1f240355706/go.mod h1:Et4EUFrefx1K28ZwNXpkHUqq7fSML2FROj79Ku7Lj1w=
-k8s.io/client-go v0.0.0-20240707023231-354ed1bc9f1f h1:HEQPgzOtITgo4RE9ZpCX7Sn2Cu8h1DlXY9S1Bi9djsU=
-k8s.io/client-go v0.0.0-20240707023231-354ed1bc9f1f/go.mod h1:Nbn3B+SZKebFY2/5RTVUF6AyS37oDLJ9XXwrxjXpbTI=
+k8s.io/api v0.0.0-20240712023323-4badb3333d55 h1:n44Qr23IUW2bPIMGrDScIdqmu1u+XUHqdd0O0hTj2pM=
+k8s.io/api v0.0.0-20240712023323-4badb3333d55/go.mod h1:O8LAmMgsWzumSE9wGhqSdC+9HFxJ3Bh+NuDzms9R/D4=
+k8s.io/apimachinery v0.0.0-20240711222537-4524748494bf h1:BO1LyfoftoDsAxaqL9zPspuFZPuY2mq8vH4qqqoAodc=
+k8s.io/apimachinery v0.0.0-20240711222537-4524748494bf/go.mod h1:Et4EUFrefx1K28ZwNXpkHUqq7fSML2FROj79Ku7Lj1w=
+k8s.io/client-go v0.0.0-20240712063246-53b8be7ceab5 h1:FlYnjobR2ssh20GtO47ze/jqACrODJjmPFPIuE8lj90=
+k8s.io/client-go v0.0.0-20240712063246-53b8be7ceab5/go.mod h1:t2i0B87/e6Kk2nUK0ctt34B/wr3K4unmBKrCKccHQuk=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

metrics/counter_test.go

@@ -87,7 +87,7 @@ func TestCounter(t *testing.T) {
 mfs, err := registry.Gather()
 var buf bytes.Buffer
 enc := expfmt.NewEncoder(&buf, "text/plain; version=0.0.4; charset=utf-8")
-assert.Equalf(t, test.expectedMetricCount, len(mfs), "Got %v metrics, Want: %v metrics", len(mfs), test.expectedMetricCount)
+assert.Lenf(t, mfs, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(mfs), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 for _, metric := range mfs {
 err := enc.Encode(metric)
@@ -186,12 +186,12 @@ func TestCounterVec(t *testing.T) {
 registry.MustRegister(c)
 c.WithLabelValues("1", "2").Inc()
 mfs, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricFamilyCount, len(mfs), "Got %v metric families, Want: %v metric families", len(mfs), test.expectedMetricFamilyCount)
+assert.Lenf(t, mfs, test.expectedMetricFamilyCount, "Got %v metric families, Want: %v metric families", len(mfs), test.expectedMetricFamilyCount)
 assert.Nil(t, err, "Gather failed %v", err)
 
 // this no-opts here when there are no metric families (i.e. when the metric is hidden)
 for _, mf := range mfs {
-assert.Equalf(t, 1, len(mf.GetMetric()), "Got %v metrics, wanted 1 as the count", len(mf.GetMetric()))
+assert.Lenf(t, mf.GetMetric(), 1, "Got %v metrics, wanted 1 as the count", len(mf.GetMetric()))
 assert.Equalf(t, test.expectedHelp, mf.GetHelp(), "Got %s as help message, want %s", mf.GetHelp(), test.expectedHelp)
 }
 
@@ -203,7 +203,7 @@ func TestCounterVec(t *testing.T) {
 
 // this no-opts here when there are no metric families (i.e. when the metric is hidden)
 for _, mf := range mfs {
-assert.Equalf(t, 3, len(mf.GetMetric()), "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
+assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
 }
 })
 }

metrics/gauge_test.go

@@ -87,7 +87,7 @@ func TestGauge(t *testing.T) {
 registry.MustRegister(c)
 
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, metric := range ms {
@@ -175,7 +175,7 @@ func TestGaugeVec(t *testing.T) {
 registry.MustRegister(c)
 c.WithLabelValues("1", "2").Set(1.0)
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 for _, metric := range ms {
 assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -188,7 +188,7 @@ func TestGaugeVec(t *testing.T) {
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, mf := range ms {
-assert.Equalf(t, 3, len(mf.GetMetric()), "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
+assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
 }
 })
 }

metrics/histogram_test.go

@@ -102,7 +102,7 @@ func TestHistogram(t *testing.T) {
 }
 
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, metric := range ms {
@@ -211,7 +211,7 @@ func TestHistogramVec(t *testing.T) {
 }
 
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 for _, metric := range ms {
 if metric.GetHelp() != test.expectedHelp {
@@ -226,7 +226,7 @@ func TestHistogramVec(t *testing.T) {
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, mf := range ms {
-assert.Equalf(t, 3, len(mf.GetMetric()), "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
+assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
 for _, m := range mf.GetMetric() {
 assert.Equalf(t, uint64(1), m.GetHistogram().GetSampleCount(), "Got %v metrics, expected histogram sample count to equal 1", m.GetHistogram().GetSampleCount())
 }

metrics/registry_test.go

@@ -235,7 +235,7 @@ func TestShowHiddenMetric(t *testing.T) {
 
 ms, err := registry.Gather()
 assert.Nil(t, err, "Gather failed %v", err)
-assert.Equalf(t, expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
+assert.Lenf(t, ms, expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
 
 showHidden.Store(true)
 defer showHidden.Store(false)
@@ -253,7 +253,7 @@ func TestShowHiddenMetric(t *testing.T) {
 
 ms, err = registry.Gather()
 assert.Nil(t, err, "Gather failed %v", err)
-assert.Equalf(t, expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
+assert.Lenf(t, ms, expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
 }
 
 func TestValidateShowHiddenMetricsVersion(t *testing.T) {

metrics/summary_test.go

@@ -87,7 +87,7 @@ func TestSummary(t *testing.T) {
 registry.MustRegister(c)
 
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, metric := range ms {
@@ -176,7 +176,7 @@ func TestSummaryVec(t *testing.T) {
 registry.MustRegister(c)
 c.WithLabelValues("1", "2").Observe(1.0)
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, metric := range ms {
@@ -190,7 +190,7 @@ func TestSummaryVec(t *testing.T) {
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, mf := range ms {
-assert.Equalf(t, 3, len(mf.GetMetric()), "Got %v metrics, wanted 2 as the count", len(mf.GetMetric()))
+assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 2 as the count", len(mf.GetMetric()))
 for _, m := range mf.GetMetric() {
 assert.Equalf(t, uint64(1), m.GetSummary().GetSampleCount(), "Got %v metrics, wanted 1 as the summary sample count", m.GetSummary().GetSampleCount())
 }

metrics/timing_histogram_test.go

@@ -111,7 +111,7 @@ func TestTimingHistogram(t *testing.T) {
 }
 
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 
 for _, metric := range ms {
@@ -242,7 +242,7 @@ func TestTimingHistogramVec(t *testing.T) {
 }
 
 ms, err := registry.Gather()
-assert.Equalf(t, test.expectedMetricCount, len(ms), "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
+assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
 assert.Nil(t, err, "Gather failed %v", err)
 for _, metric := range ms {
 if metric.GetHelp() != test.expectedHelp {
@@ -264,7 +264,7 @@ func TestTimingHistogramVec(t *testing.T) {
 
 for _, mf := range ms {
 t.Logf("Considering metric family %s", mf.String())
-assert.Equalf(t, 3, len(mf.GetMetric()), "Got %v metrics, wanted 3 as the count for family %#+v", len(mf.GetMetric()), mf)
+assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 3 as the count for family %#+v", len(mf.GetMetric()), mf)
 for _, m := range mf.GetMetric() {
 expectedCount := uint64(dt1)
 expectedSum := float64(dt1) * v0