Skip to content

Commit 8fee0c4

Browse files
pass launchdarkly api environment variable to orchestrator (#22428)
* pass launchdarkly api environment variable to orchestrator * Put env vars in alphabetical order
1 parent da924a4 commit 8fee0c4

File tree

6 files changed

+19
-4
lines changed

6 files changed

+19
-4
lines changed

airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/sync/OrchestratorConstants.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class OrchestratorConstants {
1919
private static final String S3_PATH_STYLE_ACCESS = "S3_PATH_STYLE_ACCESS";
2020
private static final String FEATURE_FLAG_CLIENT = "FEATURE_FLAG_CLIENT";
2121
private static final String FEATURE_FLAG_PATH = "FEATURE_FLAG_PATH";
22-
private static final String LAUNCHDARKLY_KEY = "LAUNCHDARKLY_KEY";
2322

2423
// set of env vars necessary for the container orchestrator app to run
2524
public static final Set<String> ENV_VARS_TO_TRANSFER = new ImmutableSet.Builder<String>()
@@ -76,7 +75,7 @@ public class OrchestratorConstants {
7675
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES,
7776
FEATURE_FLAG_CLIENT,
7877
FEATURE_FLAG_PATH,
79-
LAUNCHDARKLY_KEY,
78+
EnvConfigs.LAUNCHDARKLY_KEY,
8079
EnvConfigs.SOCAT_KUBE_CPU_LIMIT,
8180
EnvConfigs.SOCAT_KUBE_CPU_REQUEST))
8281
.build();

airbyte-commons-worker/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ private Map<String, String> getWorkerMetadata() {
231231
EnvVariableFeatureFlags.APPLY_FIELD_SELECTION, String.valueOf(featureFlags.applyFieldSelection()),
232232
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES, featureFlags.fieldSelectionWorkspaces(),
233233
EnvConfigs.SOCAT_KUBE_CPU_LIMIT, configs.getSocatSidecarKubeCpuLimit(),
234-
EnvConfigs.SOCAT_KUBE_CPU_REQUEST, configs.getSocatSidecarKubeCpuRequest());
234+
EnvConfigs.SOCAT_KUBE_CPU_REQUEST, configs.getSocatSidecarKubeCpuRequest(),
235+
EnvConfigs.LAUNCHDARKLY_KEY, configs.getLaunchDarklyKey());
235236
}
236237

237238
}

airbyte-commons-worker/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ class AirbyteIntegrationLauncherTest {
6464
EnvVariableFeatureFlags.APPLY_FIELD_SELECTION, String.valueOf(FEATURE_FLAGS.applyFieldSelection()),
6565
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES, FEATURE_FLAGS.fieldSelectionWorkspaces(),
6666
EnvConfigs.SOCAT_KUBE_CPU_REQUEST, CONFIGS.getSocatSidecarKubeCpuRequest(),
67-
EnvConfigs.SOCAT_KUBE_CPU_LIMIT, CONFIGS.getSocatSidecarKubeCpuLimit());
67+
EnvConfigs.SOCAT_KUBE_CPU_LIMIT, CONFIGS.getSocatSidecarKubeCpuLimit(),
68+
EnvConfigs.LAUNCHDARKLY_KEY, CONFIGS.getLaunchDarklyKey());
6869

6970
private WorkerConfigs workerConfigs;
7071
@Mock

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,13 @@ public interface Configs {
334334
*/
335335
String getOtelCollectorEndpoint();
336336

337+
/**
338+
* If using a LaunchDarkly feature flag client, this API key will be used.
339+
*
340+
* @return LaunchDarkly API key as a string.
341+
*/
342+
String getLaunchDarklyKey();
343+
337344
/**
338345
* Defines a default map of environment variables to use for any launched job containers. The
339346
* expected format is a JSON encoded String -> String map. Make sure to escape properly. Defaults to

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ public class EnvConfigs implements Configs {
234234

235235
public static final int DEFAULT_FAILED_JOBS_IN_A_ROW_BEFORE_CONNECTION_DISABLE = 100;
236236
public static final int DEFAULT_DAYS_OF_ONLY_FAILED_JOBS_BEFORE_CONNECTION_DISABLE = 14;
237+
public static final String LAUNCHDARKLY_KEY = "LAUNCHDARKLY_KEY";
237238

238239
private final Function<String, String> getEnv;
239240
private final Supplier<Set<String>> getAllEnvKeys;
@@ -848,6 +849,11 @@ public String getOtelCollectorEndpoint() {
848849
return getEnvOrDefault(OTEL_COLLECTOR_ENDPOINT, "");
849850
}
850851

852+
@Override
853+
public String getLaunchDarklyKey() {
854+
return getEnvOrDefault(LAUNCHDARKLY_KEY, "");
855+
}
856+
851857
/**
852858
* There are two types of environment variables available to the job container:
853859
* <ul>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public ContainerOrchestratorConfig kubernetesContainerOrchestratorConfig(
102102
environmentVariables.put(DATA_PLANE_SERVICE_ACCOUNT_EMAIL_ENV_VAR, dataPlaneServiceAccountEmail);
103103

104104
final Configs configs = new EnvConfigs();
105+
environmentVariables.put(EnvConfigs.LAUNCHDARKLY_KEY, configs.getLaunchDarklyKey());
105106
environmentVariables.put(EnvConfigs.SOCAT_KUBE_CPU_LIMIT, configs.getSocatSidecarKubeCpuLimit());
106107
environmentVariables.put(EnvConfigs.SOCAT_KUBE_CPU_REQUEST, configs.getSocatSidecarKubeCpuRequest());
107108

0 commit comments

Comments
 (0)