Merge pull request #303 from thockin/master

Treat embedded fields as inline

Author: k8s-ci-robot

v2/parser/tags/json.go

@@ -41,6 +41,8 @@ func (t JSON) String() string {
 	if t.Omitempty {
 		tag += ",omitempty"
 	}
+	// "inline" isn't (yet) a standard json tag, but it is used by
+	// gengo to indicate that the field should be inlined.
 	if t.Inline {
 		tag += ",inline"
 	}
@@ -53,7 +55,9 @@ func LookupJSON(m types.Member) (JSON, bool) {
 		return JSON{Omit: true}, true
 	}
 	name, opts := parse(tag)
-	inline := opts.Contains("inline")
+	// "inline" isn't (yet) a standard json tag, but it is used by
+	// gengo to indicate that the field should be inlined.
+	inline := (m.Embedded && name == "") || opts.Contains("inline")
 	omitempty := opts.Contains("omitempty")
 	if !inline && name == "" {
 		name = m.Name

v2/parser/tags/json_test.go

@@ -73,6 +73,16 @@ func TestJSON(t *testing.T) {
 			member:   member("T1", "E"),
 			expected: JSON{Name: "E"},
 		},
+		{
+			name:     "embedded struct",
+			member:   member("T1", "T2"),
+			expected: JSON{Name: "", Inline: true},
+		},
+		{
+			name:     "embedded pointer",
+			member:   member("T1", "T3"),
+			expected: JSON{Name: "", Inline: true},
+		},
 	}
 
 	for _, tt := range tests {

v2/parser/tags/testdata/tags/file.go

@@ -6,4 +6,15 @@ type T1 struct {
 	C string `json:",inline"`
 	D string `json:"-"`
 	E string `json:""`
+
+	T2
+	*T3
+}
+
+type T2 struct {
+	Z string `json:"z"`
+}
+
+type T3 struct {
+	Y string `json:"y"`
 }