inject env variable feature flags

airbytehq · Nov 28, 2022 · c5be1b0 · c5be1b0
1 parent 59c6396
commit c5be1b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java
@@ -7,6 +7,7 @@
 import io.airbyte.analytics.Deployment;
 import io.airbyte.analytics.TrackingClient;
 import io.airbyte.analytics.TrackingClientSingleton;
+import io.airbyte.commons.features.EnvVariableFeatureFlags;
 import io.airbyte.commons.lang.CloseableShutdownHook;
 import io.airbyte.commons.resources.MoreResources;
 import io.airbyte.commons.temporal.ConnectionManagerUtils;
@@ -213,6 +214,8 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
     final TrackingClient trackingClient = TrackingClientSingleton.get();
     final JobTracker jobTracker = new JobTracker(configRepository, jobPersistence, trackingClient);
 
+    final EnvVariableFeatureFlags envVariableFeatureFlags = new EnvVariableFeatureFlags();
+
     final WebUrlHelper webUrlHelper = new WebUrlHelper(configs.getWebappUrl());
     final JobErrorReportingClient jobErrorReportingClient = JobErrorReportingClientFactory.getClient(configs.getJobErrorReportingStrategy(), configs);
     final JobErrorReporter jobErrorReporter =
@@ -286,7 +289,8 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         configs.getWorkerEnvironment(),
         configs.getLogConfigs(),
         eventRunner,
-        connectionsHandler);
+        connectionsHandler,
+        envVariableFeatureFlags);
 
     final DbMigrationHandler dbMigrationHandler = new DbMigrationHandler(configsDatabase, configsFlyway, jobsDatabase, jobsFlyway);
 

diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java
@@ -109,7 +109,8 @@ public SchedulerHandler(final ConfigRepository configRepository,
                           final WorkerEnvironment workerEnvironment,
                           final LogConfigs logConfigs,
                           final EventRunner eventRunner,
-                          final ConnectionsHandler connectionsHandler) {
+                          final ConnectionsHandler connectionsHandler,
+                          final EnvVariableFeatureFlags envVariableFeatureFlags) {
     this(
         configRepository,
         secretsRepositoryWriter,
@@ -120,7 +121,7 @@ public SchedulerHandler(final ConfigRepository configRepository,
         eventRunner,
         new JobConverter(workerEnvironment, logConfigs),
         connectionsHandler,
-        new EnvVariableFeatureFlags());
+        envVariableFeatureFlags);
   }
 
   @VisibleForTesting

diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java
@@ -844,7 +844,6 @@ void testDiscoverSchemaFromSourceIdWithConnectionIdNonBreakingDisableConnectionP
     assertEquals(actual.getConnectionStatus(), ConnectionStatus.ACTIVE);
   }
 
-
   @Test
   void testDiscoverSchemaForSourceFromSourceCreate() throws JsonValidationException, IOException, ConfigNotFoundException {
     final SourceConnection source = new SourceConnection()
-Original file line number
+Diff line change
@@ Expand Up @@
         assertEquals(actual.getConnectionStatus(), ConnectionStatus.ACTIVE);
       }
       @Test
       void testDiscoverSchemaForSourceFromSourceCreate() throws JsonValidationException, IOException, ConfigNotFoundException {
         final SourceConnection source = new SourceConnection()
@@ Expand Down @@