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

factor out function wrapper to module function #9

Closed
kiara wants to merge 4 commits from data-model-factor-out-wrapper into deployment-data-model-with-tests
pull from: data-model-factor-out-wrapper
merge into: fricklerhandwerk:deployment-data-model-with-tests
Conversation 5 Commits 4 Files changed 3 +71 -41
3 changed files with 71 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,40 +99,37 @@ in
{ {
options.enable = lib.mkEnableOption "Hello in the shell"; options.enable = lib.mkEnableOption "Hello in the shell";
}; };
implementation = cfg: { implementation =
input = cfg; cfg:
output = lib.optionalAttrs cfg.enable { lib.optionalAttrs cfg.enable {
resources.hello.login-shell.packages.hello = pkgs.hello; resources.hello.login-shell.packages.hello = pkgs.hello;
}; };
};
}; };
environments.single-nixos-vm = environments.single-nixos-vm =
{ config, ... }: { config, ... }:
{ {
resources.operator-environment.login-shell.username = "operator"; resources.operator-environment.login-shell.username = "operator";
implementation = requests: { implementation =
input = requests; requests:
output = { providers, ... }:
{ providers, ... }: {
{ providers = {
providers = { inherit (inputs.nixops4.modules.nixops4Provider) local;
inherit (inputs.nixops4.modules.nixops4Provider) local;
};
resources.the-machine = {
type = providers.local.exec;
imports = [
inputs.nixops4-nixos.modules.nixops4Resource.nixos
];
nixos.module =
{ ... }:
{
users.users = config.resources.shell.login-shell.apply (
lib.filterAttrs (_name: value: value ? login-shell) requests
);
};
};
}; };
}; resources.the-machine = {
type = providers.local.exec;
imports = [
inputs.nixops4-nixos.modules.nixops4Resource.nixos
];
nixos.module =
{ ... }:
{
users.users = config.resources.shell.login-shell.apply (
lib.filterAttrs (_name: value: value ? login-shell) requests
);
};
};
};
}; };
}; };
options = { options = {

41
deployment/data-model.nix
View file

@ -103,18 +103,19 @@ in
}; };
resources = mkOption { resources = mkOption {
description = "Compute resources required by an application"; description = "Compute resources required by an application";
type = functionTo application.config.config-mapping.output-type; type = application.config.config-mapping.function-type;
readOnly = true; readOnly = true;
default = input: (application.config.implementation input).output; default = application.config.config-mapping.apply;
}; };
# TODO(@fricklerhandwerk): this needs a better name, it's just the type # TODO(@fricklerhandwerk): this needs a better name
config-mapping = mkOption { config-mapping = mkOption {
description = "Function type for the mapping from application configuration to required resources"; description = "Compute resources required by an application";
type = submodule functionType; type = submodule functionType;
readOnly = true; readOnly = true;
default = { default = {
input-type = submodule application.config.module; input-type = submodule application.config.module;
output-type = application-resources; output-type = application-resources;
declare = application.config.implementation;
}; };
}; };
}; };
@ -151,6 +152,25 @@ in
default = { default = {
input-type = application-resources; input-type = application-resources;
output-type = nixops4Deployment; output-type = nixops4Deployment;
declare = environment.config.implementation;
};
};
config-mapping = mkOption {
description = "Mapping from a configuration to a deployment";
type = submodule functionType;
readOnly = true;
default = {
input-type = config.configuration;
output-type = nixops4Deployment;
declare =
cfg:
# TODO: check cfg.enable.true
let
required-resources = lib.mapAttrs (
name: application-settings: config.applications.${name}.resources application-settings
) cfg.applications;
in
environment.config.resource-mapping.apply required-resources;
}; };
}; };
# TODO(@fricklerhandwerk): maybe this should be a separate thing such as `fediversity-setup`, # TODO(@fricklerhandwerk): maybe this should be a separate thing such as `fediversity-setup`,
@ -158,18 +178,9 @@ in
# then the deployments can simply be the result of the function application baked into this module. # then the deployments can simply be the result of the function application baked into this module.
deployment = mkOption { deployment = mkOption {
description = "Generate a deployment from a configuration, by applying an environment's resource policies to the applications' resource mappings"; description = "Generate a deployment from a configuration, by applying an environment's resource policies to the applications' resource mappings";
type = functionTo (environment.config.resource-mapping.output-type); type = environment.config.config-mapping.function-type;
readOnly = true; readOnly = true;
default = default = environment.config.config-mapping.apply;
cfg:
# TODO: check cfg.enable.true
let
required-resources = lib.mapAttrs (
name: application-settings: config.applications.${name}.resources application-settings
) cfg.applications;
in
(environment.config.implementation required-resources).output;
}; };
}; };
}) })

22
deployment/function.nix
View file

@ -19,6 +19,11 @@ in
type = optionType; type = optionType;
}; };
function-type = mkOption { function-type = mkOption {
type = optionType;
readOnly = true;
default = functionTo config.output-type;
};
wrapper-type = mkOption {
type = optionType; type = optionType;
readOnly = true; readOnly = true;
default = functionTo (submodule { default = functionTo (submodule {
@ -32,5 +37,22 @@ in
}; };
}); });
}; };
declare = mkOption {
type = config.function-type;
default = _: { };
};
wrapper = mkOption {
type = config.wrapper-type;
readOnly = true;
default = input: fn: {
inherit input;
output = config.implementation fn.config.input;
};
};
apply = mkOption {
type = config.function-type;
readOnly = true;
default = input: (config.wrapper input).output;
};
}; };
} }