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

revert submodule wrapper to align with module functions already doing types #2

Closed
kiara wants to merge 37 commits from kiara/Fediversity:fix-submodule-type into main
pull from: kiara/Fediversity:fix-submodule-type
merge into: fricklerhandwerk:main
Conversation 1 Commits 37 Files changed 73 +29 -21
2 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 243ef4425b - Show all commits

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

@ -82,23 +82,21 @@ in
type = types.bool; type = types.bool;
default = false; default = false;
}; };
apply = mkOption {
type = with types; functionTo raw; # TODO: splice out the user type from NixOS
default =
requests:
let
# Filter out requests that need wheel if policy doesn't allow it
validRequests = lib.filterAttrs (_name: req: !req.wheel || config.wheel) requests;
in
lib.optionalAttrs (validRequests != { }) {
${config.username} = {
isNormalUser = true;
packages = with lib; concatMapAttrs (_name: request: attrValues request.packages) validRequests;
extraGroups = lib.optional config.wheel "wheel";
};
};
};
}; };
config.resource-type = types.any; # TODO: splice out the user type from NixOS
config.apply =
requests:
let
# Filter out requests that need wheel if policy doesn't allow it
validRequests = lib.filterAttrs (_name: req: !req.wheel || config.wheel) requests;
in
lib.optionalAttrs (validRequests != { }) {
${config.username} = {
isNormalUser = true;
packages = with lib; concatMapAttrs (_name: request: attrValues request.packages) validRequests;
extraGroups = lib.optional config.wheel "wheel";
};
};
}; };
}; };
applications.hello = applications.hello =
@ -164,8 +162,7 @@ in
{ {
inherit (fediversity) example-deployment; inherit (fediversity) example-deployment;
}; };
expected = expected = {
{ };
};
}; };
} }

15
deployment/data-model.nix
View file

@ -53,12 +53,23 @@ in
description = "Options for configuring the resource policy for the hosting provider, a description of how the resource is made available"; description = "Options for configuring the resource policy for the hosting provider, a description of how the resource is made available";
type = deferredModuleWith { type = deferredModuleWith {
staticModules = [ staticModules = [
{ (policy: {
_class = "fediversity-resource-policy"; _class = "fediversity-resource-policy";
# TODO(@fricklerhandwerk): not sure it can be made
# sensible syntactically, but essentially we want to
# ensure that `apply` is defined, but since its output
# depends on the specific policy we also need to
# determine that somehow.
# hopefully this also helps with correct composition down the line.
options.resource-type = mkOption {
description = "The type of resource this policy configures";
type = types.optionType;
};
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;
}; };
} })
]; ];
}; };
}; };