Merge pull request #306 from carsontham/support-omitzero-in-LookupJSON

Added support for omitzero in LookupJSON (v2/parser/tags)

Author: k8s-ci-robot

v2/parser/tags/json.go

@@ -31,6 +31,7 @@ type JSON struct {
 	Omit      bool
 	Inline    bool
 	Omitempty bool
+	OmitZero  bool
 }
 
 func (t JSON) String() string {
@@ -41,6 +42,9 @@ func (t JSON) String() string {
 	if t.Omitempty {
 		tag += ",omitempty"
 	}
+	if t.OmitZero {
+		tag += ",omitzero"
+	}
 	// "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 {
@@ -59,6 +63,7 @@ func LookupJSON(m types.Member) (JSON, bool) {
 	// gengo to indicate that the field should be inlined.
 	inline := (m.Embedded && name == "") || opts.Contains("inline")
 	omitempty := opts.Contains("omitempty")
+	omitzero := opts.Contains("omitzero")
 	if !inline && name == "" {
 		name = m.Name
 	}
@@ -67,6 +72,7 @@ func LookupJSON(m types.Member) (JSON, bool) {
 		Omit:      false,
 		Inline:    inline,
 		Omitempty: omitempty,
+		OmitZero:  omitzero,
 	}, true
 }
 

v2/parser/tags/json_test.go

@@ -73,6 +73,11 @@ func TestJSON(t *testing.T) {
 			member:   member("T1", "E"),
 			expected: JSON{Name: "E"},
 		},
+		{
+			name:     "omitzero",
+			member:   member("T1", "F"),
+			expected: JSON{Name: "f", OmitZero: true},
+		},
 		{
 			name:     "embedded struct",
 			member:   member("T1", "T2"),

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

@@ -6,6 +6,7 @@ type T1 struct {
 	C string `json:",inline"`
 	D string `json:"-"`
 	E string `json:""`
+	F string `json:"f,omitzero"`
 
 	T2
 	*T3