From fa2d8f4568baeb9d5221c70ec6213bf7609c4863 Mon Sep 17 00:00:00 2001
From: Hans Hasselberg <me@hans.io>
Date: Thu, 24 Jan 2019 17:12:08 +0100
Subject: [PATCH] simpler fix

---
 agent/structs/structs.go | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/agent/structs/structs.go b/agent/structs/structs.go
index 038b061dc..349e1ae42 100644
--- a/agent/structs/structs.go
+++ b/agent/structs/structs.go
@@ -917,26 +917,27 @@ type HealthCheckDefinition struct {
 	DeregisterCriticalServiceAfter time.Duration       `json:",omitempty"`
 }
 
-type Alias HealthCheckDefinition
-type exportedHealthCheckDefinition struct {
-	Interval                       string `json:",omitempty"`
-	Timeout                        string `json:",omitempty"`
-	DeregisterCriticalServiceAfter string `json:",omitempty"`
-	*Alias
-}
-
 func (d *HealthCheckDefinition) MarshalJSON() ([]byte, error) {
-	exported := &exportedHealthCheckDefinition{
-		Alias: (*Alias)(d),
+	type Alias HealthCheckDefinition
+	exported := &struct {
+		Interval                       string `json:",omitempty"`
+		Timeout                        string `json:",omitempty"`
+		DeregisterCriticalServiceAfter string `json:",omitempty"`
+		*Alias
+	}{
+		Interval:                       d.Interval.String(),
+		Timeout:                        d.Timeout.String(),
+		DeregisterCriticalServiceAfter: d.DeregisterCriticalServiceAfter.String(),
+		Alias:                          (*Alias)(d),
 	}
-	if d.Interval != 0 {
-		exported.Interval = d.Interval.String()
+	if d.Interval == 0 {
+		exported.Interval = ""
 	}
-	if d.Timeout != 0 {
-		exported.Timeout = d.Interval.String()
+	if d.Timeout == 0 {
+		exported.Timeout = ""
 	}
-	if d.DeregisterCriticalServiceAfter != 0 {
-		exported.DeregisterCriticalServiceAfter = d.Interval.String()
+	if d.DeregisterCriticalServiceAfter == 0 {
+		exported.DeregisterCriticalServiceAfter = ""
 	}
 
 	return json.Marshal(exported)