github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-25 14:41:53 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
fix: enable empty and len rules from testifylint on pkg and staging package

Kubernetes-commit: 2d4514e1690dc5babb144542da799f6b331afd1b
This commit is contained in:
Kubernetes Publisher 2024-07-11 23:12:06 -07:00
commit 53b8be7cea
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
discovery/cached/disk/cached_discovery_test.go
View File

@ -152,7 +152,7 @@ func TestOpenAPIDiskCache(t *testing.T) {
require.NoError(t, err)
defer fakeServer.HttpServer.Close()
require.Greater(t, len(fakeServer.ServedDocuments), 0)
require.NotEmpty(t, fakeServer.ServedDocuments)
client, err := NewCachedDiscoveryClientForConfig(
&restclient.Config{Host: fakeServer.HttpServer.URL},
@ -175,7 +175,7 @@ func TestOpenAPIDiskCache(t *testing.T) {
paths, err := openapiClient.Paths()
require.NoError(t, err)
assert.Equal(t, 1, fakeServer.RequestCounters["/openapi/v3"])
require.Greater(t, len(paths), 0)
require.NotEmpty(t, paths)
contentTypes := []string{
runtime.ContentTypeJSON, openapi.ContentTypeOpenAPIV3PB,

4
discovery/cached/memory/memcache_test.go
View File

@ -411,7 +411,7 @@ func TestOpenAPIMemCache(t *testing.T) {
require.NoError(t, err)
defer fakeServer.HttpServer.Close()
require.Greater(t, len(fakeServer.ServedDocuments), 0)
require.NotEmpty(t, fakeServer.ServedDocuments)
client := NewMemCacheClient(
discovery.NewDiscoveryClientForConfigOrDie(
@ -604,7 +604,7 @@ func TestMemCacheGroupsAndMaybeResources(t *testing.T) {
require.NoError(t, err)
// "Unaggregated" discovery always returns nil for resources.
assert.Nil(t, resourcesMap)
assert.True(t, len(failedGVs) == 0, "expected empty failed GroupVersions, got (%d)", len(failedGVs))
assert.Emptyf(t, failedGVs, "expected empty failed GroupVersions, got (%d)", len(failedGVs))
assert.False(t, memClient.receivedAggregatedDiscovery)
assert.True(t, memClient.Fresh())
// Test the expected groups are returned for the aggregated format.

4
go.mod
View File

@ -25,8 +25,8 @@ require (
golang.org/x/time v0.3.0
google.golang.org/protobuf v1.34.2
gopkg.in/evanphx/json-patch.v4 v4.12.0
k8s.io/api v0.0.0-20240707022826-2cf4612580d3
k8s.io/apimachinery v0.0.0-20240708182526-e126c655b814
k8s.io/api v0.0.0-20240712023323-4badb3333d55
k8s.io/apimachinery v0.0.0-20240711222537-4524748494bf
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
k8s.io/utils v0.0.0-20230726121419-3b25d923346b

8
go.sum
View File

@ -156,10 +156,10 @@ 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-20240708182526-e126c655b814 h1:ymYj8RTEwPL3rUcV3lJtdARYZIHdHC20YLXqVrpcT8o=
k8s.io/apimachinery v0.0.0-20240708182526-e126c655b814/go.mod h1:Et4EUFrefx1K28ZwNXpkHUqq7fSML2FROj79Ku7Lj1w=
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/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=

2
tools/cache/reflector_test.go vendored
View File

@ -194,7 +194,7 @@ func TestReflectorWatchStoppedAfter(t *testing.T) {
err := target.watch(nil, stopCh, nil)
require.NoError(t, err)
require.Equal(t, 1, len(watchers))
require.Len(t, watchers, 1)
require.True(t, watchers[0].IsStopped())
}

2
util/consistencydetector/list_data_consistency_detector_test.go
View File

@ -132,7 +132,7 @@ func TestCheckListFromCacheDataConsistencyIfRequestedInternalHappyPath(t *testin
checkListFromCacheDataConsistencyIfRequestedInternal(ctx, "", fakeLister.List, listOptions, scenario.retrievedList)
require.Equal(t, 1, fakeLister.counter)
require.Equal(t, 1, len(fakeLister.requestOptions))
require.Len(t, fakeLister.requestOptions, 1)
require.Equal(t, fakeLister.requestOptions[0], scenario.expectedRequestOptions)
})
}