From 58fd8a66fe47242eab7d3be1a18dcf5fcdb4566e Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 16 Jan 2019 22:16:05 +0100 Subject: [PATCH] Fix invalid port response Closes #64 --- http/http.go | 2 +- http/http_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/http/http.go b/http/http.go index 193920d..ae755c0 100644 --- a/http/http.go +++ b/http/http.go @@ -196,7 +196,7 @@ func (s *Server) HealthHandler(w http.ResponseWriter, r *http.Request) *appError func (s *Server) PortHandler(w http.ResponseWriter, r *http.Request) *appError { response, err := s.newPortResponse(r) if err != nil { - return badRequest(err).WithMessage(fmt.Sprintf("Invalid port: %d", response.Port)).AsJSON() + return badRequest(err).WithMessage(err.Error()).AsJSON() } b, err := json.Marshal(response) if err != nil { diff --git a/http/http_test.go b/http/http_test.go index 68f1f3f..d7dd35f 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -130,9 +130,9 @@ func TestJSONHandlers(t *testing.T) { status int }{ {s.URL, `{"ip":"127.0.0.1","ip_decimal":2130706433,"country":"Elbonia","country_eu":false,"country_iso":"EB","city":"Bornyasherk","hostname":"localhost","latitude":63.416667,"longitude":10.416667}`, 200}, - {s.URL + "/port/foo", `{"error":"Invalid port: 0"}`, 400}, - {s.URL + "/port/0", `{"error":"Invalid port: 0"}`, 400}, - {s.URL + "/port/65537", `{"error":"Invalid port: 65537"}`, 400}, + {s.URL + "/port/foo", `{"error":"invalid port: foo"}`, 400}, + {s.URL + "/port/0", `{"error":"invalid port: 0"}`, 400}, + {s.URL + "/port/65537", `{"error":"invalid port: 65537"}`, 400}, {s.URL + "/port/31337", `{"ip":"127.0.0.1","port":31337,"reachable":true}`, 200}, {s.URL + "/foo", `{"error":"404 page not found"}`, 404}, {s.URL + "/health", `{"status":"OK"}`, 200},