api: ensure empty locality field is not transmitted to Consul (#17137)

2 years ago · c501da01eb
2 changed files with 3 additions and 3 deletions
--- a/api/catalog.go
+++ b/api/catalog.go
@ -78,8 +78,8 @@ type CatalogRegistration struct {
 	Check           *AgentCheck
 	Checks          HealthChecks
 	SkipNodeUpdate  bool
-	Partition       string `json:",omitempty"`
-	Locality        *Locality
+	Partition       string    `json:",omitempty"`
+	Locality        *Locality `json:",omitempty"`
 }

 type CatalogDeregistration struct {
--- a/api/peering.go
+++ b/api/peering.go
@ -47,7 +47,7 @@ type PeeringRemoteInfo struct {
 	Partition string
 	// Datacenter is the remote peer's datacenter.
 	Datacenter string
-	Locality   *Locality
+	Locality   *Locality `json:",omitempty"`
 }

 // Locality identifies where a given entity is running.