Store check type in catalog

agent/catalog_endpoint_test.go

@@ -520,6 +520,59 @@ func TestCatalogServices_NodeMetaFilter(t *testing.T) {
 	}
 }
 
+func TestCatalogRegister_checkRegistration(t *testing.T) {
+	t.Parallel()
+	a := NewTestAgent(t, t.Name(), "")
+	defer a.Shutdown()
+
+	// Register node with a service and check
+	check := structs.HealthCheck{
+		Node:      "foo",
+		CheckID:   "foo-check",
+		Name:      "foo check",
+		ServiceID: "api",
+		Definition: structs.HealthCheckDefinition{
+			TCP:      "localhost:8888",
+			Interval: 5 * time.Second,
+		},
+	}
+
+	args := &structs.RegisterRequest{
+		Datacenter: "dc1",
+		Node:       "foo",
+		Address:    "127.0.0.1",
+		Service: &structs.NodeService{
+			Service: "api",
+		},
+		Check: &check,
+	}
+
+	var out struct{}
+	if err := a.RPC("Catalog.Register", args, &out); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	retry.Run(t, func(r *retry.R) {
+		req, _ := http.NewRequest("GET", "/v1/health/checks/api", nil)
+		resp := httptest.NewRecorder()
+		obj, err := a.srv.HealthServiceChecks(resp, req)
+		if err != nil {
+			r.Fatalf("err: %v", err)
+		}
+
+		checks := obj.(structs.HealthChecks)
+		if len(checks) != 1 {
+			r.Fatalf("expected 1 check, got: %d", len(checks))
+		}
+		if checks[0].CheckID != check.CheckID {
+			r.Fatalf("expected check id %s, got %s", check.Type, checks[0].Type)
+		}
+		if checks[0].Type != "tcp" {
+			r.Fatalf("expected check type tcp, got %s", checks[0].Type)
+		}
+	})
+}
+
 func TestCatalogServiceNodes(t *testing.T) {
 	t.Parallel()
 	a := NewTestAgent(t, t.Name(), "")

agent/consul/catalog_endpoint.go

@@ -125,6 +125,13 @@ func (c *Catalog) Register(args *structs.RegisterRequest, reply *struct{}) error
 			check.Node = args.Node
 		}
 		checkPreApply(check)
+
+		// Populate check type for cases when this is a direct reg with /catalog/register
+		// Typically this is populated when a check is registered with an agent
+		if check.Type == "" {
+			chkType := check.CheckType()
+			check.Type = chkType.Type()
+		}
 	}
 
 	// Check the complete register request against the given ACL policy.

agent/structs/structs.go

@@ -1255,6 +1255,32 @@ func (c *HealthCheck) Clone() *HealthCheck {
 	return clone
 }
 
+func (c *HealthCheck) CheckType() *CheckType {
+	return &CheckType{
+		CheckID: c.CheckID,
+		Name:    c.Name,
+		Status:  c.Status,
+		Notes:   c.Notes,
+
+		ScriptArgs:                     c.Definition.ScriptArgs,
+		AliasNode:                      c.Definition.AliasNode,
+		AliasService:                   c.Definition.AliasService,
+		HTTP:                           c.Definition.HTTP,
+		GRPC:                           c.Definition.GRPC,
+		GRPCUseTLS:                     c.Definition.GRPCUseTLS,
+		Header:                         c.Definition.Header,
+		Method:                         c.Definition.Method,
+		TCP:                            c.Definition.TCP,
+		Interval:                       c.Definition.Interval,
+		DockerContainerID:              c.Definition.DockerContainerID,
+		Shell:                          c.Definition.Shell,
+		TLSSkipVerify:                  c.Definition.TLSSkipVerify,
+		Timeout:                        c.Definition.Timeout,
+		TTL:                            c.Definition.TTL,
+		DeregisterCriticalServiceAfter: c.Definition.DeregisterCriticalServiceAfter,
+	}
+}
+
 // HealthChecks is a collection of HealthCheck structs.
 type HealthChecks []*HealthCheck
 

api/txn_test.go

@@ -194,6 +194,7 @@ func TestAPI_ClientTxn(t *testing.T) {
 					DeregisterCriticalServiceAfter:         ReadableDuration(20 * time.Second),
 					DeregisterCriticalServiceAfterDuration: 20 * time.Second,
 				},
+				Type:        "tcp",
 				CreateIndex: ret.Results[4].Check.CreateIndex,
 				ModifyIndex: ret.Results[4].Check.CreateIndex,
 			},
@@ -212,6 +213,7 @@ func TestAPI_ClientTxn(t *testing.T) {
 					DeregisterCriticalServiceAfter:         ReadableDuration(160 * time.Second),
 					DeregisterCriticalServiceAfterDuration: 160 * time.Second,
 				},
+				Type:        "tcp",
 				CreateIndex: ret.Results[4].Check.CreateIndex,
 				ModifyIndex: ret.Results[4].Check.CreateIndex,
 			},