break out okta endpoint from health check

backend/src/main/java/gov/cdc/usds/simplereport/api/heathcheck/BackendAndDatabaseHealthIndicator.java

@@ -1,8 +1,6 @@
 package gov.cdc.usds.simplereport.api.heathcheck;
 
-import com.okta.sdk.resource.client.ApiException;
 import gov.cdc.usds.simplereport.db.repository.FeatureFlagRepository;
-import gov.cdc.usds.simplereport.idp.repository.OktaRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.JDBCConnectionException;
@@ -15,28 +13,16 @@
 @RequiredArgsConstructor
 public class BackendAndDatabaseHealthIndicator implements HealthIndicator {
   private final FeatureFlagRepository _ffRepo;
-  private final OktaRepository _oktaRepo;
-  public static final String ACTIVE_LITERAL = "ACTIVE";
 
   @Override
   public Health health() {
     try {
       _ffRepo.findAll();
-      String oktaStatus = _oktaRepo.getApplicationStatusForHealthCheck();
-
-      if (!ACTIVE_LITERAL.equals(oktaStatus)) {
-        log.info("Okta status didn't return ACTIVE, instead returned " + oktaStatus);
-        return Health.down().build();
-      }
       return Health.up().build();
 
       // reach into the ff repository returned a bad value or db connection issue respectively
     } catch (IllegalArgumentException | JDBCConnectionException e) {
       return Health.down().build();
-    } catch (ApiException e) {
-      // Okta API call errored
-      log.info(e.getMessage());
-      return Health.down().build();
     }
   }
 }

backend/src/main/java/gov/cdc/usds/simplereport/api/heathcheck/OktaHealthIndicator.java

@@ -0,0 +1,34 @@
+package gov.cdc.usds.simplereport.api.heathcheck;
+
+import gov.cdc.usds.simplereport.idp.repository.OktaRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class OktaHealthIndicator implements HealthIndicator {
+  private final OktaRepository _oktaRepo;
+  public static final String ACTIVE_LITERAL = "ACTIVE";
+
+  @Override
+  public Health health() {
+    try {
+      String oktaStatus = _oktaRepo.getApplicationStatusForHealthCheck();
+      if (!ACTIVE_LITERAL.equals(oktaStatus)) {
+        log.info("Okta status didn't return ACTIVE, instead returned " + oktaStatus);
+        Health.Builder oktaDegradedWarning = Health.status("OKTA_DEGRADED");
+        return oktaDegradedWarning.build();
+      }
+    } catch (NullPointerException e) {
+      log.info("Call to Okta repository status returned null");
+      Health.Builder oktaDegradedWarning = Health.status("OKTA_DEGRADED");
+      return oktaDegradedWarning.build();
+    }
+
+    return Health.up().build();
+  }
+}

backend/src/main/java/gov/cdc/usds/simplereport/idp/repository/DemoOktaRepository.java

@@ -1,6 +1,6 @@
 package gov.cdc.usds.simplereport.idp.repository;
 
-import static gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator.ACTIVE_LITERAL;
+import static gov.cdc.usds.simplereport.api.heathcheck.OktaHealthIndicator.ACTIVE_LITERAL;
 
 import com.okta.sdk.resource.model.UserStatus;
 import gov.cdc.usds.simplereport.api.CurrentTenantDataAccessContextHolder;

backend/src/main/java/gov/cdc/usds/simplereport/idp/repository/LiveOktaRepository.java

@@ -39,6 +39,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -690,7 +691,7 @@ public PartialOktaUser findUser(String username) {
 
   @Override
   public String getApplicationStatusForHealthCheck() {
-    return app.getStatus().toString();
+    return Objects.requireNonNull(app.getStatus()).toString();
   }
 
   private Optional<OrganizationRoleClaims> getOrganizationRoleClaimsFromAuthorities(

backend/src/main/resources/application.yaml

@@ -78,6 +78,13 @@ management:
   endpoint.info.enabled: true
   endpoints.web.exposure.include: health, info
   endpoint.health.show-components: always
+  endpoint:
+    health:
+      show-components: always
+      status:
+        http-mapping:
+          okta_degraded: 204
+      probes.enabled: true
 okta:
   oauth2:
     issuer: https://hhs-prime.okta.com/oauth2/default

backend/src/test/java/gov/cdc/usds/simplereport/api/healthcheck/BackendAndDatabaseHealthIndicatorTest.java

@@ -1,13 +1,11 @@
 package gov.cdc.usds.simplereport.api.healthcheck;
 
-import static gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator.ACTIVE_LITERAL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
 import gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator;
 import gov.cdc.usds.simplereport.db.repository.BaseRepositoryTest;
 import gov.cdc.usds.simplereport.db.repository.FeatureFlagRepository;
-import gov.cdc.usds.simplereport.idp.repository.OktaRepository;
 import java.sql.SQLException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -23,14 +21,12 @@
 class BackendAndDatabaseHealthIndicatorTest extends BaseRepositoryTest {
 
   @SpyBean private FeatureFlagRepository mockFeatureFlagRepo;
-  @SpyBean private OktaRepository mockOktaRepo;
 
   @Autowired private BackendAndDatabaseHealthIndicator indicator;
 
   @Test
   void health_succeedsWhenReposDoesntThrow() {
     when(mockFeatureFlagRepo.findAll()).thenReturn(List.of());
-    when(mockOktaRepo.getApplicationStatusForHealthCheck()).thenReturn(ACTIVE_LITERAL);
 
     assertThat(indicator.health()).isEqualTo(Health.up().build());
   }
@@ -51,10 +47,4 @@ void health_failsWhenFeatureFlagRepoThrows() {
     when(mockFeatureFlagRepo.findAll()).thenThrow(dbConnectionException);
     assertThat(indicator.health()).isEqualTo(Health.down().build());
   }
-
-  @Test
-  void health_failsWhenOktaRepoDoesntReturnActive() {
-    when(mockOktaRepo.getApplicationStatusForHealthCheck()).thenReturn("INACTIVE");
-    assertThat(indicator.health()).isEqualTo(Health.down().build());
-  }
 }

backend/src/test/java/gov/cdc/usds/simplereport/api/healthcheck/OktaHealthIndicatorTest.java

@@ -0,0 +1,37 @@
+package gov.cdc.usds.simplereport.api.healthcheck;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import gov.cdc.usds.simplereport.api.heathcheck.OktaHealthIndicator;
+import gov.cdc.usds.simplereport.db.repository.BaseRepositoryTest;
+import gov.cdc.usds.simplereport.idp.repository.DemoOktaRepository;
+import lombok.RequiredArgsConstructor;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+
+@RequiredArgsConstructor
+@EnableConfigurationProperties
+class OktaHealthIndicatorTest extends BaseRepositoryTest {
+
+  @SpyBean private DemoOktaRepository mockOktaRepo;
+
+  @Autowired private OktaHealthIndicator indicator;
+
+  @Test
+  void health_SUCCEEDSWhenOktaRepoReturnsActive() {
+    when(mockOktaRepo.getApplicationStatusForHealthCheck()).thenReturn("ACTIVE");
+    assertThat(indicator.health()).isEqualTo(Health.up().build());
+  }
+
+  @Test
+  void health_failsWhenOktaRepoDoesntReturnActive() {
+    when(mockOktaRepo.getApplicationStatusForHealthCheck()).thenReturn("INACTIVE");
+    Health.Builder oktaDegradedWarning = Health.status("OKTA_DEGRADED");
+
+    assertThat(indicator.health()).isEqualTo(oktaDegradedWarning.build());
+  }
+}

backend/src/test/java/gov/cdc/usds/simplereport/test_util/SliceTestConfiguration.java

@@ -6,6 +6,7 @@
 import gov.cdc.usds.simplereport.api.CurrentTenantDataAccessContextHolder;
 import gov.cdc.usds.simplereport.api.WebhookContextHolder;
 import gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator;
+import gov.cdc.usds.simplereport.api.heathcheck.OktaHealthIndicator;
 import gov.cdc.usds.simplereport.api.pxp.CurrentPatientContextHolder;
 import gov.cdc.usds.simplereport.config.AuditingConfig;
 import gov.cdc.usds.simplereport.config.AuthorizationProperties;
@@ -105,6 +106,7 @@
   TenantDataAccessService.class,
   PatientSelfRegistrationLinkService.class,
   BackendAndDatabaseHealthIndicator.class,
+  OktaHealthIndicator.class,
   EmailService.class,
   SendGridDisabledConfiguration.class,
 })

frontend/deploy-smoke.js

@@ -3,7 +3,6 @@
 // endpoint which does a simple ping to a non-sensitive DB table to verify
 // all the connections are good.
 // https://github.com/CDCgov/prime-simplereport/pull/7057
-
 require("dotenv").config();
 let { Builder } = require("selenium-webdriver");
 const Chrome = require("selenium-webdriver/chrome");
@@ -33,16 +32,35 @@ driver
     return value;
   })
   .then((value) => {
-    if (value.includes("success")) {
+    let appStatusSuccess, oktaStatusSuccess;
+    if (value.includes("App status returned success")) {
+      appStatusSuccess = true;
+    }
+    if (value.includes("Okta status returned success")) {
+      oktaStatusSuccess = true;
+    }
+    if (value.includes("App status returned failure")) {
+      appStatusSuccess = false;
+    }
+    if (value.includes("Okta status returned failure")) {
+      oktaStatusSuccess = false;
+    }
+
+    if (appStatusSuccess && oktaStatusSuccess) {
       console.log(`Smoke test returned success status for ${appUrl}`);
       process.exitCode = 0;
       return;
     }
-    if (value.includes("failure")) {
+
+    if (appStatusSuccess === false || oktaStatusSuccess === false) {
       console.log(`Smoke test returned failure status for ${appUrl}`);
+      console.log(
+        `App health returned ${appStatusSuccess}, okta health returned ${oktaStatusSuccess}`
+      );
       process.exitCode = 1;
       return;
     }
+
     console.log("Smoke test encountered unknown failure.");
     console.log(`Root element value was: ${value}`);
     process.exitCode = 1;

frontend/src/app/DeploySmokeTest.test.tsx

@@ -1,30 +1,56 @@
 import { render, screen, waitFor } from "@testing-library/react";
 import { FetchMock } from "jest-fetch-mock";
 
-import DeploySmokeTest from "./DeploySmokeTest";
+import DeploySmokeTest, {
+  APP_STATUS_FAILURE,
+  APP_STATUS_LOADING,
+  APP_STATUS_SUCCESS,
+  OKTA_STATUS_LOADING,
+  OKTA_STATUS_SUCCESS,
+} from "./DeploySmokeTest";
+import { generateBackendApiHealthResponse } from "./deploySmokeTestTestConstants";
 
 describe("DeploySmokeTest", () => {
   beforeEach(() => {
     (fetch as FetchMock).resetMocks();
   });
 
   it("renders success when returned from the API endpoint", async () => {
-    (fetch as FetchMock).mockResponseOnce(JSON.stringify({ status: "UP" }));
+    (fetch as FetchMock).mockResponseOnce(
+      JSON.stringify(generateBackendApiHealthResponse("UP"))
+    );
+    (fetch as FetchMock).mockResponseOnce(
+      JSON.stringify(generateBackendApiHealthResponse("DOWN"))
+    );
 
     render(<DeploySmokeTest />);
     await waitFor(() =>
-      expect(screen.queryByText("Status loading...")).not.toBeInTheDocument()
+      expect(screen.queryByText(APP_STATUS_LOADING)).not.toBeInTheDocument()
     );
-    expect(screen.getByText("Status returned success :)"));
+    expect(screen.getByText(APP_STATUS_SUCCESS));
   });
 
   it("renders failure when returned from the API endpoint", async () => {
-    (fetch as FetchMock).mockResponseOnce(JSON.stringify({ status: "DOWN" }));
+    (fetch as FetchMock).mockResponse(
+      JSON.stringify(generateBackendApiHealthResponse("DOWN"))
+    );
+
+    render(<DeploySmokeTest />);
+    await waitFor(() =>
+      expect(screen.queryByText(APP_STATUS_LOADING)).not.toBeInTheDocument()
+    );
+    expect(screen.getByText(APP_STATUS_FAILURE));
+  });
+
+  it("renders Okta success when returned from the API endpoint", async () => {
+    (fetch as FetchMock).mockResponse(
+      JSON.stringify(generateBackendApiHealthResponse())
+    );
 
     render(<DeploySmokeTest />);
     await waitFor(() =>
-      expect(screen.queryByText("Status loading...")).not.toBeInTheDocument()
+      expect(screen.queryByText(OKTA_STATUS_LOADING)).not.toBeInTheDocument()
     );
-    expect(screen.getByText("Status returned failure :("));
+    expect(screen.getByText(OKTA_STATUS_SUCCESS));
   });
 });