scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix staticcheck failures in test/utils/...

Browse Source 
The `err` return value was being overwritten in an unintended way, which
means the function may not return the proper error value. This diff
ensures it does.
This commit is contained in:
mattjmcnaughton
2019-08-25 10:49:16 -04:00
parent c2c821534b
commit 42f8596b13
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@@ -124,7 +124,6 @@ test/integration/serviceaccount
test/integration/serving test/integration/serving
test/integration/ttlcontroller test/integration/ttlcontroller
test/integration/volume test/integration/volume
test/utils
vendor/k8s.io/apimachinery/pkg/api/meta vendor/k8s.io/apimachinery/pkg/api/meta
vendor/k8s.io/apimachinery/pkg/api/resource vendor/k8s.io/apimachinery/pkg/api/resource
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured

8
test/utils/audit.go
View File

@@ -137,7 +137,6 @@ func CheckForDuplicates(el auditinternal.EventList) (auditinternal.EventList, er
// existingEvents holds a slice of audit events that have been seen // existingEvents holds a slice of audit events that have been seen
existingEvents := []AuditEvent{} existingEvents := []AuditEvent{}
duplicates := auditinternal.EventList{} duplicates := auditinternal.EventList{}
var err error
for _, e := range el.Items { for _, e := range el.Items {
event, err := testEventFromInternal(&e) event, err := testEventFromInternal(&e)
if err != nil { if err != nil {
@@ -147,12 +146,17 @@ func CheckForDuplicates(el auditinternal.EventList) (auditinternal.EventList, er
for _, existing := range existingEvents { for _, existing := range existingEvents {
if reflect.DeepEqual(existing, event) { if reflect.DeepEqual(existing, event) {
duplicates.Items = append(duplicates.Items, e) duplicates.Items = append(duplicates.Items, e)
err = fmt.Errorf("failed duplicate check")
continue continue
} }
} }
existingEvents = append(existingEvents, event) existingEvents = append(existingEvents, event)
} }
var err error
if len(duplicates.Items) > 0 {
err = fmt.Errorf("failed duplicate check")
}
return duplicates, err return duplicates, err
} }