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

data model formatting/linting #3

Closed
kiara wants to merge 2 commits from kiara/Fediversity:fricklerhandwerk-data-model-as-diagram into data-model-as-diagram
pull from: kiara/Fediversity:fricklerhandwerk-data-model-as-diagram
merge into: fricklerhandwerk:data-model-as-diagram
Conversation 1 Commits 2 Files changed 2 +27 -23
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,10 @@ in
description = "Any options from NixOS"; description = "Any options from NixOS";
}; };
}; };
config.resource-type = types.raw; # TODO: what's the type of a NixOS configuration? config = {
config.apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]); resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
};
}; };
}; };
resources.login-shell = { resources.login-shell = {
@ -82,24 +84,26 @@ in
default = false; default = false;
}; };
}; };
config.resource-type = types.raw; # TODO: splice out the user type from NixOS config = {
config.apply = resource-type = types.raw; # TODO: splice out the user type from NixOS
requests: apply =
let requests:
# Filter out requests that need wheel if policy doesn't allow it let
validRequests = lib.filterAttrs ( # Filter out requests that need wheel if policy doesn't allow it
_name: req: !req.login-shell.wheel || config.wheel validRequests = lib.filterAttrs (
) requests.resources; _name: req: !req.login-shell.wheel || config.wheel
in ) requests.resources;
lib.optionalAttrs (validRequests != { }) { in
${config.username} = { lib.optionalAttrs (validRequests != { }) {
isNormalUser = true; ${config.username} = {
packages = isNormalUser = true;
with lib; packages =
attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests); with lib;
extraGroups = lib.optional config.wheel "wheel"; attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests);
extraGroups = lib.optional config.wheel "wheel";
};
}; };
}; };
}; };
}; };
applications.hello = applications.hello =
@ -165,7 +169,7 @@ in
} }
); );
resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello; resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
hello-shell = (resources).resources.hello.login-shell; hello-shell = resources.resources.hello.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 = [
@ -174,7 +178,7 @@ in
}; };
in in
rec { {
number-of-resources = with lib; length (attrNames fediversity.resources); number-of-resources = with lib; length (attrNames fediversity.resources);
inherit (fediversity) example-configuration; inherit (fediversity) example-configuration;
hello-package-exists = hello-shell.packages ? hello; hello-package-exists = hello-shell.packages ? hello;
@ -186,7 +190,7 @@ in
in in
{ {
inherit (operator) isNormalUser; inherit (operator) isNormalUser;
packages = with lib; map (p: "${p.pname}") operator.packages; packages = map (p: "${p.pname}") operator.packages;
extraGroups = operator.extraGroups; extraGroups = operator.extraGroups;
}; };
deployment = { deployment = {

2
deployment/data-model.nix
View file

@ -76,7 +76,7 @@ in
# TODO(@fricklerhandwerk): do we need a function type here as well, or is it in the way? # TODO(@fricklerhandwerk): do we need a function type here as well, or is it in the way?
options.apply = mkOption { options.apply = mkOption {
description = "Apply the policy to a request"; description = "Apply the policy to a request";
type = with types; functionTo policy.config.resource-type; type = functionTo policy.config.resource-type;
}; };
}) })
]; ];