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

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

Browse source 
This reverts commit ede5b4db11.
This commit is contained in:
Kiara Grouwstra 2025-08-26 17:31:58 +02:00
parent ede5b4db11
commit 42ee27f737
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 27 additions and 23 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,7 +66,9 @@ let
requests:
let
# Filter out requests that need wheel if policy doesn't allow it
validRequests = lib.filterAttrs (_name: req: !req.login-shell.wheel || config.wheel) requests;
validRequests = lib.filterAttrs (
_name: req: !req.login-shell.wheel || config.wheel
) requests.resources;
in
lib.optionalAttrs (validRequests != { }) {
${config.username} = {
@ -92,7 +94,7 @@ let
implementation = cfg: {
input = cfg;
output = lib.optionalAttrs cfg.enable {
"my".login-shell.packages.hello = pkgs.hello;
resources.hello.login-shell.packages.hello = pkgs.hello;
};
};
};
@ -123,11 +125,9 @@ let
else
null;
users.users = environment.config.resources."operator-environment".login-shell.apply (
lib.filterAttrs (_name: value: value ? login-shell) (
lib.concatMapAttrs (k': lib.mapAttrs' (k: v: lib.nameValuePair "${k'}.${k}" v)) requests
)
);
users.users = environment.config.resources."operator-environment".login-shell.apply {
resources = lib.filterAttrs (_name: value: value ? login-shell) requests;
};
};
};
};

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

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

20
deployment/data-model.nix
View file

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