Update public API health check & add organization ID to workspace con…

…troller (#12427)
airbytehq · May 10, 2024 · 3786cfc · 3786cfc
1 parent 7b3c978
commit 3786cfc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/airbyte-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml
@@ -12091,6 +12091,10 @@ components:
         name:
           description: Name of the workspace
           type: string
+        organizationId:
+          description: ID of organization to add workspace to.
+          format: uuid
+          type: string
       x-sdk-entity: Workspace
       x-sdk-param-suppress-computed-diff: true
       x-sdk-component: true

diff --git a/...e-server/src/main/kotlin/io/airbyte/server/apis/publicapi/controllers/HealthController.kt b/...e-server/src/main/kotlin/io/airbyte/server/apis/publicapi/controllers/HealthController.kt
@@ -4,8 +4,11 @@
 
 package io.airbyte.server.apis.publicapi.controllers
 
+import io.airbyte.commons.server.errors.problems.UnexpectedProblem
+import io.airbyte.commons.server.handlers.HealthCheckHandler
 import io.airbyte.commons.server.scheduling.AirbyteTaskExecutors
 import io.micronaut.http.HttpResponse
+import io.micronaut.http.HttpStatus
 import io.micronaut.http.annotation.Controller
 import io.micronaut.scheduling.annotation.ExecuteOn
 import io.micronaut.security.annotation.Secured
@@ -17,9 +20,9 @@ import jakarta.ws.rs.GET
 /**
  * Health endpoint used by kubernetes and the gcp load balancer.
  */
-@Controller("/public/api/v1/health")
+@Controller("/api/public/v1/health")
 @Secured(SecurityRule.IS_ANONYMOUS)
-class HealthController {
+class HealthController(private val healthCheckHandler: HealthCheckHandler) {
   @GET
   @ApiResponses(
     value = [
@@ -32,6 +35,9 @@ class HealthController {
   )
   @ExecuteOn(AirbyteTaskExecutors.HEALTH)
   fun healthCheck(): HttpResponse<String> {
-    return HttpResponse.ok<String?>().body("Successful operation")
+    if (healthCheckHandler.health().available) {
+      return HttpResponse.ok<String?>().body("Successful operation")
+    }
+    throw UnexpectedProblem(HttpStatus.SERVICE_UNAVAILABLE)
   }
 }
diff --git a/...rver/src/main/kotlin/io/airbyte/server/apis/publicapi/controllers/WorkspacesController.kt b/...rver/src/main/kotlin/io/airbyte/server/apis/publicapi/controllers/WorkspacesController.kt
@@ -33,7 +33,7 @@ val logger = KotlinLogging.logger {}
 @Secured(SecurityRule.IS_AUTHENTICATED)
 open class WorkspacesController(
   protected val workspaceService: WorkspaceService,
-  private val apiAuthorizationHelper: ApiAuthorizationHelper,
+  protected val apiAuthorizationHelper: ApiAuthorizationHelper,
   private val currentUserService: CurrentUserService,
 ) : PublicWorkspacesApi {
   @Path("/{workspaceId}/oauthCredentials")
@@ -56,14 +56,14 @@ open class WorkspacesController(
   }
 
   @ExecuteOn(AirbyteTaskExecutors.PUBLIC_API)
-  override fun publicCreateWorkspace(workspaceCreateRequest: WorkspaceCreateRequest?): Response {
+  override fun publicCreateWorkspace(workspaceCreateRequest: WorkspaceCreateRequest): Response {
     // Now that we have orgs everywhere, ensure the user is at least an organization editor
     apiAuthorizationHelper.ensureUserHasAnyRequiredRoleOrThrow(
       Scope.ORGANIZATION,
       listOf(DEFAULT_ORGANIZATION_ID.toString()),
       setOf(OrganizationAuthRole.ORGANIZATION_EDITOR),
     )
-    return workspaceService.controllerCreateWorkspace(workspaceCreateRequest!!)
+    return workspaceService.controllerCreateWorkspace(workspaceCreateRequest)
   }
 
   @Path("/{workspaceId}")