Merge pull request #182 from ialidzhikov/cherrypick/panic-on-embedded-struct

Cherry pick of #173: Fix panic on pointer to embedded struct

Author: k8s-ci-robot

value/reflectcache.go

@@ -70,11 +70,11 @@ func (f *FieldCacheEntry) CanOmit(fieldVal reflect.Value) bool {
 	return f.isOmitEmpty && (safeIsNil(fieldVal) || isZero(fieldVal))
 }
 
-// GetUsing returns the field identified by this FieldCacheEntry from the provided struct.
+// GetFrom returns the field identified by this FieldCacheEntry from the provided struct.
 func (f *FieldCacheEntry) GetFrom(structVal reflect.Value) reflect.Value {
 	// field might be nested within 'inline' structs
 	for _, elem := range f.fieldPath {
-		structVal = structVal.FieldByIndex(elem)
+		structVal = dereference(structVal).FieldByIndex(elem)
 	}
 	return structVal
 }
@@ -150,7 +150,11 @@ func buildStructCacheEntry(t reflect.Type, infos map[string]*FieldCacheEntry, fi
 			continue
 		}
 		if isInline {
-			buildStructCacheEntry(field.Type, infos, append(fieldPath, field.Index))
+			e := field.Type
+			if field.Type.Kind() == reflect.Ptr {
+				e = field.Type.Elem()
+			}
+			buildStructCacheEntry(e, infos, append(fieldPath, field.Index))
 			continue
 		}
 		info := &FieldCacheEntry{JsonName: jsonName, isOmitEmpty: isOmitempty, fieldPath: append(fieldPath, field.Index), fieldType: field.Type}

value/valuereflect_test.go

@@ -237,6 +237,9 @@ type testOmitemptyStruct struct {
 	Noomit *string `json:"noomit"`
 	Omit   *string `json:"omit,omitempty"`
 }
+type testEmbeddedStruct struct {
+	*testBasicStruct `json:",inline"`
+}
 
 func TestReflectStruct(t *testing.T) {
 	cases := []struct {
@@ -281,6 +284,12 @@ func TestReflectStruct(t *testing.T) {
 			expectedMap:          map[string]interface{}{"noomit": (*string)(nil)},
 			expectedUnstructured: map[string]interface{}{"noomit": nil},
 		},
+		{
+			name:                 "embedded",
+			val:                  testEmbeddedStruct{&testBasicStruct{I: 10, S: "string"}},
+			expectedMap:          map[string]interface{}{"int": int64(10), "S": "string"},
+			expectedUnstructured: map[string]interface{}{"int": int64(10), "S": "string"},
+		},
 	}
 
 	for _, tc := range cases {