From a34ebc8a34a540f84c4d508138639a71a52e388f Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Fri, 9 May 2025 15:16:31 +0200 Subject: [PATCH] account for 285 --- launch/main.tf | 4 ++-- panel/src/panel/views.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/launch/main.tf b/launch/main.tf index 882cc30a..70ce25cf 100644 --- a/launch/main.tf +++ b/launch/main.tf @@ -16,7 +16,7 @@ locals { garage = var.garage } : name => merge(inst, { # enable if any user applications are enabled - enable = anytrue([for _, app in local.application_configs: app.enable]) + enable = anytrue([for _, app in local.application_configs: try(app.enable, false)]) }) } } @@ -33,7 +33,7 @@ resource "terraform_data" "nixos" { for_each = {for name, inst in merge( local.peripherals, local.application_configs, - ) : name => inst if inst.enable} + ) : name => inst if try(inst.enable, false)} # trigger rebuild/deploy if (FIXME?) any potentially used config/code changed, # preventing these (20+s, build being bottleneck) when nothing changed. diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py index e44202ed..fa6929fb 100644 --- a/panel/src/panel/views.py +++ b/panel/src/panel/views.py @@ -113,7 +113,7 @@ class DeploymentStatus(ConfigurationForm): } | { # pass in form info to our deployment # FIXME: ensure sensitive info is protected - f"TF_VAR_{k}": v if isinstance(v, str) else json.dumps(v) for k, v in config.json().items() + f"TF_VAR_{k}": v if isinstance(v, str) else json.dumps(v) for k, v in json.loads(config.model_dump_json()).items() } logger.info("env: %s", env) cwd = f"{settings.repo_dir}/launch"