Skip to content

chore: Move to reading the new env vars #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
honnix wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −18
Draft

chore: Move to reading the new env vars #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flytekit-java/src/main/java/org/flyte/flytekit/SdkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
abstract class SdkConfig {

// VisibleForTesting
static final String DOMAIN_ENV_VAR = "FLYTE_INTERNAL_DOMAIN";
static final String PROJECT_ENV_VAR = "FLYTE_INTERNAL_PROJECT";
static final String VERSION_ENV_VAR = "FLYTE_INTERNAL_VERSION";
static final String DOMAIN_ENV_VAR = "FLYTE_INTERNAL_TASK_DOMAIN";
static final String PROJECT_ENV_VAR = "FLYTE_INTERNAL_TASK_PROJECT";
static final String VERSION_ENV_VAR = "FLYTE_INTERNAL_TASK_VERSION";

public abstract String project();

Expand Down
12 changes: 6 additions & 6 deletions flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,9 @@ public static Stream<Arguments> testBranchNodesProvider() {
private static Map<String, WorkflowTemplate> loadWorkflows() {
Map<String, String> env =
ImmutableMap.of(
"FLYTE_INTERNAL_DOMAIN", "development",
"FLYTE_INTERNAL_VERSION", "test",
"FLYTE_INTERNAL_PROJECT", "flytetester");
"FLYTE_INTERNAL_TASK_DOMAIN", "development",
"FLYTE_INTERNAL_TASK_VERSION", "test",
"FLYTE_INTERNAL_TASK_PROJECT", "flytetester");

Map<WorkflowIdentifier, WorkflowTemplate> registrarWorkflows =
loadAll(WorkflowTemplateRegistrar.class, env);
Expand All @@ -515,9 +515,9 @@ private static Map<String, WorkflowTemplate> loadWorkflows() {
private static Map<String, RunnableTask> loadTasks() {
Map<String, String> env =
ImmutableMap.of(
"FLYTE_INTERNAL_DOMAIN", "development",
"FLYTE_INTERNAL_VERSION", "test",
"FLYTE_INTERNAL_PROJECT", "flytetester");
"FLYTE_INTERNAL_TASK_DOMAIN", "development",
"FLYTE_INTERNAL_TASK_VERSION", "test",
"FLYTE_INTERNAL_TASK_PROJECT", "flytetester");

Map<TaskIdentifier, RunnableTask> registrarRunnableTasks =
loadAll(RunnableTaskRegistrar.class, env);
Expand Down
6 changes: 3 additions & 3 deletions jflyte-utils/src/main/java/org/flyte/jflyte/utils/ExecutionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public abstract class ExecutionConfig {

public static ExecutionConfig load() {
return ExecutionConfig.builder()
.project(getenv("FLYTE_INTERNAL_PROJECT"))
.domain(getenv("FLYTE_INTERNAL_DOMAIN"))
.version(getenv("FLYTE_INTERNAL_VERSION"))
.project(getenv("FLYTE_INTERNAL_TASK_PROJECT"))
.domain(getenv("FLYTE_INTERNAL_TASK_DOMAIN"))
.version(getenv("FLYTE_INTERNAL_TASK_VERSION"))
.image(getenv("FLYTE_INTERNAL_IMAGE"))
.build();
}
Expand Down
6 changes: 3 additions & 3 deletions jflyte-utils/src/main/java/org/flyte/jflyte/utils/ProjectClosure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ static ProjectClosure load(
.put("JFLYTE_DOMAIN", config.domain())
.put("JFLYTE_PROJECT", config.project())
.put("JFLYTE_VERSION", config.version())
.put("FLYTE_INTERNAL_DOMAIN", config.domain())
.put("FLYTE_INTERNAL_PROJECT", config.project())
.put("FLYTE_INTERNAL_VERSION", config.version())
.put("FLYTE_INTERNAL_TASK_DOMAIN", config.domain())
.put("FLYTE_INTERNAL_TASK_PROJECT", config.project())
.put("FLYTE_INTERNAL_TASK_VERSION", config.version())
.build();

// 1. load classes, and create templates
Expand Down
6 changes: 3 additions & 3 deletions jflyte/src/main/java/org/flyte/jflyte/ExecuteLocal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ public Integer call() {

Map<String, String> env =
ImmutableMap.of(
"FLYTE_INTERNAL_DOMAIN", "development",
"FLYTE_INTERNAL_VERSION", "test",
"FLYTE_INTERNAL_PROJECT", "flytetester");
"FLYTE_INTERNAL_TASK_DOMAIN", "development",
"FLYTE_INTERNAL_TASK_VERSION", "test",
"FLYTE_INTERNAL_TASK_PROJECT", "flytetester");

Map<String, RunnableTask> runnableTasks = ExecuteLocalLoader.loadTasks(modules, env);
Map<String, DynamicWorkflowTask> dynamicWorkflowTasks =
Expand Down
Loading