Merge pull request #2226 from abhinavdahiya/rm-health-unknown

Fixes #1775; Removes 'unknown' state

api/health.go

@@ -8,7 +8,6 @@ const (
 	// HealthAny is special, and is used as a wild card,
 	// not as a specific state.
 	HealthAny      = "any"
-	HealthUnknown  = "unknown"
 	HealthPassing  = "passing"
 	HealthWarning  = "warning"
 	HealthCritical = "critical"
@@ -122,7 +121,6 @@ func (h *Health) State(state string, q *QueryOptions) ([]*HealthCheck, *QueryMet
 	case HealthWarning:
 	case HealthCritical:
 	case HealthPassing:
-	case HealthUnknown:
 	default:
 		return nil, nil, fmt.Errorf("Unsupported state: %v", state)
 	}

command/agent/dns_test.go

@@ -1745,27 +1745,6 @@ func TestDNS_ServiceLookup_OnlyPassing(t *testing.T) {
 		if err := srv.agent.RPC("Catalog.Register", args3, &out); err != nil {
 			t.Fatalf("err: %v", err)
 		}
-
-		args4 := &structs.RegisterRequest{
-			Datacenter: "dc1",
-			Node:       "quux",
-			Address:    "127.0.0.4",
-			Service: &structs.NodeService{
-				Service: "db",
-				Tags:    []string{"master"},
-				Port:    12345,
-			},
-			Check: &structs.HealthCheck{
-				CheckID:   "db",
-				Name:      "db",
-				ServiceID: "db",
-				Status:    structs.HealthUnknown,
-			},
-		}
-
-		if err := srv.agent.RPC("Catalog.Register", args4, &out); err != nil {
-			t.Fatalf("err: %v", err)
-		}
 	}
 
 	// Register an equivalent prepared query.

consul/structs/structs.go

@@ -53,7 +53,6 @@ const (
 	// HealthAny is special, and is used as a wild card,
 	// not as a specific state.
 	HealthAny      = "any"
-	HealthUnknown  = "unknown"
 	HealthPassing  = "passing"
 	HealthWarning  = "warning"
 	HealthCritical = "critical"