account for 285
Some checks failed
Some checks failed
This commit is contained in:
parent
1019ac15b0
commit
90cda83039
2 changed files with 3 additions and 3 deletions
|
@ -27,7 +27,7 @@ locals {
|
|||
hostname = inst
|
||||
cfg = {
|
||||
# enable if any user applications are enabled
|
||||
enable = anytrue([for _, app in local.application_configs: app.cfg.enable])
|
||||
enable = anytrue([for _, app in local.application_configs: try(app.cfg.enable, false)])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ resource "terraform_data" "nixos" {
|
|||
for_each = {for name, inst in merge(
|
||||
local.peripherals,
|
||||
local.application_configs,
|
||||
) : name => inst if inst.cfg.enable}
|
||||
) : name => inst if try(inst.cfg.enable, false)}
|
||||
|
||||
# trigger rebuild/deploy if (FIXME?) any potentially used config/code changed,
|
||||
# preventing these (20+s, build being bottleneck) when nothing changed.
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Reference in a new issue