summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-25 02:14:44 +0200
committertv <tv@shackspace.de>2015-07-25 02:14:44 +0200
commit0a5548c379a373157448c3b3798073c6d426033b (patch)
tree62f8a170fd179be8de98bf09a28ceca85d8167d5
parentfca9bf179a5cd29b6804b2e16bb21374b82876bf (diff)
{3 -> 4} krebs {listset,tree}
-rw-r--r--3modules/krebs/default.nix19
-rw-r--r--4lib/krebs/default.nix18
2 files changed, 20 insertions, 17 deletions
diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix
index 43e7e4c59..33c108811 100644
--- a/3modules/krebs/default.nix
+++ b/3modules/krebs/default.nix
@@ -68,27 +68,12 @@ let
de.krebsco = "ovh";
};
- # splitByProvider : [alias] -> set providername [alias]
- splitByProvider = foldl (acc: alias: insert (providerOf alias) alias acc) {};
+ # splitByProvider : [alias] -> listset providername alias
+ splitByProvider = foldl (acc: alias: listset-insert (providerOf alias) alias acc) {};
# providerOf : alias -> providername
providerOf = alias:
tree-get (splitString "." alias) providers;
-
- # insert : k -> v -> set k [v] -> set k [v]
- insert = name: value: set:
- set // { ${name} = set.${name} or [] ++ [value]; };
-
- # tree k v = set k (either v (tree k v))
-
- # tree-get : [k] -> tree k v -> v
- tree-get = path: x:
- let
- y = x.${last path};
- in
- if typeOf y != "set"
- then y
- else tree-get (init path) y;
in
concatStringsSep "\n" (flatten (
# TODO deepMap ["hosts" "nets"] (hostname: host: netname: net:
diff --git a/4lib/krebs/default.nix b/4lib/krebs/default.nix
index 0c59076b6..0c42a5de3 100644
--- a/4lib/krebs/default.nix
+++ b/4lib/krebs/default.nix
@@ -12,4 +12,22 @@ builtins // lib // rec {
types = import ./types.nix { inherit lib; };
+
+ # listset k v = set k [v]
+
+ # listset-insert : k -> v -> listset k v -> listset k v
+ listset-insert = name: value: set:
+ set // { ${name} = set.${name} or [] ++ [value]; };
+
+ # tree k v = set k (either v (tree k v))
+
+ # tree-get : [k] -> tree k v -> v
+ tree-get = path: x:
+ let
+ y = x.${last path};
+ in
+ if typeOf y != "set"
+ then y
+ else tree-get (init path) y;
+
}