Skip to content

Commit 4225df1

Browse files
committed
moved errors to causes into shared utils
1 parent a6ff867 commit 4225df1

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

apis/ethereum/v1alpha1/network_validation_webhook_test.go

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
. "github.com/onsi/ginkgo"
88
. "github.com/onsi/gomega"
99
"k8s.io/apimachinery/pkg/api/errors"
10-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1110
"k8s.io/apimachinery/pkg/util/validation/field"
1211
)
1312

@@ -1022,22 +1021,6 @@ var _ = Describe("Ethereum network validation", func() {
10221021
},
10231022
}
10241023

1025-
// errorsToCauses converts field error list into array of status cause
1026-
errorsToCauses := func(errs field.ErrorList) []metav1.StatusCause {
1027-
causes := make([]metav1.StatusCause, 0, len(errs))
1028-
1029-
for i := range errs {
1030-
err := errs[i]
1031-
causes = append(causes, metav1.StatusCause{
1032-
Type: metav1.CauseType(err.Type),
1033-
Message: err.ErrorBody(),
1034-
Field: err.Field,
1035-
})
1036-
}
1037-
1038-
return causes
1039-
}
1040-
10411024
updateCases := []struct {
10421025
Title string
10431026
OldNetwork *Network
@@ -1237,7 +1220,7 @@ var _ = Describe("Ethereum network validation", func() {
12371220

12381221
errStatus := err.(*errors.StatusError)
12391222

1240-
causes := errorsToCauses(cc.Errors)
1223+
causes := shared.ErrorsToCauses(cc.Errors)
12411224

12421225
Expect(errStatus.ErrStatus.Details.Causes).To(ContainElements(causes))
12431226
})
@@ -1255,7 +1238,7 @@ var _ = Describe("Ethereum network validation", func() {
12551238

12561239
errStatus := err.(*errors.StatusError)
12571240

1258-
causes := errorsToCauses(cc.Errors)
1241+
causes := shared.ErrorsToCauses(cc.Errors)
12591242

12601243
Expect(errStatus.ErrStatus.Details.Causes).To(ContainElements(causes))
12611244
})

apis/shared/utils.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package shared
2+
3+
import (
4+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/util/validation/field"
6+
)
7+
8+
// ErrorsToCauses converts error list into array of status cause
9+
func ErrorsToCauses(errs field.ErrorList) []metav1.StatusCause {
10+
causes := make([]metav1.StatusCause, 0, len(errs))
11+
12+
for i := range errs {
13+
err := errs[i]
14+
causes = append(causes, metav1.StatusCause{
15+
Type: metav1.CauseType(err.Type),
16+
Message: err.ErrorBody(),
17+
Field: err.Field,
18+
})
19+
}
20+
21+
return causes
22+
}

0 commit comments

Comments
 (0)