Bmoric/extract healt api

airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java

@@ -33,17 +33,13 @@ public class ConfigurationApiFactory implements Factory<ConfigurationApi> {
   private static SynchronousSchedulerClient synchronousSchedulerClient;
   private static StatePersistence statePersistence;
   private static Map<String, String> mdc;
-  private static Database configsDatabase;
-  private static Database jobsDatabase;
   private static TrackingClient trackingClient;
   private static WorkerEnvironment workerEnvironment;
   private static LogConfigs logConfigs;
   private static Path workspaceRoot;
   private static AirbyteVersion airbyteVersion;
   private static HttpClient httpClient;
   private static EventRunner eventRunner;
-  private static Flyway configsFlyway;
-  private static Flyway jobsFlyway;
 
   public static void setValues(
                                final ConfigRepository configRepository,
@@ -70,17 +66,13 @@ public static void setValues(
     ConfigurationApiFactory.secretsRepositoryWriter = secretsRepositoryWriter;
     ConfigurationApiFactory.synchronousSchedulerClient = synchronousSchedulerClient;
     ConfigurationApiFactory.mdc = mdc;
-    ConfigurationApiFactory.configsDatabase = configsDatabase;
-    ConfigurationApiFactory.jobsDatabase = jobsDatabase;
     ConfigurationApiFactory.trackingClient = trackingClient;
     ConfigurationApiFactory.workerEnvironment = workerEnvironment;
     ConfigurationApiFactory.logConfigs = logConfigs;
     ConfigurationApiFactory.workspaceRoot = workspaceRoot;
     ConfigurationApiFactory.airbyteVersion = airbyteVersion;
     ConfigurationApiFactory.httpClient = httpClient;
     ConfigurationApiFactory.eventRunner = eventRunner;
-    ConfigurationApiFactory.configsFlyway = configsFlyway;
-    ConfigurationApiFactory.jobsFlyway = jobsFlyway;
     ConfigurationApiFactory.statePersistence = statePersistence;
   }
 
@@ -94,18 +86,14 @@ public ConfigurationApi provide() {
         ConfigurationApiFactory.secretsRepositoryReader,
         ConfigurationApiFactory.secretsRepositoryWriter,
         ConfigurationApiFactory.synchronousSchedulerClient,
-        ConfigurationApiFactory.configsDatabase,
-        ConfigurationApiFactory.jobsDatabase,
         ConfigurationApiFactory.statePersistence,
         ConfigurationApiFactory.trackingClient,
         ConfigurationApiFactory.workerEnvironment,
         ConfigurationApiFactory.logConfigs,
         ConfigurationApiFactory.airbyteVersion,
         ConfigurationApiFactory.workspaceRoot,
         ConfigurationApiFactory.httpClient,
-        ConfigurationApiFactory.eventRunner,
-        ConfigurationApiFactory.configsFlyway,
-        ConfigurationApiFactory.jobsFlyway);
+        ConfigurationApiFactory.eventRunner);
   }
 
   @Override

airbyte-server/src/main/java/io/airbyte/server/ServerApp.java

@@ -57,7 +57,9 @@
 import io.airbyte.server.handlers.AttemptHandler;
 import io.airbyte.server.handlers.ConnectionsHandler;
 import io.airbyte.server.handlers.DbMigrationHandler;
+import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
+import io.airbyte.server.handlers.HealthCheckHandler;
 import io.airbyte.server.handlers.OperationsHandler;
 import io.airbyte.server.handlers.SchedulerHandler;
 import io.airbyte.server.scheduler.DefaultSynchronousSchedulerClient;
@@ -293,6 +295,13 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         configs.getLogConfigs(),
         eventRunner);
 
+    final DbMigrationHandler dbMigrationHandler = new DbMigrationHandler(configsDatabase, configsFlyway, jobsDatabase, jobsFlyway);
+
+    final DestinationDefinitionsHandler destinationDefinitionsHandler = new DestinationDefinitionsHandler(configRepository, syncSchedulerClient,
+        destinationHandler);
+
+    final HealthCheckHandler healthCheckHandler = new HealthCheckHandler(configRepository);
+
     LOGGER.info("Starting server...");
 
     return apiFactory.create(
@@ -314,7 +323,10 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         jobsFlyway,
         attemptHandler,
         connectionsHandler,
+        dbMigrationHandler,
+        destinationDefinitionsHandler,
         destinationHandler,
+        healthCheckHandler,
         operationsHandler,
         schedulerHandler);
   }

airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java

@@ -17,16 +17,31 @@
 import io.airbyte.server.apis.AttemptApiController;
 import io.airbyte.server.apis.ConfigurationApi;
 import io.airbyte.server.apis.ConnectionApiController;
+import io.airbyte.server.apis.DbMigrationApiController;
 import io.airbyte.server.apis.DestinationApiController;
+import io.airbyte.server.apis.DestinationDefinitionApiController;
+import io.airbyte.server.apis.DestinationDefinitionSpecificationApiController;
+import io.airbyte.server.apis.HealthApiController;
 import io.airbyte.server.apis.binders.AttemptApiBinder;
 import io.airbyte.server.apis.binders.ConnectionApiBinder;
+import io.airbyte.server.apis.binders.DbMigrationBinder;
 import io.airbyte.server.apis.binders.DestinationApiBinder;
+import io.airbyte.server.apis.binders.DestinationDefinitionApiBinder;
+import io.airbyte.server.apis.binders.DestinationDefinitionSpecificationApiBinder;
+import io.airbyte.server.apis.binders.HealthApiBinder;
 import io.airbyte.server.apis.factories.AttemptApiFactory;
 import io.airbyte.server.apis.factories.ConnectionApiFactory;
+import io.airbyte.server.apis.factories.DbMigrationApiFactory;
 import io.airbyte.server.apis.factories.DestinationApiFactory;
+import io.airbyte.server.apis.factories.DestinationDefinitionApiFactory;
+import io.airbyte.server.apis.factories.DestinationDefinitionSpecificationApiFactory;
+import io.airbyte.server.apis.factories.HealthApiFactory;
 import io.airbyte.server.handlers.AttemptHandler;
 import io.airbyte.server.handlers.ConnectionsHandler;
+import io.airbyte.server.handlers.DbMigrationHandler;
+import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
+import io.airbyte.server.handlers.HealthCheckHandler;
 import io.airbyte.server.handlers.OperationsHandler;
 import io.airbyte.server.handlers.SchedulerHandler;
 import io.airbyte.server.scheduler.EventRunner;
@@ -58,7 +73,10 @@ ServerRunnable create(final SynchronousSchedulerClient synchronousSchedulerClien
                         final Flyway jobsFlyway,
                         final AttemptHandler attemptHandler,
                         final ConnectionsHandler connectionsHandler,
+                        final DbMigrationHandler dbMigrationHandler,
+                        final DestinationDefinitionsHandler destinationDefinitionsHandler,
                         final DestinationHandler destinationApiHandler,
+                        final HealthCheckHandler healthCheckHandler,
                         final OperationsHandler operationsHandler,
                         final SchedulerHandler schedulerHandler);
 
@@ -83,7 +101,10 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
                                  final Flyway jobsFlyway,
                                  final AttemptHandler attemptHandler,
                                  final ConnectionsHandler connectionsHandler,
+                                 final DbMigrationHandler dbMigrationHandler,
+                                 final DestinationDefinitionsHandler destinationDefinitionsHandler,
                                  final DestinationHandler destinationApiHandler,
+                                 final HealthCheckHandler healthCheckHandler,
                                  final OperationsHandler operationsHandler,
                                  final SchedulerHandler schedulerHandler) {
       final Map<String, String> mdc = MDC.getCopyOfContextMap();
@@ -117,13 +138,37 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           schedulerHandler,
           mdc);
 
+      DbMigrationApiFactory.setValues(dbMigrationHandler, mdc);
+
       DestinationApiFactory.setValues(destinationApiHandler, schedulerHandler, mdc);
 
+      DestinationDefinitionApiFactory.setValues(destinationDefinitionsHandler);
+
+      DestinationDefinitionSpecificationApiFactory.setValues(schedulerHandler);
+
+      HealthApiFactory.setValues(healthCheckHandler);
+
       // server configurations
-      final Set<Class<?>> componentClasses = Set.of(ConfigurationApi.class, AttemptApiController.class, ConnectionApiController.class,
-          DestinationApiController.class);
-      final Set<Object> components = Set.of(new CorsFilter(), new ConfigurationApiBinder(), new AttemptApiBinder(), new ConnectionApiBinder(),
-          new DestinationApiBinder());
+      final Set<Class<?>> componentClasses = Set.of(
+          ConfigurationApi.class,
+          AttemptApiController.class,
+          ConnectionApiController.class,
+          DbMigrationApiController.class,
+          DestinationApiController.class,
+          DestinationDefinitionApiController.class,
+          DestinationDefinitionSpecificationApiController.class,
+          HealthApiController.class);
+
+      final Set<Object> components = Set.of(
+          new CorsFilter(),
+          new ConfigurationApiBinder(),
+          new AttemptApiBinder(),
+          new ConnectionApiBinder(),
+          new DbMigrationBinder(),
+          new DestinationApiBinder(),
+          new DestinationDefinitionApiBinder(),
+          new DestinationDefinitionSpecificationApiBinder(),
+          new HealthApiBinder());
 
       // construct server
       return new ServerApp(airbyteVersion, componentClasses, components);