Fixed hardcoded name in healthchecks.

Financial-Times · Oct 20, 2021 · 21ecde3 · 21ecde3
1 parent 4db233e
commit 21ecde3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/app.go b/app.go
@@ -213,7 +213,7 @@ func main() {
 		}
 
 		healthCheckEndpoint = baseURL.ResolveReference(healthCheckEndpoint)
-		hc := resources.NewHealthCheck(kafkaConsumer, healthCheckEndpoint.String(), requestStatusCode)
+		hc := resources.NewHealthCheck(kafkaConsumer, healthCheckEndpoint.String(), requestStatusCode, serviceName)
 
 		dispatcher, history := createDispatcher(*delay, *historySize, log)
 

diff --git a/app_integration_test.go b/app_integration_test.go
@@ -108,7 +108,7 @@ func TestPushNotifications(t *testing.T) {
 	defer server.Close()
 
 	// handler
-	hc := resources.NewHealthCheck(queue, apiGatewayGTGURL, nil)
+	hc := resources.NewHealthCheck(queue, apiGatewayGTGURL, nil, "notifications-push")
 
 	keyProcessor := resources.NewKeyProcessor(server.URL+apiGatewayValidateURL, server.URL+apiGatewayPoliciesURL, http.DefaultClient, l)
 	s := resources.NewSubHandler(d, keyProcessor, reg, heartbeat, l, []string{"Article", "ContentPackage", "Audio"},

diff --git a/resources/healthchecks.go b/resources/healthchecks.go
@@ -22,13 +22,15 @@ type HealthCheck struct {
 	consumer             KafkaConsumer
 	StatusFunc           RequestStatusFn
 	apiGatewayGTGAddress string
+	serviceName          string
 }
 
-func NewHealthCheck(kafkaConsumer KafkaConsumer, apiGatewayGTGAddress string, statusFunc RequestStatusFn) *HealthCheck {
+func NewHealthCheck(kafkaConsumer KafkaConsumer, apiGatewayGTGAddress string, statusFunc RequestStatusFn, serviceName string) *HealthCheck {
 	return &HealthCheck{
 		consumer:             kafkaConsumer,
 		apiGatewayGTGAddress: apiGatewayGTGAddress,
 		StatusFunc:           statusFunc,
+		serviceName:          serviceName,
 	}
 }
 
@@ -40,7 +42,7 @@ func (h *HealthCheck) Health() func(w http.ResponseWriter, r *http.Request) {
 	hc := fthealth.TimedHealthCheck{
 		HealthCheck: fthealth.HealthCheck{
 			SystemCode:  "upp-notifications-push",
-			Name:        "Notifications Push",
+			Name:        h.serviceName,
 			Description: "Checks if all the dependent services are reachable and healthy.",
 			Checks:      checks,
 		},

diff --git a/resources/healthchecks_test.go b/resources/healthchecks_test.go
@@ -64,7 +64,7 @@ func TestHealthcheck(t *testing.T) {
 		test := test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			hc := NewHealthCheck(test.kafkaConsumerMock, "randomAddress", test.statusFn)
+			hc := NewHealthCheck(test.kafkaConsumerMock, "randomAddress", test.statusFn, "notifications-push")
 
 			req, err := http.NewRequest("GET", "/__health", nil)
 			if err != nil {