Merge pull request #4274 from systeminit/fix(sdf)--Don't-overwrite-sd…

…f-config-file-with-empty-args fix(sdf): Don't overwrite sdf config file with empty args
systeminit · Aug 2, 2024 · a544ef3 · a544ef3
2 parents e37857a + 6a1ee73
commit a544ef3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bin/sdf/src/args.rs b/bin/sdf/src/args.rs
@@ -302,10 +302,12 @@ impl TryFrom<Args> for Config {
                 config_map.set("create_workspace_permissions", create_workspace_permissions);
             }
 
-            config_map.set(
-                "create_workspace_allowlist",
-                args.create_workspace_allowlist,
-            );
+            if !args.create_workspace_allowlist.is_empty() {
+                config_map.set(
+                    "create_workspace_allowlist",
+                    args.create_workspace_allowlist,
+                );
+            }
 
             config_map.set("nats.connection_name", NAME);
             config_map.set("pg.application_name", NAME);

diff --git a/bin/sdf/src/main.rs b/bin/sdf/src/main.rs
@@ -93,6 +93,8 @@ async fn async_main() -> Result<()> {
 
     let config = Config::try_from(args)?;
 
+    debug!(config =?config, "entire startup config");
+
     let encryption_key = Server::load_encryption_key(config.crypto().clone()).await?;
     let jwt_public_signing_key =
         Server::load_jwt_public_signing_key(config.jwt_signing_public_key().clone()).await?;