use /actuator/health for backend health checks

backend/src/main/java/gov/cdc/usds/simplereport/config/OktaLocalSecurityConfiguration.java

@@ -42,12 +42,8 @@ protected void configure(HttpSecurity http) throws Exception {
     http.cors()
         .and()
         .authorizeRequests()
-        .antMatchers("/")
-        .permitAll()
         .antMatchers(HttpMethod.OPTIONS, "/**")
         .permitAll()
-        .antMatchers(HttpMethod.GET, WebConfiguration.HEALTH_CHECK)
-        .permitAll()
         .antMatchers("/echo/**", "/authTest/**")
         .permitAll()
         .requestMatchers(EndpointRequest.to(HealthEndpoint.class))

backend/src/main/java/gov/cdc/usds/simplereport/config/SecurityConfiguration.java

@@ -48,12 +48,8 @@ protected void configure(HttpSecurity http) throws Exception {
     http.cors()
         .and()
         .authorizeRequests()
-        .antMatchers("/")
-        .permitAll()
         .antMatchers(HttpMethod.OPTIONS, "/**")
         .permitAll()
-        .antMatchers(HttpMethod.GET, WebConfiguration.HEALTH_CHECK)
-        .permitAll()
         .antMatchers("/echo/**", "/authTest/**")
         .permitAll()
         .requestMatchers(EndpointRequest.to(HealthEndpoint.class))

backend/src/main/java/gov/cdc/usds/simplereport/config/WebConfiguration.java

@@ -6,17 +6,14 @@
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpStatus;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @ConditionalOnWebApplication
 public class WebConfiguration implements WebMvcConfigurer {
 
-  public static final String HEALTH_CHECK = "/health";
   public static final String PATIENT_EXPERIENCE = "/pxp/**";
   public static final String TWILIO_CALLBACK = "/pxp/callback";
   public static final String RS_QUEUE_CALLBACK = "/reportstream/callback";
@@ -34,11 +31,6 @@ public class WebConfiguration implements WebMvcConfigurer {
 
   @Autowired private RestLoggingInterceptor _loggingInterceptor;
 
-  @Override
-  public void addViewControllers(ViewControllerRegistry registry) {
-    registry.addStatusController(HEALTH_CHECK, HttpStatus.OK);
-  }
-
   @Override
   public void addInterceptors(InterceptorRegistry registry) {
     registry.addInterceptor(_loggingInterceptor).excludePathPatterns(GRAPH_QL);

cypress/e2e.sh

@@ -22,7 +22,7 @@ EOF
 SPEC_PATH="cypress/e2e/**"
 TEST_ENV="https://localhost.simplereport.gov"
 CHECK_COMMIT="$(git rev-parse HEAD)"
-BACKEND_URL_PATH="/api/health"
+BACKEND_URL_PATH="/api/actuator/health"
 PUBLIC_URL="/app"
 FRONTEND_URL_PATH="/health/commit"
 RUN_OPEN=false

lighthouse.sh

@@ -3,14 +3,14 @@
 echo "Starting docker containers"
 docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --quiet-pull
 
-echo "Waiting for backend to start at https://localhost.simplereport.gov/api/health"
+echo "Waiting for backend to start at https://localhost.simplereport.gov/api/actuator/health"
 http_response=0
 polls=0
 while [[ $http_response != "200" && $polls -lt 180 ]]; do
   ((polls++))
   sleep 2
-  echo "Waiting for backend to start at https://localhost.simplereport.gov/api/health"
-  http_response=$(curl -skL -w "%{http_code}" "https://localhost.simplereport.gov/api/health")
+  echo "Waiting for backend to start at https://localhost.simplereport.gov/api/actuator/health"
+  http_response=$(curl -skL -w "%{http_code}" "https://localhost.simplereport.gov/api/actuator/health")
 done
 if [[ $http_response -ne 200 ]]; then
   echo 'Backend never started. Exiting...'

ops/services/app_gateway/main.tf

@@ -124,6 +124,7 @@ resource "azurerm_application_gateway" "load_balancer" {
     protocol                            = "Http"
     request_timeout                     = 60
     pick_host_name_from_backend_address = true
+    probe_name                          = "be-http"
   }
 
   backend_http_settings {
@@ -133,6 +134,37 @@ resource "azurerm_application_gateway" "load_balancer" {
     protocol                            = "Https"
     request_timeout                     = 60
     pick_host_name_from_backend_address = true
+    probe_name                          = "be-https"
+  }
+
+  probe {
+    name                                      = "be-http"
+    interval                                  = 10
+    path                                      = "/actuator/health"
+    pick_host_name_from_backend_http_settings = true
+    protocol                                  = "Http"
+    timeout                                   = 10
+    unhealthy_threshold                       = 3
+
+    match {
+      body        = "UP"
+      status_code = [200]
+    }
+  }
+
+  probe {
+    name                                      = "be-https"
+    interval                                  = 10
+    path                                      = "/actuator/health"
+    pick_host_name_from_backend_http_settings = true
+    protocol                                  = "Https"
+    timeout                                   = 10
+    unhealthy_threshold                       = 3
+
+    match {
+      body        = "UP"
+      status_code = [200]
+    }
   }
 
   # ------- Backend Metabase App -------------------------
@@ -174,6 +206,7 @@ resource "azurerm_application_gateway" "load_balancer" {
     protocol                            = "Http"
     request_timeout                     = 20
     pick_host_name_from_backend_address = true
+    probe_name                          = "be-http"
   }
 
   backend_http_settings {
@@ -183,6 +216,7 @@ resource "azurerm_application_gateway" "load_balancer" {
     protocol                            = "Https"
     request_timeout                     = 20
     pick_host_name_from_backend_address = true
+    probe_name                          = "be-https"
   }
 
   # ------- Listeners -------------------------

ops/services/app_service/main.tf

@@ -50,7 +50,7 @@ resource "azurerm_linux_web_app" "service" {
   # Configure Docker Image to load on start
   site_config {
     always_on                         = "true"
-    health_check_path                 = "/health"
+    health_check_path                 = "/actuator/health"
     health_check_eviction_time_in_min = 5
     scm_minimum_tls_version           = "1.2"
     use_32_bit_worker                 = false
@@ -90,7 +90,7 @@ resource "azurerm_linux_web_app_slot" "staging" {
   # Configure Docker Image to load on start
   site_config {
     always_on                         = "true"
-    health_check_path                 = "/health"
+    health_check_path                 = "/actuator/health"
     health_check_eviction_time_in_min = 5
     scm_minimum_tls_version           = "1.2"
     use_32_bit_worker                 = false