From 8d0e886a872ddcaff1f786f58385c2cdaf8fcd42 Mon Sep 17 00:00:00 2001 From: AbuSalamHMCTS <138011124+AbuSalamHMCTS@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:29:58 +0000 Subject: [PATCH] DFR-2638 Remove redundant/unnecessary Health Checks (#1899) * DFR-2638 Remove redundant/unnecessary Health Checks --------- Co-authored-by: AbuSalam22 --- .../monitoring/health/IdamApiHealthCheck.java | 17 --- .../health/PaymentServiceHealthCheck.java | 17 --- .../health/SendLetterServiceHealthCheck.java | 17 --- .../functionaltest/HealthCheckITest.java | 106 ------------------ 4 files changed, 157 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/IdamApiHealthCheck.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/PaymentServiceHealthCheck.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/SendLetterServiceHealthCheck.java diff --git a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/IdamApiHealthCheck.java b/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/IdamApiHealthCheck.java deleted file mode 100644 index 22b6187f0c..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/IdamApiHealthCheck.java +++ /dev/null @@ -1,17 +0,0 @@ -package uk.gov.hmcts.reform.divorce.orchestration.management.monitoring.health; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -@Component -public class IdamApiHealthCheck extends WebServiceHealthCheck { - @Autowired - public IdamApiHealthCheck(HttpEntityFactory httpEntityFactory, - @Qualifier("healthCheckRestTemplate") RestTemplate restTemplate, - @Value("${idam.api.url}/health") String uri) { - super(httpEntityFactory, restTemplate, uri); - } -} \ No newline at end of file diff --git a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/PaymentServiceHealthCheck.java b/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/PaymentServiceHealthCheck.java deleted file mode 100644 index f7be715669..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/PaymentServiceHealthCheck.java +++ /dev/null @@ -1,17 +0,0 @@ -package uk.gov.hmcts.reform.divorce.orchestration.management.monitoring.health; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -@Component -public class PaymentServiceHealthCheck extends WebServiceHealthCheck { - @Autowired - public PaymentServiceHealthCheck(HttpEntityFactory httpEntityFactory, - @Qualifier("healthCheckRestTemplate") RestTemplate restTemplate, - @Value("${payment.service.api.baseurl}/health") String uri) { - super(httpEntityFactory, restTemplate, uri); - } -} diff --git a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/SendLetterServiceHealthCheck.java b/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/SendLetterServiceHealthCheck.java deleted file mode 100644 index 8dc0830838..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/management/monitoring/health/SendLetterServiceHealthCheck.java +++ /dev/null @@ -1,17 +0,0 @@ -package uk.gov.hmcts.reform.divorce.orchestration.management.monitoring.health; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -@Component -public class SendLetterServiceHealthCheck extends WebServiceHealthCheck { - @Autowired - public SendLetterServiceHealthCheck(HttpEntityFactory httpEntityFactory, - @Qualifier("healthCheckRestTemplate") RestTemplate restTemplate, - @Value("${send-letter.url}/health") String uri) { - super(httpEntityFactory, restTemplate, uri); - } -} diff --git a/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/functionaltest/HealthCheckITest.java b/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/functionaltest/HealthCheckITest.java index 2052202f41..620a6b2734 100644 --- a/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/functionaltest/HealthCheckITest.java +++ b/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/functionaltest/HealthCheckITest.java @@ -62,9 +62,6 @@ public void givenAllDependenciesAreUp_whenCheckHealth_thenReturnStatusUp() throw mockEndpointAndResponse(maintenanceServiceServer, true); mockEndpointAndResponse(documentGeneratorServiceServer, true); mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, true); waitForMockChange(); @@ -82,49 +79,9 @@ public void givenAllDependenciesAreUp_whenCheckHealth_thenReturnStatusUp() throw equalTo("UP")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("UP")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); - - assertThat(JsonPath.read(body, "$.components.sendLetterServiceHealthCheck.status").toString(), equalTo("UP")); - } - - - @Test - public void givenSendLetterServiceIsDown_whenCheckHealth_thenReturnStatusDown() throws Exception { - mockEndpointAndResponse(formatterServiceServer, false); - mockEndpointAndResponse(maintenanceServiceServer, true); - mockEndpointAndResponse(documentGeneratorServiceServer, true); - mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, false); - mockEndpointAndResponse(serviceAuthProviderServer, true); - - waitForMockChange(); - - HttpResponse response = getHealth(); - String body = EntityUtils.toString(response.getEntity()); - - assertThat(response.getStatusLine().getStatusCode(), equalTo(503)); - assertThat(JsonPath.read(body, "$.status").toString(), equalTo("DOWN")); - assertThat(JsonPath.read(body, "$.components.caseFormatterServiceHealthCheck.status").toString(), - equalTo("DOWN")); - assertThat(JsonPath.read(body, "$.components.caseMaintenanceServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.documentGeneratorServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.sendLetterServiceHealthCheck.status").toString(), - equalTo("DOWN")); - assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); } @Test @@ -133,9 +90,6 @@ public void givenCaseFormatterServiceIsDown_whenCheckHealth_thenReturnStatusDown mockEndpointAndResponse(maintenanceServiceServer, true); mockEndpointAndResponse(documentGeneratorServiceServer, true); mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, true); waitForMockChange(); @@ -153,8 +107,6 @@ public void givenCaseFormatterServiceIsDown_whenCheckHealth_thenReturnStatusDown equalTo("UP")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("UP")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); @@ -166,9 +118,6 @@ public void givenDocumentGeneratorServiceIsDown_whenCheckHealth_thenReturnStatus mockEndpointAndResponse(maintenanceServiceServer, true); mockEndpointAndResponse(documentGeneratorServiceServer, false); mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, true); waitForMockChange(); @@ -186,8 +135,6 @@ public void givenDocumentGeneratorServiceIsDown_whenCheckHealth_thenReturnStatus equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("UP")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); @@ -199,9 +146,6 @@ public void givenCaseMaintenanceServiceIsDown_whenCheckHealth_thenReturnStatusDo mockEndpointAndResponse(maintenanceServiceServer, false); mockEndpointAndResponse(documentGeneratorServiceServer, true); mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, true); waitForMockChange(); @@ -219,8 +163,6 @@ public void givenCaseMaintenanceServiceIsDown_whenCheckHealth_thenReturnStatusDo equalTo("UP")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("UP")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); @@ -232,9 +174,6 @@ public void givenFeesAndPaymentsServiceIsDown_whenCheckHealth_thenReturnStatusDo mockEndpointAndResponse(maintenanceServiceServer, true); mockEndpointAndResponse(documentGeneratorServiceServer, true); mockEndpointAndResponse(feesAndPaymentsServer, false); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, true); waitForMockChange(); @@ -252,41 +191,6 @@ public void givenFeesAndPaymentsServiceIsDown_whenCheckHealth_thenReturnStatusDo equalTo("UP")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("DOWN")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); - } - - @Test - public void givenPaymentServiceIsDown_whenCheckHealth_thenReturnStatusDown() throws Exception { - mockEndpointAndResponse(formatterServiceServer, true); - mockEndpointAndResponse(maintenanceServiceServer, true); - mockEndpointAndResponse(documentGeneratorServiceServer, true); - mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, false); - mockEndpointAndResponse(sendLetterService, true); - mockEndpointAndResponse(serviceAuthProviderServer, true); - - waitForMockChange(); - - HttpResponse response = getHealth(); - String body = EntityUtils.toString(response.getEntity()); - - assertThat(response.getStatusLine().getStatusCode(), equalTo(503)); - assertThat(JsonPath.read(body, "$.status").toString(), equalTo("DOWN")); - assertThat(JsonPath.read(body, "$.components.caseFormatterServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.caseMaintenanceServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.documentGeneratorServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), - equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("UP")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); @@ -298,9 +202,6 @@ public void givenServiceAuthIsDown_whenCheckHealth_thenReturnStatusDown() throws mockEndpointAndResponse(maintenanceServiceServer, true); mockEndpointAndResponse(documentGeneratorServiceServer, true); mockEndpointAndResponse(feesAndPaymentsServer, true); - mockEndpointAndResponse(idamServer, true); - mockEndpointAndResponse(paymentServiceServer, true); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, false); waitForMockChange(); @@ -318,8 +219,6 @@ public void givenServiceAuthIsDown_whenCheckHealth_thenReturnStatusDown() throws equalTo("UP")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("UP")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("UP")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP")); @@ -331,9 +230,6 @@ public void givenAllDependenciesAreDown_whenCheckHealth_thenReturnStatusDown() t mockEndpointAndResponse(maintenanceServiceServer, false); mockEndpointAndResponse(documentGeneratorServiceServer, false); mockEndpointAndResponse(feesAndPaymentsServer, false); - mockEndpointAndResponse(idamServer, false); - mockEndpointAndResponse(paymentServiceServer, false); - mockEndpointAndResponse(sendLetterService, true); mockEndpointAndResponse(serviceAuthProviderServer, false); waitForMockChange(); @@ -351,8 +247,6 @@ public void givenAllDependenciesAreDown_whenCheckHealth_thenReturnStatusDown() t equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.feesAndPaymentsServiceHealthCheck.status").toString(), equalTo("DOWN")); - assertThat(JsonPath.read(body, "$.components.paymentServiceHealthCheck.status").toString(), - equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.diskSpace.status").toString(), equalTo("UP"));