Bmoric/remove dep server worker

airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/config/CommonFactory.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.temporal.config;
+
+import io.airbyte.config.Configs.WorkerEnvironment;
+import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.env.Environment;
+import jakarta.inject.Singleton;
+
+@Factory
+public class CommonFactory {
+
+  @Singleton
+  public WorkerEnvironment workerEnvironment(final Environment environment) {
+    return environment.getActiveNames().contains(Environment.KUBERNETES) ? WorkerEnvironment.KUBERNETES : WorkerEnvironment.DOCKER;
+  }
+
+}

airbyte-commons-worker/build.gradle

@@ -5,13 +5,6 @@ plugins {
     id 'com.github.eirnym.js2p' version '1.0'
 }
 
-group 'io.airbyte...'
-version '0.40.14'
-
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
@@ -61,7 +54,4 @@ jsonSchema2Pojo {
     includeSetters = true
 }
 
-Properties env = new Properties()
-rootProject.file('.env.dev').withInputStream { env.load(it) }
-
 Task publishArtifactsTask = getPublishArtifactsTask("$rootProject.ext.version", project)

airbyte-commons-worker/src/main/java/io/airbyte/workers/WorkerConstants.java

@@ -15,4 +15,6 @@ public class WorkerConstants {
 
   public static final String RESET_JOB_SOURCE_DOCKER_IMAGE_STUB = "airbyte_empty";
 
+  public static final String WORKER_ENVIRONMENT = "WORKER_ENVIRONMENT";
+
 }

airbyte-commons-worker/src/main/java/io/airbyte/workers/sync/LauncherWorker.java

@@ -14,7 +14,7 @@
 import io.airbyte.persistence.job.models.JobRunConfig;
 import io.airbyte.workers.ContainerOrchestratorConfig;
 import io.airbyte.workers.Worker;
-import io.airbyte.workers.config.WorkerConfigurationBeanFactory;
+import io.airbyte.workers.WorkerConstants;
 import io.airbyte.workers.exception.WorkerException;
 import io.airbyte.workers.process.AsyncKubePodStatus;
 import io.airbyte.workers.process.AsyncOrchestratorPodProcess;
@@ -105,7 +105,7 @@ public OUTPUT run(final INPUT input, final Path jobRoot) throws WorkerException
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
         // Manually add the worker environment to the env var map
-        envMap.put(WorkerConfigurationBeanFactory.WORKER_ENVIRONMENT, containerOrchestratorConfig.workerEnvironment().name());
+        envMap.put(WorkerConstants.WORKER_ENVIRONMENT, containerOrchestratorConfig.workerEnvironment().name());
 
         final Map<String, String> fileMap = new HashMap<>(additionalFileMap);
         fileMap.putAll(Map.of(

airbyte-container-orchestrator/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation project(':airbyte-config:config-persistence')
     implementation project(':airbyte-commons-temporal')
     implementation project(':airbyte-commons-worker')
+    implementation project(':airbyte-config:init')
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-json-validation')
     implementation project(':airbyte-protocol:protocol-models')

airbyte-integrations/bases/base-normalization/build.gradle

@@ -11,10 +11,11 @@ airbytePython {
 
 dependencies {
     implementation project(':airbyte-workers')
+    implementation project(':airbyte-commons-worker')
 }
 
 // we need to access the sshtunneling script from airbyte-workers for ssh support
-task copySshScript(type: Copy, dependsOn: [project(':airbyte-workers').processResources]) {
+task copySshScript(type: Copy, dependsOn: [project(':airbyte-commons-worker').processResources]) {
     from "${project(':airbyte-workers').buildDir}/resources/main"
     into "${buildDir}"
     include "sshtunneling.sh"

airbyte-integrations/connectors/destination-gcs/build.gradle

@@ -44,4 +44,5 @@ dependencies {
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-gcs')
     integrationTestJavaImplementation project(':airbyte-workers')
+    integrationTestJavaImplementation project(':airbyte-commons-worker')
 }

airbyte-workers/src/main/java/io/airbyte/workers/config/ApplicationBeanFactory.java

@@ -13,7 +13,6 @@
 import io.airbyte.config.Configs.DeploymentMode;
 import io.airbyte.config.Configs.SecretPersistenceType;
 import io.airbyte.config.Configs.TrackingStrategy;
-import io.airbyte.config.Configs.WorkerEnvironment;
 import io.airbyte.config.persistence.ConfigRepository;
 import io.airbyte.config.persistence.StatePersistence;
 import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
@@ -29,7 +28,6 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
-import io.micronaut.context.env.Environment;
 import io.micronaut.core.util.StringUtils;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
@@ -69,11 +67,6 @@ public TrackingStrategy trackingStrategy(@Value("${airbyte.tracking-strategy}")
     return convertToEnum(trackingStrategy, TrackingStrategy::valueOf, TrackingStrategy.LOGGING);
   }
 
-  @Singleton
-  public WorkerEnvironment workerEnvironment(final Environment environment) {
-    return environment.getActiveNames().contains(Environment.KUBERNETES) ? WorkerEnvironment.KUBERNETES : WorkerEnvironment.DOCKER;
-  }
-
   @Singleton
   @Named("workspaceRoot")
   public Path workspaceRoot(@Value("${airbyte.workspace.root}") final String workspaceRoot) {

airbyte-commons-worker/src/main/java/io/airbyte/workers/config/WorkerConfigurationBeanFactory.java → airbyte-workers/src/main/java/io/airbyte/workers/config/WorkerConfigurationBeanFactory.java

@@ -13,6 +13,7 @@
 import io.airbyte.config.ResourceRequirements;
 import io.airbyte.config.TolerationPOJO;
 import io.airbyte.workers.WorkerConfigs;
+import io.airbyte.workers.WorkerConstants;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
@@ -41,7 +42,6 @@ public class WorkerConfigurationBeanFactory {
   private static final String DOCKER = "DOCKER";
   private static final String JOB_DEFAULT_ENV_PREFIX = "JOB_DEFAULT_ENV_";
   private static final String KUBERNETES = "KUBERNETES";
-  public static final String WORKER_ENVIRONMENT = "WORKER_ENVIRONMENT";
 
   @Singleton
   @Named("checkJobKubeAnnotations")
@@ -105,7 +105,7 @@ public Map<String, String> jobDefaultEnvMap(
     final Map<String, String> jobSharedEnvMap = Map.of(AIRBYTE_ROLE, airbyteRole,
         AIRBYTE_VERSION, airbyteVersion,
         DEPLOYMENT_MODE, deploymentMode.name(),
-        WORKER_ENVIRONMENT, environment.getActiveNames().contains(Environment.KUBERNETES) ? KUBERNETES : DOCKER);
+        WorkerConstants.WORKER_ENVIRONMENT, environment.getActiveNames().contains(Environment.KUBERNETES) ? KUBERNETES : DOCKER);
     return MoreMaps.merge(jobPrefixedEnvMap, jobSharedEnvMap);
   }