[HACK] comment environment resources type, making the test go through

settle for counting packages over comparing them, solves an infinite recursion
[HACK] explicitly set resource options, as defaults seem insufficient
2025-07-22 17:52:45 +02:00 · 2025-07-22 17:50:39 +02:00 · 2025-07-22 17:45:19 +02:00 · 2025-07-22 17:43:41 +02:00 · 2025-07-22 17:39:16 +02:00 · 2025-07-22 17:33:03 +02:00
2 changed files with 6 additions and 1 deletions
--- a/deployment/data-model-test.nix
+++ b/deployment/data-model-test.nix
@ -71,6 +71,7 @@ in
                  };
                policy =
                  { ... }:
+
                  {
                    _class = "fediversity-resource-policy";
                    options = {
--- a/deployment/data-model.nix
+++ b/deployment/data-model.nix
@ -106,7 +106,11 @@ in
                # TODO: maybe transpose, and group the resources by type instead
                type = functionTo (
                  attrsOf (
-                    attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources)
+                    attrTag (
+                      lib.mapAttrs (
+                        _name: resource: mkOption { type = types.submodule resource.request; }
+                      ) config.resources
+                    )
                  )
                );
              };
Author	SHA1	Message	Date
Kiara Grouwstra	dd542cdfae	[HACK] comment environment resources type, making the test go through	2025-07-22 17:52:45 +02:00
Kiara Grouwstra	7bdbaf61d8	settle for counting packages over comparing them, solves an infinite recursion	2025-07-22 17:50:39 +02:00
Kiara Grouwstra	864010a4be	[HACK] explicitly set resource options, as defaults seem insufficient	2025-07-22 17:45:19 +02:00
Kiara Grouwstra	4d69cd6024	[HACK] explicitly pass instantiated policy to `apply`	2025-07-22 17:43:41 +02:00
Kiara Grouwstra	76ee37c10e	make packages filter return a list	2025-07-22 17:39:16 +02:00
Kiara Grouwstra	55546b50b1	properly flatten out application layer at users.users	2025-07-22 17:33:03 +02:00
Kiara Grouwstra	4a7b9f0f72	swap out nixops4 from implementation	2025-07-22 17:24:22 +02:00
Kiara Grouwstra	0c1628e8e1	test proper expectation test proper expectation	2025-07-22 17:24:22 +02:00
Kiara Grouwstra	455043bbf9	fix application resource type	2025-07-22 13:44:47 +02:00
Kiara Grouwstra	86b5d4ea67	[HACK] unwire deployment resource-mapping output-type, fixes `error: Expected a module, but found a value of type "option-type"`	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	171404366a	type: swap out nixops4 deployments for raw nixos modules	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	ef0c33e4b6	reproduce nixops4-nixos importing issue: `The option` environments.single-nixos-vm.deployment.<function body>.resources.the-machine.nixos' does not exist` add comment explaining our nixops4 type problem	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	8a06661949	swap out dummy module for actual import clean deployment module a bit simplify imports	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	4d9cdf923d	model: [DUMMY] use mock deployment to temporarily simplify the problem type policy.apply remove `apply`'s optionType, fixes duplicate definition error	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	da0aed31b8	environment: fix implementation type	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	122e6ee013	resolve resource mapping input discrepancy according to actual implementation, adjusting the type accordingly	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	31c619be38	fix application-requirements	2025-07-22 11:59:00 +02:00
Kiara Grouwstra	75b99d8ef1	untangle applications from function type, as they seem to not need the introspection (and may type-check input without it)	2025-07-22 11:53:39 +02:00
Kiara Grouwstra	ad064fed1f	fix environment deployment	2025-07-22 11:53:37 +02:00
Kiara Grouwstra	b15c188555	add trivial unit test for deployment - now to find how to make it work!	2025-07-22 11:53:29 +02:00
Kiara Grouwstra	1ed1e87bc8	resolve rebase	2025-07-22 11:53:29 +02:00
Kiara Grouwstra	7a1ed05304	pass `resourceProviderSystem` to `nixops4Deployment`	2025-07-22 11:22:38 +02:00
Kiara Grouwstra	883f24d1ad	model: add classes remove _class for application requirements to allow iterating over values	2025-07-22 11:22:38 +02:00
Kiara Grouwstra	240f8b34f7	use `submodule` to turn module into type for `functionTo`	2025-07-19 18:38:56 +02:00
Kiara Grouwstra	65924b1a80	use `mapAttrs` right `mapAttrs'` takes two args rather than a set, whereas if only the val changes `mapAttrs (_: v: ...)` should do	2025-07-19 18:38:56 +02:00
Kiara Grouwstra	9c8f86a3c4	test for configuration passes, test for deployment wip	2025-07-19 18:38:56 +02:00