diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index b6ee87ca44a..1342b03ac58 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -124,7 +124,6 @@ test/integration/serviceaccount test/integration/serving test/integration/ttlcontroller test/integration/volume -test/utils vendor/k8s.io/apimachinery/pkg/api/meta vendor/k8s.io/apimachinery/pkg/api/resource vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured diff --git a/test/utils/audit.go b/test/utils/audit.go index 3bb9c5b4322..0156303f60b 100644 --- a/test/utils/audit.go +++ b/test/utils/audit.go @@ -137,7 +137,6 @@ func CheckForDuplicates(el auditinternal.EventList) (auditinternal.EventList, er // existingEvents holds a slice of audit events that have been seen existingEvents := []AuditEvent{} duplicates := auditinternal.EventList{} - var err error for _, e := range el.Items { event, err := testEventFromInternal(&e) if err != nil { @@ -147,12 +146,17 @@ func CheckForDuplicates(el auditinternal.EventList) (auditinternal.EventList, er for _, existing := range existingEvents { if reflect.DeepEqual(existing, event) { duplicates.Items = append(duplicates.Items, e) - err = fmt.Errorf("failed duplicate check") continue } } existingEvents = append(existingEvents, event) } + + var err error + if len(duplicates.Items) > 0 { + err = fmt.Errorf("failed duplicate check") + } + return duplicates, err }