kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

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

Browse source 
[HACK] explicitly set resource options, as defaults seem insufficient

clarify comment
This commit is contained in:
Kiara Grouwstra 2025-07-22 17:52:45 +02:00
parent f90e8d0932
commit 1b898264e4
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
deployment/data-model-test.nix
View file

@ -127,7 +127,10 @@ in
}; };
environments.single-nixos-vm = environment: { environments.single-nixos-vm = environment: {
_class = "fediversity-environment"; _class = "fediversity-environment";
resources.shell.login-shell.username = "operator"; resources.shell.login-shell = {
username = "operator";
wheel = false; # FIXME: default needs the type uncommented
};
implementation = requests: { implementation = requests: {
_class = "nixos"; _class = "nixos";
users.users = ( users.users = (

31
deployment/data-model.nix
View file

@ -149,19 +149,24 @@ in
Setting this is optional, but provides a place to declare that information for programmatic use in the resource mapping. Setting this is optional, but provides a place to declare that information for programmatic use in the resource mapping.
''; '';
# TODO: maybe transpose, and group the resources by type instead # TODO: maybe transpose, and group the resources by type instead
type = attrsOf ( # # FIXME: error: The option `environments.single-nixos-vm.resources.shell.login-shell.apply' does not exist. Definition values:
attrTag ( # # - In `<unknown-file>': <function>
lib.mapAttrs ( # # However there are no options defined in `environments.single-nixos-vm.resources.shell.login-shell'. Are you sure you've
_name: resource: # # declared your options properly? This can happen if you e.g. declared your options in `types.submodule'
mkOption { # # under `config' rather than `options'.
type = submoduleWith { # type = attrsOf (
class = "fediversity-resource-policy"; # attrTag (
modules = [ resource.policy ]; # lib.mapAttrs (
}; # _name: resource:
} # mkOption {
) config.resources # type = submoduleWith {
) # class = "fediversity-resource-policy";
); # modules = [ resource.policy ];
# };
# }
# ) config.resources
# )
# );
}; };
implementation = mkOption { implementation = mkOption {
description = "Mapping of resources required by applications to available resources; the result can be deployed"; description = "Mapping of resources required by applications to available resources; the result can be deployed";