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

expose deployment type (#596)

Browse source 
Reviewed-on: fediversity/fediversity#596
This commit is contained in:
Kiara Grouwstra 2025-11-22 17:53:31 +01:00
parent 6761c2d61f
commit a71b6a18dc
7 changed files with 39 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
deployment/check/data-model-basic/nixosTest.nix
View file

@ -18,17 +18,13 @@ in
{ {
imports = [ ../common/model.nix ]; imports = [ ../common/model.nix ];
options = { options = {
default = default = mkOption {
let type = config.deployment-type;
env = config.environments.default; default = config.environments.default.deployment {
in deployment-name = "default";
mkOption { configuration = config."example-configuration";
type = env.resource-mapping.output-type;
default = env.deployment {
deployment-name = "default";
configuration = config."example-configuration";
};
}; };
};
deploy = mkOption { deploy = mkOption {
default = config.default.ssh-host.run; default = config.default.ssh-host.run;
}; };

16
deployment/check/data-model-nixops4/data-model.nix
View file

@ -55,16 +55,12 @@ in
}; };
}; };
}; };
options.default = options.default = lib.mkOption {
let type = config.deployment-type;
env = config.environments.default; default = config.environments.default.deployment {
in deployment-name = "default";
lib.mkOption { configuration = config."example-configuration";
type = env.resource-mapping.output-type;
default = env.deployment {
deployment-name = "default";
configuration = config."example-configuration";
};
}; };
};
} }
) )

13
deployment/check/data-model-ssh/data-model.nix
View file

@ -9,6 +9,7 @@ let
inherit (sources) nixpkgs; inherit (sources) nixpkgs;
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (lib) mkOption;
inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration; inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
inherit (config) inherit (config)
nodeName nodeName
@ -52,16 +53,14 @@ in
}; };
}; };
}; };
options.default = options = {
let default = mkOption {
env = config.environments.default; type = config.deployment-type;
in default = config.environments.default.deployment {
lib.mkOption {
type = env.resource-mapping.output-type;
default = env.deployment {
deployment-name = "default"; deployment-name = "default";
configuration = config."example-configuration"; configuration = config."example-configuration";
}; };
}; };
};
} }
) )

13
deployment/check/data-model-tf-proxmox/setups/template.nix
View file

@ -9,6 +9,7 @@ let
inherit (sources) nixpkgs; inherit (sources) nixpkgs;
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (lib) mkOption;
inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration; inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
inherit (config) inherit (config)
nodeName nodeName
@ -54,17 +55,15 @@ in
}; };
}; };
}; };
options.default = options = {
let default = mkOption {
env = config.environments.default; type = config.deployment-type;
in default = config.environments.default.deployment {
lib.mkOption {
type = env.resource-mapping.output-type;
default = env.deployment {
deployment-name = "default"; deployment-name = "default";
# normally our template is distinct, but our test cannot download build deps due to sandboxing # normally our template is distinct, but our test cannot download build deps due to sandboxing
configuration = config."example-configuration"; configuration = config."example-configuration";
}; };
}; };
};
} }
) )

13
deployment/check/data-model-tf-proxmox/setups/vm.nix
View file

@ -9,6 +9,7 @@ let
inherit (sources) nixpkgs; inherit (sources) nixpkgs;
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (lib) mkOption;
inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration; inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
inherit (config) inherit (config)
nodeName nodeName
@ -81,16 +82,14 @@ in
}; };
}; };
}; };
options.default = options = {
let default = mkOption {
env = config.environments.default; type = config.deployment-type;
in default = config.environments.default.deployment {
lib.mkOption {
type = env.resource-mapping.output-type;
default = env.deployment {
deployment-name = "default"; deployment-name = "default";
configuration = config."example-configuration"; configuration = config."example-configuration";
}; };
}; };
};
} }
) )

13
deployment/check/data-model-tf/data-model.nix
View file

@ -9,6 +9,7 @@ let
inherit (sources) nixpkgs; inherit (sources) nixpkgs;
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (lib) mkOption;
inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration; inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
inherit (config) inherit (config)
nodeName nodeName
@ -52,16 +53,14 @@ in
}; };
}; };
}; };
options.default = options = {
let default = mkOption {
env = config.environments.default; type = config.deployment-type;
in default = config.environments.default.deployment {
lib.mkOption {
type = env.resource-mapping.output-type;
default = env.deployment {
deployment-name = "default"; deployment-name = "default";
configuration = config."example-configuration"; configuration = config."example-configuration";
}; };
}; };
};
} }
) )

3
deployment/data-model.nix
View file

@ -32,6 +32,9 @@ let
in in
{ {
options = { options = {
deployment-type = mkOption {
default = deployment-type;
};
resources = mkOption { resources = mkOption {
description = "Collection of deployment resources that can be required by applications and policed by hosting providers"; description = "Collection of deployment resources that can be required by applications and policed by hosting providers";
type = attrsOf ( type = attrsOf (