gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(tf): trim ipv6 addresses

Browse source
This commit is contained in:
arcnmx 2024-06-22 23:00:21 -07:00
parent c31fcdcdbd
commit 512b1fc75b
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci/systems.json
View file

@ -28,7 +28,7 @@
"int": null, "int": null,
"local": { "local": {
"address4": null, "address4": null,
"address6": "fd0a::9e6b:00ff:fe21:1ce2", "address6": "fd0a::9e6b:ff:fe21:1ce2",
"macAddress": "9c:6b:00:21:1c:e2" "macAddress": "9c:6b:00:21:1c:e2"
}, },
"tail": null "tail": null

16
lib.nix
View file

@ -6,6 +6,8 @@
nixlib = inputs.nixpkgs.lib; nixlib = inputs.nixpkgs.lib;
inherit (nixlib.modules) mkOrder mkOverride defaultOverridePriority; inherit (nixlib.modules) mkOrder mkOverride defaultOverridePriority;
inherit (nixlib.attrsets) mapAttrs listToAttrs; inherit (nixlib.attrsets) mapAttrs listToAttrs;
inherit (nixlib.lists) elem elemAt;
inherit (nixlib.strings) match;
inherit (inputs.self.lib.Std) List Str Regex UInt Opt; inherit (inputs.self.lib.Std) List Str Regex UInt Opt;
eui64 = mac: let eui64 = mac: let
@ -17,7 +19,16 @@
nibble0 = Str.index part 0; nibble0 = Str.index part 0;
in in
nibble0 + UInt.toHexLower nibble1; nibble0 + UInt.toHexLower nibble1;
in "${part0 (part 0)}${part 1}:${part 2}ff:fe${part 3}:${part 4}${part 5}"; in trimAddress6 "${part0 (part 0)}${part 1}:${part 2}ff:fe${part 3}:${part 4}${part 5}";
trimAddress6 = let
matcher = match ''(^|.*:)(0+)([0-9a-fA-F].*)'';
in addr: let
matched = matcher addr;
prefix = elemAt matched 0;
postfix = elemAt matched 2;
addrReplaced = prefix + postfix;
in if matched == null then addr else trimAddress6 addrReplaced;
parseUrl = url: let parseUrl = url: let
parts' = Regex.match ''^([^:]+)://(\[[0-9a-fA-F:]+]|[^/:\[]+)(|:[0-9]+)(|/.*)$'' url; parts' = Regex.match ''^([^:]+)://(\[[0-9a-fA-F:]+]|[^/:\[]+)(|:[0-9]+)(|/.*)$'' url;
@ -36,7 +47,7 @@
path = List.index parts 3; path = List.index parts 3;
}; };
userIs = group: user: builtins.elem group (user.extraGroups ++ [user.group]); userIs = group: user: elem group (user.extraGroups ++ [user.group]);
mkWinPath = Str.replace ["/"] ["\\"]; mkWinPath = Str.replace ["/"] ["\\"];
mkBaseDn = domain: Str.concatMapSep "," (part: "dc=${part}") (Regex.splitOn "\\." domain); mkBaseDn = domain: Str.concatMapSep "," (part: "dc=${part}") (Regex.splitOn "\\." domain);
@ -100,6 +111,7 @@ in {
mkWinPath mkWinPath
mkBaseDn mkBaseDn
mkAddress6 mkAddress6
trimAddress6
mapListToAttrs mapListToAttrs
coalesce coalesce
mkAlmostOptionDefault mkAlmostOptionDefault