github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make sure we omit the Kind value in JSON if empty

pull/4275/head
Matt Keeler 2018-06-21 11:17:17 -04:00 committed by Jack Pearkes
parent 01f82717b4
commit 163fe11101
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/structs/service_definition.go
View File

@ -14,7 +14,7 @@ import (
// ServiceDefinition is used to JSON decode the Service definitions. For
// documentation on specific fields see NodeService which is better documented.
type ServiceDefinition struct {
Kind ServiceKind
Kind ServiceKind `json:",omitempty"`
ID string
Name string
Tags []string

2
agent/structs/structs.go
View File

@ -512,7 +512,7 @@ type NodeService struct {
// Kind is the kind of service this is. Different kinds of services may
// have differing validation, DNS behavior, etc. An empty kind will default
// to the Default kind. See ServiceKind for the full list of kinds.
Kind ServiceKind
Kind ServiceKind `json:",omitempty"`
ID string
Service string