kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity
881 commits 107 branches 0 tags 49 MiB
Commit graph

110 commits

Author SHA1 Message Date
Kiara Grouwstra
1b898264e4
[HACK] comment environment resources type, making the test go through 
[HACK] explicitly set resource options, as defaults seem insufficient

clarify comment
 2025-07-27 12:45:50 +02:00
Valentin Gagarin
f90e8d0932
more type-safe policy application 2025-07-27 12:45:48 +02:00
Kiara Grouwstra
8bae65c4c4
[HACK] explicitly pass instantiated policy to apply 2025-07-27 12:45:25 +02:00
Kiara Grouwstra
119620eb5e
generalize function type to take types to fix un-nixops4 error Expected a module, but found a value of type "option-type" 2025-07-27 12:44:27 +02:00
Kiara Grouwstra
228365cdf0
[HACK] swap out nixops4 deployments for raw nixos modules 
rm deployment

rm imports
 2025-07-27 12:12:11 +02:00
Kiara Grouwstra
c8882e32f6
reproduce nixops4-nixos importing issue: The option environments.single-nixos-vm.deployment.<function body>.resources.the-machine.nixos' does not exist` 
add comment explaining our nixops4 type problem
 2025-07-27 12:12:11 +02:00
Kiara Grouwstra
d7e4830bd7
swap out dummy module for actual import 
clean deployment module a bit

simplify imports
 2025-07-27 12:12:11 +02:00
Kiara Grouwstra
286f0c245e
model: [DUMMY] use mock deployment to temporarily simplify the problem 
type policy.apply

remove `apply`'s optionType, fixes duplicate definition error
 2025-07-27 12:12:11 +02:00
Valentin Gagarin
44c0a548a8
readability 2025-07-27 12:12:11 +02:00
Kiara Grouwstra
9b5eb50fbc
environment: fix implementation type 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
3efe6f347f
pass resourceProviderSystem to nixops4Deployment 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
cd097a7afd
resolve resource mapping input discrepancy according to actual implementation, adjusting the type accordingly 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
e668239f8a
properly flatten out application layer at users.users 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
4f024c8030
fix application resource type 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
7ec11ebde8
fix application-requirements 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
a6fc12709d
resolve rebase 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
cce6a06bf3
untangle applications from function type, as they seem to not need the introspection (and may type-check input without it) 2025-07-22 19:12:58 +02:00
Kiara Grouwstra
9f43c8a278
make packages filter return a list 2025-07-22 19:12:56 +02:00
Kiara Grouwstra
8173f65f18
add trivial unit test for deployment - now to find how to make it work! 
test proper expectation

test proper expectation

settle for counting packages over comparing them, solves an infinite recursion
 2025-07-22 19:12:52 +02:00
Kiara Grouwstra
1b3dc70466
fix environment deployment 2025-07-22 19:12:51 +02:00
Kiara Grouwstra
eba4be2b1e
model: add classes 
remove _class for application requirements to allow iterating over values

rm function class

re-add nix-unit class
 2025-07-22 19:12:50 +02:00
Kiara Grouwstra
1cc6a31c9c
use submodule to turn module into type for functionTo 2025-07-22 19:12:48 +02:00
Kiara Grouwstra
c94d575392
use mapAttrs right 
`mapAttrs'` takes two args rather than a set, whereas if only the val
changes `mapAttrs (_: v: ...)` should do
 2025-07-22 19:12:47 +02:00
Kiara Grouwstra
307ff1d6ac
fix typos, lint, format 2025-07-19 18:38:46 +02:00
Valentin Gagarin
4b031652f7
WIP: illustrate an entire NixOS configuration as a resource 2025-07-19 18:38:43 +02:00
Valentin Gagarin
71446a891f
WIP: (broken) implement test 2025-07-19 18:38:36 +02:00
Valentin Gagarin
37df0f370d
WIP: implement mappings 2025-07-19 18:34:18 +02:00
Valentin Gagarin
5b1993c800
WIP: start writing an evaluation test 
turns out we also need a collection of configurations, obviously
next: figure out where to wire everything up to obtain a deployment
 2025-07-19 18:31:26 +02:00
Valentin Gagarin
17647b194b
WIP: add missing types 2025-07-19 18:31:07 +02:00
Valentin Gagarin
dd0aff13d7
WIP: implement data model as in diagram 
this doesn't update the tests yet because we don't have all the data
types in place anyway yet, and I still need to come up with testable examples.
 2025-07-19 18:30:26 +02:00
Kiara Grouwstra
15967158bc
better reflect naming from diagram configuration data flow 2025-07-19 18:29:41 +02:00
Kiara Grouwstra
e3e2a3359c
data model: migration 2025-07-19 18:29:09 +02:00
Kiara Grouwstra
9230ea540c
data model: deployment 2025-07-19 18:29:02 +02:00
Nicolas “Niols” Jeannerod
b4e1c5b5b3 Restrict fileset necessary for deployment tests (#450) 
Now that we won't depend on the flake.nix anymore, we won't depend on all the flake-part.nix files (necessary to evaluate flake.nix) and all the files they depend on etc., so the Nix dependencies of the tests will be drastically reduced, and I will be able to leverage that by introducing a more subtle src. This will make the test not need to re-run if only things outside that reduced src changed (and the previous run is in the Nix store).

Reviewed-on: Fediversity/Fediversity#450
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-07-09 22:57:52 +02:00
Nicolas “Niols” Jeannerod
de38611572 Unflakify deployment tests (#449) 
This PR builds on top of #447 and #448. Since these might be rejected, there will be some changes needed for this PR as well. Let's see how the discussions go in #447.

In the meantime, @fricklerhandwerk, would you mind (in)validating the core idea of this PR? You only need to look at 7cf43c4041, really.

Reviewed-on: Fediversity/Fediversity#449
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-07-09 15:07:02 +02:00
Nicolas “Niols” Jeannerod
1d40dcfc0e Grab git-hooks from npins (#448) 
This PR builds on top of #447 and will be subject to the same discussion. Let's discuss there whether it makes sense to get rid of the `flake-parts` and `git-hooks` flake inputs.

Reviewed-on: Fediversity/Fediversity#448
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-07-09 13:21:48 +02:00
Nicolas “Niols” Jeannerod
48c6a1f22b Extract mkFlake to own file - get flake-parts from npins (#447) 
The goal is to contain the “`mkFlake` hack” to a file that we can heavily document but otherwise ignore. This also will allow me to reuse it in the “flake under test” of the deployment tests.

Reviewed-on: Fediversity/Fediversity#447
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-07-09 10:12:47 +02:00
Kiara Grouwstra
5345860006 data model: add run-time configuration (#437) 
based on @fricklerhandwerk's work at https://git.fediversity.eu/fricklerhandwerk/Fediversity/compare/main...data-model-as-diagram part of #103.
supersedes #402.

on the application model, feedback on a [sample implementation](#2) welcome as well.

Reviewed-on: Fediversity/Fediversity#437
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-06 21:42:25 +02:00
Kiara Grouwstra
05572ff69e remove string interpolation from imports (#429) 
Reviewed-on: Fediversity/Fediversity#429
Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-03 15:55:39 +02:00
Kiara Grouwstra
a791ad41ec Inject sources, secrets and keys via module system - avoid import ../ (#421) 
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Reviewed-on: Fediversity/Fediversity#421
Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com>
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-01 21:08:15 +02:00
Kiara Grouwstra
737aecaba6 set default value for nixops4Package (#412) 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Reviewed-on: Fediversity/Fediversity#412
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-30 12:44:53 +02:00
Kiara Grouwstra
9a25a04bfa specify _class module attributes to explicitly declare module types (#398) 
closes #93.

note that this includes classes:

- `nixos`
- `nixosTest`
- `nixops4Resource`
- `nixops4Deployment`

.. and my (made-up, as per the [docs](https://ryantm.github.io/nixpkgs/module-system/module-system/#module-system-lib-evalModules-param-class)):

- `nix-unit`
- `package`

.. while i did not manage to cover:

- service tests, given `pkgs.nixosTest` seemed to not actually like `_class = "nixosTest"` (?!)

... nor #93's mentioned destructured arguments for that matter, as per Fediversity/Fediversity#93 (comment) - let me know if that is still desired as well.

Reviewed-on: Fediversity/Fediversity#398
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-23 17:24:54 +02:00
Nicolas “Niols” Jeannerod
bd1cfd7a7c Introduce test for deploying all services via FediPanel (#361) 
Closes #277

Same as #329 but where we run the FediPanel and interact with it via a browser
instead of running NixOps4 directly.

Reviewed-on: Fediversity/Fediversity#361
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-06-18 12:37:47 +02:00
Kiara Grouwstra
939f9d961d add data model entity: application (#387) 
part of #103.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Reviewed-on: Fediversity/Fediversity#387
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-17 17:11:52 +02:00
Nicolas “Niols” Jeannerod
4801433ae0 Get rid of the need for deployer.pub (#385) 
The tests still work because we manually write the deployer's public key in `/root/.ssh/authorized_keys` on the target machines. In itself, however, the configuration that we push does not allow the deployer to push anything on the target machines.

Context: Fediversity/Fediversity#361 (comment)
Reviewed-on: Fediversity/Fediversity#385
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-06-17 16:34:29 +02:00
Valentin Gagarin
1b832c1f5b bypass native flake input for Nixpkgs (#374) 
@Niols the sheer amount of hassle and noise indicates that it may be better to first split out a `flake.nix` just for the tests. And all this clutter doesn't even explain yet *why* we thought it needs to be there.

closes #279.

Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Reviewed-on: Fediversity/Fediversity#374
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-committed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2025-06-12 13:05:11 +02:00
Nicolas “Niols” Jeannerod
69b2e535fe Document nullable fields sanitation (#365) 
Reviewed-on: Fediversity/Fediversity#365
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-06-10 11:57:01 +02:00
Nicolas “Niols” Jeannerod
09119803e8 Deployment: handle nullable config fields 
This is quite frustrating. In the meantime, it does get the deployment
working again.
 2025-06-06 11:50:48 +02:00
Nicolas “Niols” Jeannerod
56b953526b Deployment tests: Check status of services before deploying 2025-06-06 10:54:06 +02:00
Nicolas “Niols” Jeannerod
2fae356d0a Deployment tests: also make acmeNodeIP available in NixOS test 2025-06-06 10:52:49 +02:00