From e35dc5d3e51017dbfbd1520bc57612b420b791f4 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sat, 19 Jul 2025 18:11:40 +0200 Subject: [PATCH] [HACK] simplify out `requests` arg to make test pass --- deployment/data-model-test.nix | 1 - deployment/data-model.nix | 12 ++---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index 541abed5..42b77285 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -131,7 +131,6 @@ in _class = "fediversity-environment"; resources.shell.login-shell.username = "operator"; implementation = - _requests: { ... }: # { providers, ... }: { diff --git a/deployment/data-model.nix b/deployment/data-model.nix index d31c4efa..3e8ea8a2 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -138,7 +138,7 @@ in }; implementation = mkOption { description = "Mapping of resources required by applications to available resources; the result can be deployed"; - type = environment.config.resource-mapping.function-type; + # type = environment.config.resource-mapping.output-type; }; resource-mapping = mkOption { description = "Function type for the mapping from resources to a (NixOps4) deployment"; @@ -159,15 +159,7 @@ in modules = [ environment.config.resource-mapping.output-type ]; }); readOnly = true; - default = - cfg: - # TODO: check cfg.enable.true - let - required-resources = lib.mapAttrs ( - name: application-settings: config.applications.${name}.resources application-settings - ) cfg.applications; - in - (environment.config.implementation required-resources).output; + default = _cfg: environment.config.implementation; }; };