Work on #61: Add support for ICMP

+ Update dependencies

core/service.go

@@ -182,9 +182,10 @@ func (service *Service) call(result *Result) {
 	var request *http.Request
 	var response *http.Response
 	var err error
-	isServiceTCP := strings.HasPrefix(service.URL, "tcp://")
 	isServiceDNS := service.DNS != nil
-	isServiceHTTP := !isServiceTCP && !isServiceDNS
+	isServiceTCP := strings.HasPrefix(service.URL, "tcp://")
+	isServiceICMP := strings.HasPrefix(service.URL, "icmp://")
+	isServiceHTTP := !isServiceDNS && !isServiceTCP && !isServiceICMP
 	if isServiceHTTP {
 		request = service.buildHTTPRequest()
 	}
@@ -193,7 +194,10 @@ func (service *Service) call(result *Result) {
 		service.DNS.query(service.URL, result)
 		result.Duration = time.Since(startTime)
 	} else if isServiceTCP {
-		result.Connected = client.CanCreateConnectionToTCPService(strings.TrimPrefix(service.URL, "tcp://"))
+		result.Connected = client.CanCreateTCPConnection(strings.TrimPrefix(service.URL, "tcp://"))
+		result.Duration = time.Since(startTime)
+	} else if isServiceICMP {
+		//result.Connected = client.CanPing(strings.TrimPrefix(service.URL, "icmp://"))
 		result.Duration = time.Since(startTime)
 	} else {
 		response, err = client.GetHTTPClient(service.Insecure).Do(request)

core/service_test.go

@@ -203,6 +203,25 @@ func TestIntegrationEvaluateHealth(t *testing.T) {
 	}
 }
 
+func TestIntegrationEvaluateHealthWithFailure(t *testing.T) {
+	condition := Condition("[STATUS] == 500")
+	service := Service{
+		Name:       "TwiNNatioN",
+		URL:        "https://twinnation.org/health",
+		Conditions: []*Condition{&condition},
+	}
+	result := service.EvaluateHealth()
+	if result.ConditionResults[0].Success {
+		t.Errorf("Condition '%s' should have been a failure", condition)
+	}
+	if !result.Connected {
+		t.Error("Because the connection has been established, result.Connected should've been true")
+	}
+	if result.Success {
+		t.Error("Because one of the conditions failed, success should have been false")
+	}
+}
+
 func TestIntegrationEvaluateHealthForDNS(t *testing.T) {
 	conditionSuccess := Condition("[DNS_RCODE] == NOERROR")
 	conditionBody := Condition("[BODY] == 93.184.216.34")
@@ -227,21 +246,21 @@ func TestIntegrationEvaluateHealthForDNS(t *testing.T) {
 	}
 }
 
-func TestIntegrationEvaluateHealthWithFailure(t *testing.T) {
-	condition := Condition("[STATUS] == 500")
+func TestIntegrationEvaluateHealthForICMP(t *testing.T) {
+	conditionSuccess := Condition("[CONNECTED] == true")
 	service := Service{
-		Name:       "TwiNNatioN",
-		URL:        "https://twinnation.org/health",
-		Conditions: []*Condition{&condition},
+		Name:       "Google",
+		URL:        "icmp://google.com",
+		Conditions: []*Condition{&conditionSuccess},
 	}
 	result := service.EvaluateHealth()
-	if result.ConditionResults[0].Success {
-		t.Errorf("Condition '%s' should have been a failure", condition)
+	if !result.ConditionResults[0].Success {
+		t.Errorf("Conditions '%s' should have been a success", conditionSuccess)
 	}
 	if !result.Connected {
 		t.Error("Because the connection has been established, result.Connected should've been true")
 	}
-	if result.Success {
-		t.Error("Because one of the conditions failed, success should have been false")
+	if !result.Success {
+		t.Error("Because all conditions passed, this should have been a success")
 	}
 }