github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #42253 from liggitt/nil-invalid-field-error 

Automatic merge from submit-queue (batch tested with PRs 42128, 42064, 42253, 42309, 42322)

Fix panic on nil invalid field error

bug fix for validation panic

if a field.Invalid is constructed with a nil badvalue, the Error() method panics, since reflect.TypeOf() returns nil
pull/6/head
Kubernetes Submit Queue 2017-03-02 05:00:52 -08:00 committed by GitHub
parent 98ff34cc38 0cf9b0df56
commit 3d868401e2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors.go
View File

@ -50,7 +50,10 @@ func (v *Error) ErrorBody() string {
s = fmt.Sprintf("%s", v.Type) s = fmt.Sprintf("%s", v.Type)
default: default:
value := v.BadValue value := v.BadValue
if reflect.TypeOf(value).Kind() == reflect.Ptr { valueType := reflect.TypeOf(value)
if value == nil || valueType == nil {
value = "null"
} else if valueType.Kind() == reflect.Ptr {
if reflectValue := reflect.ValueOf(value); reflectValue.IsNil() { if reflectValue := reflect.ValueOf(value); reflectValue.IsNil() {
value = "null" value = "null"
} else { } else {

8
staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go
View File

@ -62,6 +62,14 @@ func TestMakeFuncs(t *testing.T) {
} }
func TestErrorUsefulMessage(t *testing.T) { func TestErrorUsefulMessage(t *testing.T) {
{
s := Invalid(nil, nil, "").Error()
t.Logf("message: %v", s)
if !strings.Contains(s, "null") {
t.Errorf("error message did not contain 'null': %s", s)
}
}
s := Invalid(NewPath("foo"), "bar", "deet").Error() s := Invalid(NewPath("foo"), "bar", "deet").Error()
t.Logf("message: %v", s) t.Logf("message: %v", s)
for _, part := range []string{"foo", "bar", "deet", ErrorTypeInvalid.String()} { for _, part := range []string{"foo", "bar", "deet", ErrorTypeInvalid.String()} {