From 763a3062b396d07fc82ae01315ffd993aac8caeb Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 13 Aug 2024 21:33:11 +0200 Subject: [PATCH] add INSTANCE_IS_DEV --- backend/ee-repo-ref.txt | 2 +- backend/windmill-common/src/global_settings.rs | 3 ++- frontend/src/lib/components/InstanceSettings.svelte | 1 + .../src/lib/components/ObjectStoreConfigSettings.svelte | 4 ++-- frontend/src/lib/components/Password.svelte | 2 +- .../components/apps/components/inputs/AppTextInput.svelte | 1 + .../(logged)/user/(user)/create_workspace/+page.svelte | 7 ++++++- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 67c39c95b6..577345f24d 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -80d9e507977b55d0b76272905c969c3d6e830083 \ No newline at end of file +91326e3b35f6a9454728e842b35b7160d907c100 \ No newline at end of file diff --git a/backend/windmill-common/src/global_settings.rs b/backend/windmill-common/src/global_settings.rs index a49b755ddb..b5d6e6da4d 100644 --- a/backend/windmill-common/src/global_settings.rs +++ b/backend/windmill-common/src/global_settings.rs @@ -30,7 +30,7 @@ pub const DEV_INSTANCE_SETTING: &str = "dev_instance"; pub const JWT_SECRET_SETTING: &str = "jwt_secret"; pub const EMAIL_DOMAIN_SETTING: &str = "email_domain"; -pub const ENV_SETTINGS: [&str; 50] = [ +pub const ENV_SETTINGS: [&str; 51] = [ "DISABLE_NSJAIL", "MODE", "NUM_WORKERS", @@ -81,4 +81,5 @@ pub const ENV_SETTINGS: [&str; 50] = [ "MAX_WAIT_FOR_SIGTERM", "WORKER_GROUP", "SAML_METADATA", + "INSTANCE_IS_DEV", ]; diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte index 4d81ccad68..4f7f4e2bea 100644 --- a/frontend/src/lib/components/InstanceSettings.svelte +++ b/frontend/src/lib/components/InstanceSettings.svelte @@ -718,6 +718,7 @@ /> {:else if setting.fieldType == 'password'} If left empty, will be derived automatically from $AWS_SECRET_KEY, pod or ec2 profile - +