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

various failed attempts to type-check deployment application configurations using config-level applications

Browse source 
as a result of these failures, i instead opted to move applications from
the config to the options layer, see branch `data-model-revamp`.
This commit is contained in:
Kiara Grouwstra 2025-07-01 14:56:55 +02:00
parent dbd3e90238
commit fd3b71c8df
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 48 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,13 +37,20 @@ in
applications.foo.module = applications.foo.module =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = [ options.doll = lib.mkOption {
type = lib.types.str;
};
config.environment.systemPackages = [
pkgs.hello pkgs.hello
]; ];
}; };
deployments.baz = { deployments.baz = {
module = { };
inherit runtime-environment; inherit runtime-environment;
application-configuration = {
foo = {
doll = 123;
};
};
}; };
migrations.boo = { migrations.boo = {
inherit runtime-environment; inherit runtime-environment;
@ -56,7 +63,7 @@ in
has-provider = lib.isAttrs example.providers.ssh-host; has-provider = lib.isAttrs example.providers.ssh-host;
has-resource = lib.isAttrs example.resources.bar.runtime-environment.ssh-host.module; has-resource = lib.isAttrs example.resources.bar.runtime-environment.ssh-host.module;
has-application = lib.isAttrs example.applications.foo.module; has-application = lib.isAttrs example.applications.foo.module;
has-deployment = lib.isAttrs example.deployments.baz.module; has-deployment = lib.isAttrs example.deployments.baz.application-configuration.foo.doll;
has-migration = lib.isAttrs example.migrations.boo.deployment; has-migration = lib.isAttrs example.migrations.boo.deployment;
}; };
expected = { expected = {

41
deployment/data-model.nix
View file

@ -120,12 +120,47 @@ let
modules = [ modules = [
{ {
options = { options = {
# the `applications` option consists of configuration for the above applications application-configuration = mkOption {
module = mkOption {
description = '' description = ''
Configuration to be deployed Configuration to be deployed
''; '';
type = deferredModule; # # error: attribute 'foo' missing
# type = deferredModule;
# type = submodule {
# # # checks types but is hard-coded
# # options = {
# # foo = mkOption {
# # # type = str;
# # type = submodule {
# # options = {
# # doll = mkOption {
# # type = str;
# # };
# # };
# # };
# # };
# # };
# # # `error: attribute 'doll' missing` in `example.deployments.baz.application-configuration.doll`
# # freeformType = attrsOf deferredModule;
# # options = mapAttrs
# # (k: application: mkOption {
# # description = "configuration options for ${k}";
# # # # error: attribute 'doll' missing
# # # type = deferredModule;
# # # # XXX doesn't work as `import` is for paths
# # # type = submodule { inherit (import application.module { }) options; };
# # # # XXX doesn't work as `evalModules` is general, not recognizing nixos stuff like argument `pkgs` or `config.environment`
# # # type = submodule {
# # # inherit (lib.evalModules { modules = [ application.module ]; }) options;
# # # };
# # # # error: The option `deployments.baz.application-configuration.foo._module.freeformType' in `lib/modules.nix' is already declared in `data-model.nix'.
# # # # n.b. `_module.freeformType` is an option set in `evalModules`.
# # # type = submodule {
# # # inherit (import "${sources.nixpkgs}/nixos" { configuration = application.module; }) options;
# # # };
# # })
# # (removeAttrs (config.applications) [ "_module" ]);
# };
}; };
runtime-environment = mkOption { runtime-environment = mkOption {
description = "The run-time environment to deploy to"; description = "The run-time environment to deploy to";