De-hardcode number of cores

input-output-hk · May 17, 2022 · 2e04369 · 2e04369
1 parent 3a26246
commit 2e04369
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/modules/terraform.nix b/modules/terraform.nix
@@ -381,7 +381,7 @@ let
             inherit cidr;
             inherit (cfg) region;
 
-            subnets = lib.pipe 3 [
+            subnets = lib.pipe (builtins.length (builtins.attrNames cfg.coreNodes)) [
               (builtins.genList lib.id)
               (map (idx: lib.nameValuePair "core-${toString (idx+1)}" {
                 cidr = net.cidr.subnet 8 idx cidr;

diff --git a/modules/terraform/aws_policies.nix b/modules/terraform/aws_policies.nix
@@ -162,11 +162,7 @@ in {
 
           assumeRole = {
             effect = "Allow";
-            resources = [
-              config.cluster.coreNodes.core-1.iam.instanceProfile.tfArn
-              config.cluster.coreNodes.core-2.iam.instanceProfile.tfArn
-              config.cluster.coreNodes.core-3.iam.instanceProfile.tfArn
-            ];
+            resources = lib.mapAttrsToList (_: attrs: attrs.iam.instanceProfile.tfArn) config.cluster.coreNodes;
             actions = [ "sts:AssumeRole" ];
           };