AZURE: fix support to subnets

zbioe · Aug 21, 2022 · 127925a · 127925a
1 parent 2ea1364
commit 127925a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 12 deletions.
diff --git a/env/azure/config.nix b/env/azure/config.nix
@@ -2,14 +2,14 @@
   provision.azure = {
     enable = true;
     group = "bornlogic-consul";
-
+    location = "East US 2";
     networks = {
       prod = { tags = { env = "production"; }; };
       stag = { tags = { env = "staging"; }; };
       test = {
         tags = { env = "testing"; };
         cidr_ranges = [ "10.0.0.0/16" ];
-        subnetworks = { n1 = { cidr_range = "10.1.0.0/16"; }; };
+        subnetworks = { n1 = { cidr_ranges = [ "10.0.1.0/24" ]; }; };
       };
     };
 

diff --git a/lib/cfg.nix b/lib/cfg.nix
@@ -2,8 +2,15 @@
 let
   inherit (builtins) length foldl' attrNames;
   inherit (lib) mkIf;
+  inherit (lib.lists) imap0;
 in {
+  # f = key: value: ... ;
   attrsMap = attrs: f:
     mkIf (length (attrNames attrs) > 0)
     (foldl' (a: b: a // b) { } (map f (attrNames attrs)));
+
+  # f = index: value: ... ;
+  listMap = attrs: f:
+    mkIf (length (attrNames attrs) > 0) (imap0 f (attrNames attrs));
+
 }
diff --git a/provision/azure/default.nix b/provision/azure/default.nix
@@ -23,14 +23,16 @@ in {
       subnetworksModule = submodule ({ config, name, ... }: {
         options = {
           name = mk' str name "name of subnetwork";
-          cidr_range = mk' str "10.0.0.1/16" "cidr ranges network";
+          cidr_ranges =
+            mk' (listOf str) [ "10.0.1.0/16" ] "cidr ranges network";
+          group = mk' str azure.group "resource group";
         };
       });
 
       imagesModule = submodule ({ config, name, ... }: {
         options = {
           project = mk' str azure.project "project";
-          location = mk' str azure.region "location";
+          location = mk' str azure.location "location";
           labels = mk' (attrsOf str) { name = name; } "labels";
           name = mk' str name "name of image";
           zone = mk' str azure.zone "name of image";
@@ -95,10 +97,9 @@ in {
     inherit (builtins) attrNames;
     inherit (lib) mkIf readFile assertMsg;
     inherit (lib.strings) removeSuffix;
-    inherit (pkgs.lib.cfg) attrsMap;
+    inherit (pkgs.lib.cfg) attrsMap listMap;
     azure = config.provision.azure;
     networks = azure.networks;
-    subnetworks = azure.subnetworks;
 
   in {
     terraform.required_providers =
@@ -121,20 +122,39 @@ in {
         tags = azure.tags;
       };
 
+      azurerm_network_security_group = attrsMap networks (name: {
+        ${name} = with networks.${name}; {
+          inherit name location;
+          resource_group_name = group;
+        };
+      });
+
       azurerm_virtual_network = attrsMap networks (name: {
         ${name} = with networks.${name}; {
           inherit location name tags dns_servers;
           address_space = cidr_ranges;
           resource_group_name = group;
-          subnetworks = attrsMap subnetworks (sname: {
-            ${sname} = with subnetworks.${name}; {
-              name = sname;
-              address_prefix = cidr_range;
-            };
-          });
         };
       });
+
+      azurerm_subnet = attrsMap networks (name:
+        let subnetworks = networks.${name}.subnetworks;
+        in attrsMap subnetworks (sname:
+          with subnetworks.${sname}; {
+            ${sname} = {
+              name = sname;
+              resource_group_name = group;
+              virtual_network_name =
+                "\${ azurerm_virtual_network.${name}.name }";
+              address_prefixes = cidr_ranges;
+            };
+          }));
     };
+
+    # TODO:
+    # subnet_network_security_group_association =
+    # "\${ azurerm_network_security_group.${name}.id }";
+
     # output = attrsMap replicas (name:
     #   let
     #     inherit (builtins) head;