yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'clan/inventory: allow list usage of roles via polymorphism' (#4918) from cleanup-again into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4918
This commit is contained in:
hsjobeki
2025-08-25 10:41:49 +00:00
parent c308fd63a7 4414403dec
commit 5be9b8383b
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/clan-cli/clan_lib/nix_models/clan.py
View File

@@ -31,17 +31,10 @@ class InventoryInstanceRoleMachine(TypedDict):
class InventoryInstanceRoleTag(TypedDict):
pass
InventoryInstanceRoleExtramodulesType = list[dict[str, Any] | str]
InventoryInstanceRoleMachinesType = dict[str, InventoryInstanceRoleMachine]
InventoryInstanceRoleSettingsType = Unknown
InventoryInstanceRoleTagsType = dict[str, InventoryInstanceRoleTag]
InventoryInstanceRoleTagsType = dict[str, Any] | list[str]
class InventoryInstanceRole(TypedDict):
extraModules: NotRequired[InventoryInstanceRoleExtramodulesType]

2
pkgs/clan-cli/clan_lib/nix_models/update.sh
View File

@@ -2,7 +2,7 @@
set -euo pipefail
clanSchema=$(nix build .#schemas.clan-schema-abstract --print-out-paths)/schema.json
clanSchema=$(nix build .#schemas.clanSchemaJson --print-out-paths)/schema.json
SCRIPT_DIR=$(dirname "$0")
cd "$SCRIPT_DIR"
nix run .#classgen -- "$clanSchema" "./clan.py"

2
pkgs/clan-cli/flake-module.nix
View File

@@ -134,7 +134,7 @@
classFile = "clan.py";
};
installPhase = ''
${self'.packages.classgen}/bin/classgen ${self'.legacyPackages.schemas.clan-schema-abstract}/schema.json b_classes.py
${self'.packages.classgen}/bin/classgen ${self'.legacyPackages.schemas.clanSchemaJson}/schema.json b_classes.py
file1=$classFile
file2=b_classes.py