tamipes/authentik-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup scope and re-enable override-scope test

Browse source 
Based on the discussion from #27
This commit is contained in:
WilliButz 2025-02-02 14:14:11 +01:00
parent e877502737
commit d653af66b3
No known key found for this signature in database
GPG key ID: AB05DF703EB9DC70
3 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

57
components/default.nix
View file

@ -1,36 +1,25 @@
{ authentik-src {
, authentik-version authentik-src,
, authentikPoetryOverrides authentik-version,
, buildNapalmPackage authentikPoetryOverrides,
, defaultPoetryOverrides buildNapalmPackage,
, mkPoetryEnv defaultPoetryOverrides,
, pkgs mkPoetryEnv,
pkgs,
}: }:
pkgs.lib.makeScope pkgs.newScope (final: pkgs.lib.makeScope pkgs.newScope (
final:
let let
docs = final.callPackage ./docs.nix { docs = final.callPackage ./docs.nix { };
inherit authentik-src authentik-version buildNapalmPackage; frontend = final.callPackage ./frontend.nix { };
}; pythonEnv = final.callPackage ./pythonEnv.nix { };
frontend = final.callPackage ./frontend.nix {
inherit authentik-src authentik-version buildNapalmPackage;
};
pythonEnv = final.callPackage ./pythonEnv.nix {
inherit authentik-src mkPoetryEnv defaultPoetryOverrides authentikPoetryOverrides;
};
# server + outposts # server + outposts
gopkgs = final.callPackage ./gopkgs.nix { gopkgs = final.callPackage ./gopkgs.nix { };
inherit authentik-src authentik-version; staticWorkdirDeps = final.callPackage ./staticWorkdirDeps.nix { };
}; migrate = final.callPackage ./migrate.nix { };
staticWorkdirDeps = final.callPackage ./staticWorkdirDeps.nix {
inherit authentik-src;
};
migrate = final.callPackage ./migrate.nix {
inherit authentik-src;
};
# worker # worker
manage = final.callPackage ./manage.nix { manage = final.callPackage ./manage.nix { };
};
in in
{ {
authentikComponents = { authentikComponents = {
@ -41,8 +30,16 @@ pkgs.lib.makeScope pkgs.newScope (final:
gopkgs gopkgs
staticWorkdirDeps staticWorkdirDeps
migrate migrate
manage; manage
;
}; };
inherit authentik-src authentik-version; inherit
authentik-src
authentik-version
buildNapalmPackage
mkPoetryEnv
defaultPoetryOverrides
authentikPoetryOverrides
;
} }
) )

10
flake.nix
View file

@ -119,11 +119,11 @@
inherit pkgs authentik-version; inherit pkgs authentik-version;
inherit (self) nixosModules; inherit (self) nixosModules;
}); });
# override-scope = (import tests/override-scope.nix { override-scope = (import tests/override-scope.nix {
# inherit pkgs authentik-version; inherit pkgs authentik-version;
# inherit (self) nixosModules; inherit (self) nixosModules;
# inherit (self.lib) mkAuthentikScope; inherit (self.lib) mkAuthentikScope;
# }); });
}; };
}; };
}); });

4
tests/override-scope.nix
View file

@ -115,7 +115,9 @@ pkgs.nixosTest {
machine.screenshot("3_rendered_admin_interface") machine.screenshot("3_rendered_admin_interface")
machine.succeed("su - alice -c 'xdotool click 1' >&2") machine.succeed("su - alice -c 'xdotool click 1' >&2")
machine.succeed("su - alice -c 'xdotool key --delay 100 Page_Down' >&2") machine.succeed("su - alice -c 'xdotool key --delay 100 Page_Down' >&2")
machine.wait_for_text("${authentik-version}") # sometimes the cursor covers the version string
machine.succeed("su - alice -c 'xdotool mousemove_relative 50 50' >&2")
machine.wait_for_text("${builtins.replaceStrings ["."] [".?"] authentik-version}")
machine.screenshot("4_correct_version_in_admin_interface") machine.screenshot("4_correct_version_in_admin_interface")
with subtest("nginx proxies to authentik"): with subtest("nginx proxies to authentik"):