move validation into nodegroup module

Author: sjpb

environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf

@@ -36,4 +36,8 @@ module "compute" {
   control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0]
   security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
   baremetal_nodes = data.external.baremetal_nodes.result
+  
+  # input dict validation:
+  group_name = each.key
+  group_keys = keys(each.value)
 }

environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf

@@ -39,4 +39,8 @@ module "login" {
   control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0]
   security_group_ids = [for o in data.openstack_networking_secgroup_v2.login: o.id]
   baremetal_nodes = data.external.baremetal_nodes.result
+
+  # input dict validation:
+  group_name = each.key
+  group_keys = keys(each.value)
 }

environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf

@@ -140,3 +140,36 @@ variable "nodename_template" {
     type = string
     default = ""
 }
+
+variable "group_name" {
+    type = string
+}
+
+variable "group_keys" {
+    type = list
+    validation {
+      condition = length(setsubtract(var.group_keys, var.allowed_keys)) == 0
+      error_message = "Compute group ${var.group_name} in var.compute contains invalid key(s): ${
+        join(", ", setsubtract(var.group_keys, var.allowed_keys))}"
+    }
+}
+
+variable "allowed_keys" {
+    type = list
+    default = [
+        "nodes",
+        "flavor",
+        "image_id",
+        "extra_networks",
+        "vnic_types",
+        "compute_init_enable",
+        "ignore_image_changes",
+        "volume_backed_instances",
+        "root_volume_size",
+        "extra_volumes",
+        "match_ironic_node",
+        "availability_zone",
+        "gateway_ip",
+        "nodename_template"
+    ]
+}

environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf

@@ -101,55 +101,7 @@ variable "compute" {
             nodename_template: Overrides variable cluster_nodename_template
     EOF
     default = {}
-    type = any # can't do any better; TF type constraints can't cope with inhomogenous mappings
-    # module call will fail if missing required values so only need to check for unexpected ones
-    validation {
-        condition = length(
-                        setsubtract(
-                            flatten([for k, v in var.compute: keys(v)]),
-                            [
-                                "nodes",
-                                "flavor",
-                                "image_id",
-                                "extra_networks",
-                                "vnic_types",
-                                "compute_init_enable",
-                                "ignore_image_changes",
-                                "volume_backed_instances",
-                                "root_volume_size",
-                                "extra_volumes",
-                                "match_ironic_node",
-                                "availability_zone",
-                                "gateway_ip",
-                                "nodename_template"
-                            ]
-                        )
-                    ) == 0
-        error_message = <<-EOT
-            var.compute contains mappings with invalid keys: ${
-                join(", ", setsubtract(
-                                flatten([for k, v in var.compute: keys(v)]),
-                                [
-                                    "nodes",
-                                    "flavor",
-                                    "image_id",
-                                    "extra_networks",
-                                    "vnic_types",
-                                    "compute_init_enable",
-                                    "ignore_image_changes",
-                                    "volume_backed_instances",
-                                    "root_volume_size",
-                                    "extra_volumes",
-                                    "match_ironic_node",
-                                    "availability_zone",
-                                    "gateway_ip",
-                                    "nodename_template"
-                                ]
-                            )
-                            )
-            }
-        EOT
-    }
+    type = any # can't do any better; TF type constraints can't cope with inhomogenous inner mappings
 }
 
 variable "environment_root" {