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

simpler data model, not sure it's desirable but at least it's consistent

Browse source
This commit is contained in:
Kiara Grouwstra 2025-08-26 17:31:53 +02:00
parent 7ce1549e75
commit e089eba1d7
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
deployment/check/data-model/deployment.nix
View file

@ -66,9 +66,7 @@ let
requests: requests:
let let
# Filter out requests that need wheel if policy doesn't allow it # Filter out requests that need wheel if policy doesn't allow it
validRequests = lib.filterAttrs ( validRequests = lib.filterAttrs (_name: req: !req.login-shell.wheel || config.wheel) requests;
_name: req: !req.login-shell.wheel || config.wheel
) requests.resources;
in in
lib.optionalAttrs (validRequests != { }) { lib.optionalAttrs (validRequests != { }) {
${config.username} = { ${config.username} = {
@ -94,7 +92,7 @@ let
implementation = cfg: { implementation = cfg: {
input = cfg; input = cfg;
output = lib.optionalAttrs cfg.enable { output = lib.optionalAttrs cfg.enable {
resources.hello.login-shell.packages.hello = pkgs.hello; "my".login-shell.packages.hello = pkgs.hello;
}; };
}; };
}; };
@ -125,9 +123,11 @@ let
else else
null; null;
users.users = environment.config.resources."operator-environment".login-shell.apply { users.users = environment.config.resources."operator-environment".login-shell.apply (
resources = lib.filterAttrs (_name: value: value ? login-shell) requests; lib.filterAttrs (_name: value: value ? login-shell) (
}; lib.concatMapAttrs (k': lib.mapAttrs' (k: v: lib.nameValuePair "${k'}.${k}" v)) requests
)
);
}; };
}; };
}; };

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

@ -73,9 +73,7 @@ in
requests: requests:
let let
# Filter out requests that need wheel if policy doesn't allow it # Filter out requests that need wheel if policy doesn't allow it
validRequests = lib.filterAttrs ( validRequests = lib.filterAttrs (_name: req: !req.login-shell.wheel || config.wheel) requests;
_name: req: !req.login-shell.wheel || config.wheel
) requests.resources;
in in
lib.optionalAttrs (validRequests != { }) { lib.optionalAttrs (validRequests != { }) {
${config.username} = { ${config.username} = {
@ -101,7 +99,7 @@ in
implementation = implementation =
cfg: cfg:
lib.optionalAttrs cfg.enable { lib.optionalAttrs cfg.enable {
resources.hello.login-shell.packages.hello = pkgs.hello; "my".login-shell.packages.hello = pkgs.hello;
}; };
}; };
environments.single-nixos-vm = environments.single-nixos-vm =
@ -123,9 +121,11 @@ in
nixos.module = nixos.module =
{ ... }: { ... }:
{ {
users.users = config.resources."operator-environment".login-shell.apply { users.users = config.resources."operator-environment".login-shell.apply (
resources = lib.filterAttrs (_name: value: value ? login-shell) requests; lib.filterAttrs (_name: value: value ? login-shell) (
}; lib.concatMapAttrs (k': lib.mapAttrs' (k: v: lib.nameValuePair "${k'}.${k}" v)) requests
)
);
}; };
}; };
} }
@ -153,7 +153,7 @@ in
resources = resources =
fediversity.applications.hello.resources fediversity.applications.hello.resources
fediversity."example-configuration".applications.hello; fediversity."example-configuration".applications.hello;
hello-shell = resources.resources.hello.login-shell; hello-shell = resources."my".login-shell;
environment = fediversity.environments.single-nixos-vm.resources."operator-environment".login-shell; environment = fediversity.environments.single-nixos-vm.resources."operator-environment".login-shell;
result = mkDeployment { result = mkDeployment {
modules = [ modules = [

18
deployment/data-model.nix
View file

@ -18,16 +18,12 @@ let
; ;
functionType = submodule ./function.nix; functionType = submodule ./function.nix;
application-resources = submodule { # TODO: maybe transpose, and group the resources by type instead
options.resources = mkOption { application-resources = attrsOf (
# TODO: maybe transpose, and group the resources by type instead attrTag (
type = attrsOf ( lib.mapAttrs (_name: resource: mkOption { type = submodule resource.request; }) config.resources
attrTag ( )
lib.mapAttrs (_name: resource: mkOption { type = submodule resource.request; }) config.resources );
)
);
};
};
nixos-configuration = mkOption { nixos-configuration = mkOption {
description = "A NixOS configuration."; description = "A NixOS configuration.";
type = raw; type = raw;
@ -93,7 +89,7 @@ in
description = "The type of resource this policy configures"; description = "The type of resource this policy configures";
type = types.optionType; type = types.optionType;
}; };
# TODO(@fricklerhandwerk): we may want to make the function type explict here: `request -> resource-type` # TODO(@fricklerhandwerk): we may want to make the function type explicit here: `attrsOf request -> resource-type`
# and then also rename this to be consistent with the application's resource mapping # and then also rename this to be consistent with the application's resource mapping
options.apply = mkOption { options.apply = mkOption {
description = "Apply the policy to a request"; description = "Apply the policy to a request";