Merge pull request #1473 from grafana/specifying_meta_tags_must_be_optional

replay · web-flow · commit 02866ae7e191 · 2019-09-25T13:17:12.000+08:00
meta tag records must be optional in meta tag upsert requests
diff --git a/api/models/meta_records.go b/api/models/meta_records.go
@@ -10,7 +10,7 @@ import (
 //go:generate msgp
 
 type MetaTagRecordUpsert struct {
-	MetaTags    []string `json:"metaTags" binding:"Required"`
+	MetaTags    []string `json:"metaTags"`
 	Expressions []string `json:"expressions" binding:"Required"`
 	Propagate   bool     `json:"propagate"`
 }
@@ -40,7 +40,7 @@ type MetaTagRecordUpsertResult struct {
 
 type IndexMetaTagRecordUpsert struct {
 	OrgId       uint32   `json:"orgId" binding:"Required"`
-	MetaTags    []string `json:"metaTags" binding:"Required"`
+	MetaTags    []string `json:"metaTags"`
 	Expressions []string `json:"expressions" binding:"Required"`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`//go:generate msgp`
`11`	`11`
`12`	`12`	`type MetaTagRecordUpsert struct {`
`13`		- MetaTags []string `json:"metaTags" binding:"Required"`
	`13`	+ MetaTags []string `json:"metaTags"`
`14`	`14`	Expressions []string `json:"expressions" binding:"Required"`
`15`	`15`	Propagate bool `json:"propagate"`
`16`	`16`	`}`
`@@ -40,7 +40,7 @@ type MetaTagRecordUpsertResult struct {`
`40`	`40`
`41`	`41`	`type IndexMetaTagRecordUpsert struct {`
`42`	`42`	OrgId uint32 `json:"orgId" binding:"Required"`
`43`		- MetaTags []string `json:"metaTags" binding:"Required"`
	`43`	+ MetaTags []string `json:"metaTags"`
`44`	`44`	Expressions []string `json:"expressions" binding:"Required"`
`45`	`45`	`}`
`46`	`46`