Compare commits

...
Sign in to create a new pull request.

6 commits

3 changed files with 129 additions and 33 deletions

View file

@ -11,16 +11,25 @@ let
}).config; }).config;
in in
{ {
_class = "nix-unit";
test-eval = { test-eval = {
expr = expr =
let let
example = eval { example = eval {
runtime-environments.bar.nixos = { runtime-configurations.single-ssh-host =
module = { ... }:
{ ... }: {
{ system.stateVersion = "25.05";
system.stateVersion = "25.05"; };
runtime-environments.bar = {
single-ssh-host = {
ssh = {
host = "localhost";
username = "root";
authentication.password = "";
}; };
};
}; };
applications.foo = { applications.foo = {
module = module =
@ -34,11 +43,13 @@ in
}; };
in in
{ {
has-runtime = lib.isAttrs example.runtime-environments.bar.nixos.module; has-runtime-configuration = lib.isAttrs example.runtime-configurations.single-ssh-host;
has-runtime-environment = lib.isAttrs example.runtime-environments.bar.single-ssh-host.module;
has-application = lib.isAttrs example.applications.foo.module; has-application = lib.isAttrs example.applications.foo.module;
}; };
expected = { expected = {
has-runtime = true; has-runtime-configuration = true;
has-runtime-environment = true;
has-application = true; has-application = true;
}; };
}; };

View file

@ -1,43 +1,126 @@
{ {
lib, lib,
config,
... ...
}: }:
let let
inherit (lib) types mkOption; inherit (lib)
in attrNames
with types; mapAttrs
{ mkOption
options = { genAttrs
runtime-environments = mkOption { ;
description = "Collection of runtime environments into which applications can be deployed"; inherit (lib.types)
type = attrsOf (attrTag { attrsOf
nixos = mkOption { attrTag
description = "A single NixOS machine"; deferredModule
mergeTypes
nullOr
submoduleWith
submodule
str
;
runtime-configuration = mkOption {
description = "The NixOS module of a run-time environment";
type = deferredModule;
default = {
_class = "nixos";
};
};
runtime-environment = attrTag (
mapAttrs
(
name:
option@{ type, ... }:
mkOption (
option
// {
type = mergeTypes type (submodule {
options.module = mkOption {
description = "The NixOS module of the run-time environment";
type = deferredModule;
default = config.runtime-configurations.${name};
readOnly = true;
};
});
}
)
)
{
vm = {
description = "A VM to deploy to.";
type = submodule { type = submodule {
options = { options = {
module = mkOption { };
description = "The NixOS module describing the base configuration for that machine"; };
type = deferredModule; };
single-ssh-host = {
description = "A single host to deploy to by SSH.";
type = submodule {
options = {
ssh = mkOption {
description = "SSH connection info";
type = submodule {
options = {
host = mkOption {
description = "the host to access by SSH";
type = str;
};
username = mkOption {
description = "the SSH user to use";
type = nullOr str;
default = null;
};
authentication = mkOption {
description = "authentication method";
type = attrsOf (attrTag {
private-key = mkOption {
description = "path to the user's SSH private key";
type = str;
example = "/root/.ssh/id_ed25519";
};
password = mkOption {
description = "SSH password";
# TODO: mark as sensitive
type = str;
};
});
};
};
};
}; };
}; };
}; };
}; };
}); }
);
application = submoduleWith {
description = "A Fediversity application";
modules = [
{
options = {
module = mkOption {
description = "The NixOS module for that application, for configuring that application";
type = deferredModule;
};
};
}
];
};
in
{
options = {
runtime-configurations = mkOption {
description = "Collection of runtime environments into which applications can be deployed";
type = attrTag (genAttrs (attrNames runtime-environment.nestedTypes) (_: runtime-configuration));
};
runtime-environments = mkOption {
description = "Collection of runtime environments into which applications can be deployed";
type = attrsOf runtime-environment;
}; };
applications = mkOption { applications = mkOption {
description = "Collection of Fediversity applications"; description = "Collection of Fediversity applications";
type = attrsOf (submoduleWith { type = attrsOf application;
modules = [
{
options = {
module = mkOption {
description = "The NixOS module for that application, for configuring that application";
type = deferredModule;
};
};
}
];
});
}; };
}; };
} }

View file

@ -8,6 +8,8 @@
This can be fixed if we made the converter aware of [`$defs`], but that would likely amount to half a rewrite. This can be fixed if we made the converter aware of [`$defs`], but that would likely amount to half a rewrite.
[`$defs`]: https://json-schema.org/understanding-json-schema/structuring#defs [`$defs`]: https://json-schema.org/understanding-json-schema/structuring#defs
An example deployment configuration may be found at `configuration.sample.json`.
*/ */
{ {
lib, lib,