Add deregister critical service field and refactor duration parsing

agent/agent.go

@@ -1407,7 +1407,7 @@ func (a *Agent) reapServicesInternal() {
 }
 
 // reapServices is a long running goroutine that looks for checks that have been
-// critical too long and dregisters their associated services.
+// critical too long and deregisters their associated services.
 func (a *Agent) reapServices() {
 	for {
 		select {

agent/catalog_endpoint.go

@@ -8,13 +8,15 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 )
 
+var durations = NewDurationFixer("interval", "timeout", "deregistercriticalserviceafter")
+
 func (s *HTTPServer) CatalogRegister(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
 	if req.Method != "PUT" {
 		return nil, MethodNotAllowedError{req.Method, []string{"PUT"}}
 	}
 
 	var args structs.RegisterRequest
-	if err := decodeBody(req, &args, nil); err != nil {
+	if err := decodeBody(req, &args, durations.FixupDurations); err != nil {
 		resp.WriteHeader(http.StatusBadRequest)
 		fmt.Fprintf(resp, "Request decode failed: %v", err)
 		return nil, nil

agent/operator_endpoint.go

@@ -220,7 +220,8 @@ func (s *HTTPServer) OperatorAutopilotConfiguration(resp http.ResponseWriter, re
 		s.parseToken(req, &args.Token)
 
 		var conf api.AutopilotConfiguration
-		if err := decodeBody(req, &conf, FixupConfigDurations); err != nil {
+		durations := NewDurationFixer("lastcontactthreshold", "serverstabilizationtime")
+		if err := decodeBody(req, &conf, durations.FixupDurations); err != nil {
 			resp.WriteHeader(http.StatusBadRequest)
 			fmt.Fprintf(resp, "Error parsing autopilot config: %v", err)
 			return nil, nil
@@ -265,16 +266,42 @@ func (s *HTTPServer) OperatorAutopilotConfiguration(resp http.ResponseWriter, re
 	}
 }
 
-// FixupConfigDurations is used to handle parsing the duration fields in
-// the Autopilot config struct
-func FixupConfigDurations(raw interface{}) error {
+type durationFixer map[string]struct{}
+
+func NewDurationFixer(fields ...string) durationFixer {
+	d := make(map[string]struct{})
+	for _, field := range fields {
+		d[field] = struct{}{}
+	}
+	return d
+}
+
+// FixupDurations is used to handle parsing any field names in the map to time.Durations
+func (d durationFixer) FixupDurations(raw interface{}) error {
 	rawMap, ok := raw.(map[string]interface{})
 	if !ok {
 		return nil
 	}
 	for key, val := range rawMap {
-		if strings.ToLower(key) == "lastcontactthreshold" ||
-			strings.ToLower(key) == "serverstabilizationtime" {
+		if key == "NodeMeta" {
+			continue
+		}
+
+		switch val.(type) {
+		case map[string]interface{}:
+			if err := d.FixupDurations(val); err != nil {
+				return err
+			}
+
+		case []interface{}:
+			for _, v := range val.([]interface{}) {
+				if err := d.FixupDurations(v); err != nil {
+					return err
+				}
+			}
+
+		default:
+			if _, ok := d[strings.ToLower(key)]; ok {
 				// Convert a string value into an integer
 				if vStr, ok := val.(string); ok {
 					dur, err := time.ParseDuration(vStr)
@@ -285,6 +312,7 @@ func FixupConfigDurations(raw interface{}) error {
 				}
 			}
 		}
+	}
 	return nil
 }
 

agent/structs/structs.go

@@ -487,8 +487,9 @@ type HealthCheck struct {
 	Header                         map[string][]string  `json:",omitempty"`
 	Method                         string               `json:",omitempty"`
 	TCP                            string               `json:",omitempty"`
-	Interval      string              `json:",omitempty"`
-	Timeout       string              `json:",omitempty"`
+	Interval                       api.ReadableDuration `json:",omitempty"`
+	Timeout                        api.ReadableDuration `json:",omitempty"`
+	DeregisterCriticalServiceAfter api.ReadableDuration `json:",omitempty"`
 
 	RaftIndex
 }

api/agent.go

@@ -20,8 +20,9 @@ type AgentCheck struct {
 	Method                         string
 	TLSSkipVerify                  bool
 	TCP                            string
-	Interval      string
-	Timeout       string
+	Interval                       ReadableDuration
+	Timeout                        ReadableDuration
+	DeregisterCriticalServiceAfter ReadableDuration
 }
 
 // AgentService represents a service known to the agent

api/health.go

@@ -40,8 +40,9 @@ type HealthCheck struct {
 	Method                         string
 	TLSSkipVerify                  bool
 	TCP                            string
-	Interval      string
-	Timeout       string
+	Interval                       ReadableDuration
+	Timeout                        ReadableDuration
+	DeregisterCriticalServiceAfter ReadableDuration
 }
 
 // HealthChecks is a collection of HealthCheck structs.