agent: support adding multiple checks during service registration from the API

command/agent/agent_endpoint.go

@@ -132,17 +132,25 @@ func (s *HTTPServer) AgentRegisterService(resp http.ResponseWriter, req *http.Re
 			return nil
 		}
 
-		var check interface{}
 		for k, v := range rawMap {
-			if strings.ToLower(k) == "check" {
+			switch strings.ToLower(k) {
-				check = v
+			case "check":
+				if err := FixupCheckType(v); err != nil {
+					return err
 				}
-		}
+			case "checks":
-		if check == nil {
+				chkTypes, ok := v.([]interface{})
+				if !ok {
 					return nil
 				}
-
+				for _, chkType := range chkTypes {
-		return FixupCheckType(check)
+					if err := FixupCheckType(chkType); err != nil {
+						return err
+					}
+				}
+			}
+		}
+		return nil
 	}
 	if err := decodeBody(req, &args, decodeCB); err != nil {
 		resp.WriteHeader(400)

command/agent/agent_endpoint_test.go

@@ -430,6 +430,14 @@ func TestHTTPAgentRegisterService(t *testing.T) {
 		Check: CheckType{
 			TTL: 15 * time.Second,
 		},
+		Checks: CheckTypes{
+			&CheckType{
+				TTL: 20 * time.Second,
+			},
+			&CheckType{
+				TTL: 30 * time.Second,
+			},
+		},
 	}
 	req.Body = encodeReq(args)
 
@@ -447,12 +455,13 @@ func TestHTTPAgentRegisterService(t *testing.T) {
 	}
 
 	// Ensure we have a check mapping
-	if _, ok := srv.agent.state.Checks()["service:test"]; !ok {
+	checks := srv.agent.state.Checks()
-		t.Fatalf("missing test check")
+	if len(checks) != 3 {
+		t.Fatalf("bad: %v", checks)
 	}
 
-	if _, ok := srv.agent.checkTTLs["service:test"]; !ok {
+	if len(srv.agent.checkTTLs) != 3 {
-		t.Fatalf("missing test check ttl")
+		t.Fatalf("missing test check ttls: %v", srv.agent.checkTTLs)
 	}
 }