Convert the server to micronaut

airbyte-config/config-models/src/main/java/io/airbyte/config/EnvConfigs.java

@@ -17,6 +17,7 @@
 import io.airbyte.config.storage.CloudStorageConfigs.GcsConfig;
 import io.airbyte.config.storage.CloudStorageConfigs.MinioConfig;
 import io.airbyte.config.storage.CloudStorageConfigs.S3Config;
+import jakarta.inject.Singleton;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -35,6 +36,7 @@
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"PMD.LongVariable", "PMD.CyclomaticComplexity", "PMD.AvoidReassigningParameters", "PMD.ConstructorCallsOverridableMethod"})
+@Singleton
 public class EnvConfigs implements Configs {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(EnvConfigs.class);

airbyte-proxy/Dockerfile

@@ -12,6 +12,7 @@ RUN apt-get update -y && apt-get install -y apache2-utils && rm -rf /var/lib/apt
 # This variable can be used to update the destination containers that Nginx proxies to.
 ENV PROXY_PASS_WEB "http://airbyte-webapp:80"
 ENV PROXY_PASS_API "http://airbyte-server:8001"
+ENV PROXY_PASS_MICRONAUT_API "http://airbyte-server:8080"
 ENV CONNECTOR_BUILDER_SERVER_API "http://airbyte-connector-builder-server:80"
 
 # Nginx config file

airbyte-proxy/nginx-auth.conf.template

@@ -20,6 +20,23 @@ http {
         auth_basic off;
       }
     }
+
+    location /api/v1/health {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      auth_basic "Welcome to Airbyte";
+      auth_basic_user_file /etc/nginx/.htpasswd;
+
+      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
+
+      error_page 401 /etc/nginx/401.html;
+      location ~ (401.html)$ {
+        alias /etc/nginx/$1;
+        auth_basic off;
+      }
+    }
   }
 
   server {
@@ -41,6 +58,23 @@ http {
         auth_basic off;
       }
     }
+
+    location /api/v1/health {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      auth_basic "Welcome to Airbyte";
+      auth_basic_user_file /etc/nginx/.htpasswd;
+
+      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
+
+      error_page 401 /etc/nginx/401.html;
+      location ~ (401.html)$ {
+        alias /etc/nginx/$1;
+        auth_basic off;
+      }
+    }
   }
 
   server {

airbyte-proxy/nginx-no-auth.conf.template

@@ -11,6 +11,14 @@ http {
 
       proxy_pass "${PROXY_PASS_WEB}";
     }
+
+    location /api/v1/health {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
+    }
   }
 
   server {
@@ -23,6 +31,14 @@ http {
 
       proxy_pass "${PROXY_PASS_API}";
     }
+
+    location /api/v1/health {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
+    }
   }
 
   server {

airbyte-proxy/run.sh

@@ -16,7 +16,7 @@ else
   TEMPLATE_PATH="/etc/nginx/templates/nginx-auth.conf.template"
 fi
 
-envsubst '${PROXY_PASS_WEB} ${PROXY_PASS_API} ${CONNECTOR_BUILDER_SERVER_API} ${PROXY_PASS_RESOLVER}' < $TEMPLATE_PATH > /etc/nginx/nginx.conf
+envsubst '${PROXY_PASS_WEB} ${PROXY_PASS_API} ${PROXY_PASS_MICRONAUT_API} ${CONNECTOR_BUILDER_SERVER_API} ${PROXY_PASS_RESOLVER}' < $TEMPLATE_PATH > /etc/nginx/nginx.conf
 
 echo "starting nginx..."
 nginx -v

airbyte-server/build.gradle

@@ -4,7 +4,6 @@ plugins {
 
 configurations.all {
     exclude group: 'io.micronaut.jaxrs'
-    exclude group: 'io.micronaut.sql'
 }
 
 dependencies {
@@ -24,7 +23,6 @@ dependencies {
     implementation project(':airbyte-protocol:protocol-models')
     implementation project(':airbyte-persistence:job-persistence')
 
-    implementation libs.flyway.core
     implementation 'com.github.slugify:slugify:2.4'
     implementation 'commons-cli:commons-cli:1.4'
     implementation libs.temporal.sdk
@@ -37,7 +35,19 @@ dependencies {
     implementation 'org.glassfish.jersey.media:jersey-media-json-jackson'
     implementation 'org.glassfish.jersey.ext:jersey-bean-validation'
     implementation 'org.quartz-scheduler:quartz:2.3.2'
+    implementation 'io.swagger:swagger-annotations:1.6.2'
 
+    annotationProcessor platform(libs.micronaut.bom)
+    annotationProcessor libs.bundles.micronaut.annotation.processor
+
+    implementation platform(libs.micronaut.bom)
+    implementation libs.bundles.micronaut
+
+    // Ensure that the versions defined in deps.toml are used
+    // instead of versions from transitive dependencies
+    implementation (libs.flyway.core) {
+        force = true
+    }
 
     testImplementation project(':airbyte-test-utils')
     testImplementation libs.postgresql
@@ -56,9 +66,10 @@ task copySeed(type: Copy, dependsOn: [project(':airbyte-config:init').processRes
 test.dependsOn(project.tasks.copySeed)
 assemble.dependsOn(project.tasks.copySeed)
 
-mainClassName = 'io.airbyte.server.ServerApp'
+mainClassName = 'io.airbyte.server.Application'
 
 application {
+    applicationName = project.name
     mainClass = mainClassName
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }
@@ -86,6 +97,8 @@ run {
     environment "AIRBYTE_VERSION", env.VERSION
     environment "AIRBYTE_ROLE", System.getenv('AIRBYTE_ROLE')
     environment "TEMPORAL_HOST", "localhost:7233"
+
+    environment 'MICRONAUT_ENVIRONMENTS', 'control-plane'
 }
 
 // produce reproducible archives

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.server;
+
+import io.micronaut.runtime.Micronaut;
+
+public class Application {
+
+  public static void main(final String[] args) {
+    Micronaut.run(Application.class, args);
+  }
+
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.server;
+
+import io.micronaut.runtime.event.ApplicationStartupEvent;
+import io.micronaut.scheduling.TaskExecutors;
+import io.micronaut.scheduling.annotation.ExecuteOn;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+
+@Singleton
+@Slf4j
+public class EventListener {
+
+  @Inject
+  ServerRunnable serverRunnable;
+
+  @io.micronaut.runtime.event.annotation.EventListener
+  @ExecuteOn(TaskExecutors.IO)
+  public void startEmitters(final ApplicationStartupEvent event) {
+    try {
+      log.error("Starting server");
+
+      serverRunnable.start();
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}

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

@@ -7,7 +7,6 @@
 import io.airbyte.analytics.Deployment;
 import io.airbyte.analytics.TrackingClient;
 import io.airbyte.analytics.TrackingClientSingleton;
-import io.airbyte.commons.lang.CloseableShutdownHook;
 import io.airbyte.commons.resources.MoreResources;
 import io.airbyte.commons.temporal.ConnectionManagerUtils;
 import io.airbyte.commons.temporal.StreamResetRecordsHelper;
@@ -16,7 +15,6 @@
 import io.airbyte.commons.temporal.TemporalWorkflowUtils;
 import io.airbyte.commons.version.AirbyteVersion;
 import io.airbyte.config.Configs;
-import io.airbyte.config.EnvConfigs;
 import io.airbyte.config.helpers.LogClientSingleton;
 import io.airbyte.config.persistence.ConfigRepository;
 import io.airbyte.config.persistence.SecretsRepositoryReader;
@@ -27,12 +25,7 @@
 import io.airbyte.config.persistence.split_secrets.SecretsHydrator;
 import io.airbyte.db.Database;
 import io.airbyte.db.check.DatabaseCheckException;
-import io.airbyte.db.factory.DSLContextFactory;
-import io.airbyte.db.factory.DataSourceFactory;
 import io.airbyte.db.factory.DatabaseCheckFactory;
-import io.airbyte.db.factory.FlywayFactory;
-import io.airbyte.db.instance.configs.ConfigsDatabaseMigrator;
-import io.airbyte.db.instance.jobs.JobsDatabaseMigrator;
 import io.airbyte.persistence.job.DefaultJobPersistence;
 import io.airbyte.persistence.job.JobPersistence;
 import io.airbyte.persistence.job.WebUrlHelper;
@@ -77,7 +70,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.sql.DataSource;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -86,7 +78,6 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.jooq.DSLContext;
-import org.jooq.SQLDialect;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -96,7 +87,6 @@ public class ServerApp implements ServerRunnable {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ServerApp.class);
   private static final int PORT = 8001;
-  private static final String DRIVER_CLASS_NAME = "org.postgresql.Driver";
 
   private final AirbyteVersion airbyteVersion;
   private final Set<Class<?>> customComponentClasses;
@@ -157,11 +147,11 @@ public void start() throws Exception {
     }));
   }
 
-  private static void assertDatabasesReady(final Configs configs,
-                                           final DSLContext configsDslContext,
-                                           final Flyway configsFlyway,
-                                           final DSLContext jobsDslContext,
-                                           final Flyway jobsFlyway)
+  public static void assertDatabasesReady(final Configs configs,
+                                          final DSLContext configsDslContext,
+                                          final Flyway configsFlyway,
+                                          final DSLContext jobsDslContext,
+                                          final Flyway jobsFlyway)
       throws DatabaseCheckException {
     LOGGER.info("Checking configs database flyway migration version..");
     DatabaseCheckFactory
@@ -385,34 +375,4 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         webBackendGeographiesHandler);
   }
 
-  public static void main(final String[] args) {
-    try {
-      final Configs configs = new EnvConfigs();
-
-      // Manual configuration that will be replaced by Dependency Injection in the future
-      final DataSource configsDataSource =
-          DataSourceFactory.create(configs.getConfigDatabaseUser(), configs.getConfigDatabasePassword(), DRIVER_CLASS_NAME,
-              configs.getConfigDatabaseUrl());
-      final DataSource jobsDataSource =
-          DataSourceFactory.create(configs.getDatabaseUser(), configs.getDatabasePassword(), DRIVER_CLASS_NAME, configs.getDatabaseUrl());
-
-      try (final DSLContext configsDslContext = DSLContextFactory.create(configsDataSource, SQLDialect.POSTGRES);
-          final DSLContext jobsDslContext = DSLContextFactory.create(jobsDataSource, SQLDialect.POSTGRES)) {
-
-        // Ensure that the database resources are closed on application shutdown
-        CloseableShutdownHook.registerRuntimeShutdownHook(configsDataSource, jobsDataSource, configsDslContext, jobsDslContext);
-
-        final Flyway configsFlyway = FlywayFactory.create(configsDataSource, DbMigrationHandler.class.getSimpleName(),
-            ConfigsDatabaseMigrator.DB_IDENTIFIER, ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
-        final Flyway jobsFlyway = FlywayFactory.create(jobsDataSource, DbMigrationHandler.class.getSimpleName(), JobsDatabaseMigrator.DB_IDENTIFIER,
-            JobsDatabaseMigrator.MIGRATION_FILE_LOCATION);
-
-        getServer(new ServerFactory.Api(), configs, configsDslContext, configsFlyway, jobsDslContext, jobsFlyway).start();
-      }
-    } catch (final Throwable e) {
-      LOGGER.error("Server failed", e);
-      System.exit(1); // so the app doesn't hang on background threads
-    }
-  }
-
 }

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

@@ -41,7 +41,6 @@
 import io.airbyte.server.apis.binders.DestinationDefinitionApiBinder;
 import io.airbyte.server.apis.binders.DestinationDefinitionSpecificationApiBinder;
 import io.airbyte.server.apis.binders.DestinationOauthApiBinder;
-import io.airbyte.server.apis.binders.HealthApiBinder;
 import io.airbyte.server.apis.binders.JobsApiBinder;
 import io.airbyte.server.apis.binders.LogsApiBinder;
 import io.airbyte.server.apis.binders.NotificationApiBinder;
@@ -62,7 +61,6 @@
 import io.airbyte.server.apis.factories.DestinationDefinitionApiFactory;
 import io.airbyte.server.apis.factories.DestinationDefinitionSpecificationApiFactory;
 import io.airbyte.server.apis.factories.DestinationOauthApiFactory;
-import io.airbyte.server.apis.factories.HealthApiFactory;
 import io.airbyte.server.apis.factories.JobsApiFactory;
 import io.airbyte.server.apis.factories.LogsApiFactory;
 import io.airbyte.server.apis.factories.NotificationsApiFactory;
@@ -195,8 +193,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
 
       DestinationDefinitionSpecificationApiFactory.setValues(schedulerHandler);
 
-      HealthApiFactory.setValues(healthCheckHandler);
-
       DestinationOauthApiFactory.setValues(oAuthHandler);
 
       SourceOauthApiFactory.setValues(oAuthHandler);
@@ -258,7 +254,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           new DestinationDefinitionApiBinder(),
           new DestinationDefinitionSpecificationApiBinder(),
           new DestinationOauthApiBinder(),
-          new HealthApiBinder(),
           new JobsApiBinder(),
           new LogsApiBinder(),
           new NotificationApiBinder(),

airbyte-server/src/main/java/io/airbyte/server/apis/HealthApiController.java

@@ -4,19 +4,32 @@
 
 package io.airbyte.server.apis;
 
-import io.airbyte.api.generated.HealthApi;
 import io.airbyte.api.model.generated.HealthCheckRead;
 import io.airbyte.server.handlers.HealthCheckHandler;
-import javax.ws.rs.Path;
-import lombok.AllArgsConstructor;
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 
-@Path("/v1/health")
-@AllArgsConstructor
-public class HealthApiController implements HealthApi {
+@Controller("/api/v1/health")
+public class HealthApiController {
 
   private final HealthCheckHandler healthCheckHandler;
 
-  @Override
+  public HealthApiController(final HealthCheckHandler healthCheckHandler) {
+    this.healthCheckHandler = healthCheckHandler;
+  }
+
+  @Get(produces = MediaType.APPLICATION_JSON)
+  @ApiOperation(value = "Health Check",
+                notes = "",
+                tags = {"health"})
+  @ApiResponses(value = {
+    @ApiResponse(code = 200,
+                 message = "Successful operation",
+                 response = HealthCheckRead.class)})
   public HealthCheckRead getHealthCheck() {
     return healthCheckHandler.health();
   }