fix: enable empty and len rules from testifylint on pkg package
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Co-authored-by: Patrick Ohly <patrick.ohly@intel.com> Kubernetes-commit: f014b754fb5925dfbca6e27a44d0c3968b157e14
This commit is contained in:
parent
4f89b2c0e4
commit
8705baa8b2
|
|
@ -516,7 +516,7 @@ func TestBasicPolicyDefinitionFailure(t *testing.T) {
|
|||
require.Equal(t, 0, warningRecorder.len())
|
||||
|
||||
annotations := attr.GetAnnotations(auditinternal.LevelMetadata)
|
||||
require.Equal(t, 0, len(annotations))
|
||||
require.Empty(t, annotations)
|
||||
|
||||
require.ErrorContains(t, err, `Denied`)
|
||||
}
|
||||
|
|
@ -824,7 +824,7 @@ func TestInvalidParamSourceGVK(t *testing.T) {
|
|||
`failed to configure policy: failed to find resource referenced by paramKind: 'example.com/v1, Kind=BadParamKind'`)
|
||||
|
||||
close(passedParams)
|
||||
require.Len(t, passedParams, 0)
|
||||
require.Empty(t, passedParams)
|
||||
}
|
||||
|
||||
// Shows that an error is surfaced if a param specified in a binding does not
|
||||
|
|
@ -868,7 +868,7 @@ func TestInvalidParamSourceInstanceName(t *testing.T) {
|
|||
// is not existing
|
||||
require.ErrorContains(t, err,
|
||||
"no params found for policy binding with `Deny` parameterNotFoundAction")
|
||||
require.Len(t, passedParams, 0)
|
||||
require.Empty(t, passedParams)
|
||||
}
|
||||
|
||||
// Show that policy still gets evaluated with `nil` param if paramRef & namespaceParamRef
|
||||
|
|
@ -1199,7 +1199,7 @@ func TestAuditValidationAction(t *testing.T) {
|
|||
require.Equal(t, 0, warningRecorder.len())
|
||||
|
||||
annotations := attr.GetAnnotations(auditinternal.LevelMetadata)
|
||||
require.Equal(t, 1, len(annotations))
|
||||
require.Len(t, annotations, 1)
|
||||
valueJson, ok := annotations["validation.policy.admission.k8s.io/validation_failure"]
|
||||
require.True(t, ok)
|
||||
var value []validating.ValidationFailureValue
|
||||
|
|
@ -1254,7 +1254,7 @@ func TestWarnValidationAction(t *testing.T) {
|
|||
require.True(t, warningRecorder.hasWarning("Validation failed for ValidatingAdmissionPolicy 'denypolicy.example.com' with binding 'denybinding.example.com': I'm sorry Dave"))
|
||||
|
||||
annotations := attr.GetAnnotations(auditinternal.LevelMetadata)
|
||||
require.Equal(t, 0, len(annotations))
|
||||
require.Empty(t, annotations)
|
||||
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
|
@ -1296,7 +1296,7 @@ func TestAllValidationActions(t *testing.T) {
|
|||
require.True(t, warningRecorder.hasWarning("Validation failed for ValidatingAdmissionPolicy 'denypolicy.example.com' with binding 'denybinding.example.com': I'm sorry Dave"))
|
||||
|
||||
annotations := attr.GetAnnotations(auditinternal.LevelMetadata)
|
||||
require.Equal(t, 1, len(annotations))
|
||||
require.Len(t, annotations, 1)
|
||||
valueJson, ok := annotations["validation.policy.admission.k8s.io/validation_failure"]
|
||||
require.True(t, ok)
|
||||
var value []validating.ValidationFailureValue
|
||||
|
|
@ -1926,10 +1926,10 @@ func TestAuditAnnotations(t *testing.T) {
|
|||
)
|
||||
|
||||
annotations := attr.GetAnnotations(auditinternal.LevelMetadata)
|
||||
require.Equal(t, 1, len(annotations))
|
||||
require.Len(t, annotations, 1)
|
||||
value := annotations[policy.Name+"/example-key"]
|
||||
parts := strings.Split(value, ", ")
|
||||
require.Equal(t, 2, len(parts))
|
||||
require.Len(t, parts, 2)
|
||||
require.Contains(t, parts, "normal-value", "special-value")
|
||||
|
||||
require.ErrorContains(t, err, "example error")
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ func TestAddRemove(t *testing.T) {
|
|||
require.NotNil(t, initialDocument, "initial document should parse")
|
||||
require.NotNil(t, secondDocument, "second document should parse")
|
||||
assert.Len(t, initialDocument.Items, len(apis.Items), "initial document should have set number of groups")
|
||||
assert.Len(t, secondDocument.Items, 0, "second document should have no groups")
|
||||
assert.Empty(t, secondDocument.Items, "second document should have no groups")
|
||||
}
|
||||
|
||||
// Show that updating an existing service replaces and does not add the entry
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ func TestDiscoveryAtAPIS(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
assert.Equal(t, 0, len(groupList.Groups))
|
||||
assert.Empty(t, groupList.Groups)
|
||||
|
||||
// Add a Group.
|
||||
extensionsGroupName := "extensions"
|
||||
|
|
@ -130,7 +130,7 @@ func TestDiscoveryAtAPIS(t *testing.T) {
|
|||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
|
||||
assert.Equal(t, 1, len(groupList.Groups))
|
||||
assert.Len(t, groupList.Groups, 1)
|
||||
groupListGroup := groupList.Groups[0]
|
||||
assert.Equal(t, extensionsGroupName, groupListGroup.Name)
|
||||
assert.Equal(t, extensionsVersions, groupListGroup.Versions)
|
||||
|
|
@ -144,7 +144,7 @@ func TestDiscoveryAtAPIS(t *testing.T) {
|
|||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
|
||||
assert.Equal(t, 0, len(groupList.Groups))
|
||||
assert.Empty(t, groupList.Groups)
|
||||
}
|
||||
|
||||
func TestDiscoveryOrdering(t *testing.T) {
|
||||
|
|
@ -155,7 +155,7 @@ func TestDiscoveryOrdering(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
assert.Equal(t, 0, len(groupList.Groups))
|
||||
assert.Empty(t, groupList.Groups)
|
||||
|
||||
// Register three groups
|
||||
handler.AddGroup(metav1.APIGroup{Name: "x"})
|
||||
|
|
@ -173,7 +173,7 @@ func TestDiscoveryOrdering(t *testing.T) {
|
|||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
|
||||
assert.Equal(t, 6, len(groupList.Groups))
|
||||
assert.Len(t, groupList.Groups, 6)
|
||||
assert.Equal(t, "x", groupList.Groups[0].Name)
|
||||
assert.Equal(t, "y", groupList.Groups[1].Name)
|
||||
assert.Equal(t, "z", groupList.Groups[2].Name)
|
||||
|
|
@ -187,7 +187,7 @@ func TestDiscoveryOrdering(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
assert.Equal(t, 5, len(groupList.Groups))
|
||||
assert.Len(t, groupList.Groups, 5)
|
||||
|
||||
// Re-adding should move to the end.
|
||||
handler.AddGroup(metav1.APIGroup{Name: "a"})
|
||||
|
|
@ -195,7 +195,7 @@ func TestDiscoveryOrdering(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
assert.Equal(t, 6, len(groupList.Groups))
|
||||
assert.Len(t, groupList.Groups, 6)
|
||||
assert.Equal(t, "x", groupList.Groups[0].Name)
|
||||
assert.Equal(t, "y", groupList.Groups[1].Name)
|
||||
assert.Equal(t, "z", groupList.Groups[2].Name)
|
||||
|
|
|
|||
|
|
@ -2067,8 +2067,8 @@ func TestForgetWatcher(t *testing.T) {
|
|||
cacher.Lock()
|
||||
defer cacher.Unlock()
|
||||
|
||||
require.Equal(t, expectedWatchersCounter, len(cacher.watchers.allWatchers))
|
||||
require.Equal(t, expectedValueWatchersCounter, len(cacher.watchers.valueWatchers))
|
||||
require.Len(t, cacher.watchers.allWatchers, expectedWatchersCounter)
|
||||
require.Len(t, cacher.watchers.valueWatchers, expectedValueWatchersCounter)
|
||||
}
|
||||
assertCacherInternalState(0, 0)
|
||||
|
||||
|
|
|
|||
|
|
@ -314,11 +314,11 @@ func TestTunnelingHandler_HeaderInterceptingConn(t *testing.T) {
|
|||
for i, chunk := range strings.Split(responseHeadersAndBody, "split") {
|
||||
if i > 0 {
|
||||
n, err := hic.Write([]byte("split"))
|
||||
require.Equal(t, n, len("split"))
|
||||
require.Len(t, "split", n)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
n, err := hic.Write([]byte(chunk))
|
||||
require.Equal(t, n, len(chunk))
|
||||
require.Len(t, chunk, n)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
assert.True(t, hic.initialized)
|
||||
|
|
@ -392,11 +392,11 @@ func TestTunnelingHandler_HeaderInterceptingConn(t *testing.T) {
|
|||
for i, chunk := range strings.Split(contentLengthHeadersAndBody, "split") {
|
||||
if i > 0 {
|
||||
n, err := hic.Write([]byte("split"))
|
||||
require.Equal(t, n, len("split"))
|
||||
require.Len(t, "split", n)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
n, err := hic.Write([]byte(chunk))
|
||||
require.Equal(t, n, len(chunk))
|
||||
require.Len(t, chunk, n)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
assert.True(t, hic.initialized, "successfully parsed http response headers")
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func TestTruncatingEvents(t *testing.T) {
|
|||
|
||||
fb := &fake.Backend{
|
||||
OnRequest: func(events []*auditinternal.Event) {
|
||||
require.Equal(t, 1, len(events), "Expected single event in batch")
|
||||
require.Len(t, events, 1, "Expected single event in batch")
|
||||
event = events[0]
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue