Revert "Remove configuration API"

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.server;
+
+import io.airbyte.server.apis.ConfigurationApi;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.process.internal.RequestScoped;
+
+public class ConfigurationApiBinder extends AbstractBinder {
+
+  @Override
+  protected void configure() {
+    bindFactory(ConfigurationApiFactory.class)
+        .to(ConfigurationApi.class)
+        .in(RequestScoped.class);
+  }
+
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.server;
+
+import io.airbyte.server.apis.ConfigurationApi;
+import java.util.Map;
+import org.glassfish.hk2.api.Factory;
+import org.slf4j.MDC;
+
+public class ConfigurationApiFactory implements Factory<ConfigurationApi> {
+
+  private static Map<String, String> mdc;
+
+  public static void setValues(
+                               final Map<String, String> mdc) {
+    ConfigurationApiFactory.mdc = mdc;
+  }
+
+  @Override
+  public ConfigurationApi provide() {
+    MDC.setContextMap(ConfigurationApiFactory.mdc);
+
+    return new ConfigurationApi();
+  }
+
+  @Override
+  public void dispose(final ConfigurationApi service) {
+    /* noop */
+  }
+
+}

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

@@ -348,7 +348,22 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
     LOGGER.info("Starting server...");
 
     return apiFactory.create(
+        syncSchedulerClient,
+        configRepository,
+        secretsRepositoryReader,
+        secretsRepositoryWriter,
+        jobPersistence,
+        configsDatabase,
+        jobsDatabase,
+        trackingClient,
+        configs.getWorkerEnvironment(),
+        configs.getLogConfigs(),
         configs.getAirbyteVersion(),
+        configs.getWorkspaceRoot(),
+        httpClient,
+        eventRunner,
+        configsFlyway,
+        jobsFlyway,
         attemptHandler,
         connectionsHandler,
         dbMigrationHandler,

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

@@ -4,8 +4,17 @@
 
 package io.airbyte.server;
 
+import io.airbyte.analytics.TrackingClient;
 import io.airbyte.commons.version.AirbyteVersion;
+import io.airbyte.config.Configs.WorkerEnvironment;
+import io.airbyte.config.helpers.LogConfigs;
+import io.airbyte.config.persistence.ConfigRepository;
+import io.airbyte.config.persistence.SecretsRepositoryReader;
+import io.airbyte.config.persistence.SecretsRepositoryWriter;
+import io.airbyte.db.Database;
+import io.airbyte.persistence.job.JobPersistence;
 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;
@@ -86,13 +95,33 @@
 import io.airbyte.server.handlers.WebBackendConnectionsHandler;
 import io.airbyte.server.handlers.WebBackendGeographiesHandler;
 import io.airbyte.server.handlers.WorkspacesHandler;
+import io.airbyte.server.scheduler.EventRunner;
+import io.airbyte.server.scheduler.SynchronousSchedulerClient;
+import java.net.http.HttpClient;
+import java.nio.file.Path;
 import java.util.Map;
 import java.util.Set;
+import org.flywaydb.core.Flyway;
 import org.slf4j.MDC;
 
 public interface ServerFactory {
 
-  ServerRunnable create(final AirbyteVersion airbyteVersion,
+  ServerRunnable create(final SynchronousSchedulerClient synchronousSchedulerClient,
+                        final ConfigRepository configRepository,
+                        final SecretsRepositoryReader secretsRepositoryReader,
+                        final SecretsRepositoryWriter secretsRepositoryWriter,
+                        final JobPersistence jobPersistence,
+                        final Database configsDatabase,
+                        final Database jobsDatabase,
+                        final TrackingClient trackingClient,
+                        final WorkerEnvironment workerEnvironment,
+                        final LogConfigs logConfigs,
+                        final AirbyteVersion airbyteVersion,
+                        final Path workspaceRoot,
+                        final HttpClient httpClient,
+                        final EventRunner eventRunner,
+                        final Flyway configsFlyway,
+                        final Flyway jobsFlyway,
                         final AttemptHandler attemptHandler,
                         final ConnectionsHandler connectionsHandler,
                         final DbMigrationHandler dbMigrationHandler,
@@ -115,7 +144,22 @@ ServerRunnable create(final AirbyteVersion airbyteVersion,
   class Api implements ServerFactory {
 
     @Override
-    public ServerRunnable create(final AirbyteVersion airbyteVersion,
+    public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedulerClient,
+                                 final ConfigRepository configRepository,
+                                 final SecretsRepositoryReader secretsRepositoryReader,
+                                 final SecretsRepositoryWriter secretsRepositoryWriter,
+                                 final JobPersistence jobPersistence,
+                                 final Database configsDatabase,
+                                 final Database jobsDatabase,
+                                 final TrackingClient trackingClient,
+                                 final WorkerEnvironment workerEnvironment,
+                                 final LogConfigs logConfigs,
+                                 final AirbyteVersion airbyteVersion,
+                                 final Path workspaceRoot,
+                                 final HttpClient httpClient,
+                                 final EventRunner eventRunner,
+                                 final Flyway configsFlyway,
+                                 final Flyway jobsFlyway,
                                  final AttemptHandler attemptHandler,
                                  final ConnectionsHandler connectionsHandler,
                                  final DbMigrationHandler dbMigrationHandler,
@@ -136,6 +180,9 @@ public ServerRunnable create(final AirbyteVersion airbyteVersion,
                                  final WebBackendGeographiesHandler webBackendGeographiesHandler) {
       final Map<String, String> mdc = MDC.getCopyOfContextMap();
 
+      // set static values for factory
+      ConfigurationApiFactory.setValues(mdc);
+
       AttemptApiFactory.setValues(attemptHandler, mdc);
 
       ConnectionApiFactory.setValues(
@@ -184,6 +231,7 @@ public ServerRunnable create(final AirbyteVersion airbyteVersion,
 
       // server configurations
       final Set<Class<?>> componentClasses = Set.of(
+          ConfigurationApi.class,
           AttemptApiController.class,
           ConnectionApiController.class,
           DbMigrationApiController.class,
@@ -208,6 +256,7 @@ public ServerRunnable create(final AirbyteVersion airbyteVersion,
 
       final Set<Object> components = Set.of(
           new CorsFilter(),
+          new ConfigurationApiBinder(),
           new AttemptApiBinder(),
           new ConnectionApiBinder(),
           new DbMigrationBinder(),

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

@@ -27,7 +27,7 @@ public InternalOperationResult saveStats(final SaveStatsRequestBody saveStatsReq
 
   @Override
   public InternalOperationResult setWorkflowInAttempt(final SetWorkflowInAttemptRequestBody requestBody) {
-    return ApiHelper.execute(() -> attemptHandler.setWorkflowInAttempt(requestBody));
+    return ConfigurationApi.execute(() -> attemptHandler.setWorkflowInAttempt(requestBody));
   }
 
 }