Optimize service port definition

service/variables.tf

@@ -36,43 +36,38 @@ variable "ip_family" {
   }
 }
 
-variable "ports" {
-  type    = list(number)
-  default = [80]
-}
-variable "targets" {
-  type    = list(string)
-  default = ["http"]
-}
-variable "protocols" {
-  type    = list(any)
-  default = ["TCP"]
+variable "port_mapper" {
+  type = list(object({
+    name     = optional(string)
+    port     = number
+    protocol = string
+    target   = string
+  }))
+  default = [{
+    "name"     = "80-TCP",
+    "port"     = 80,
+    "protocol" = "TCP"
+    "target"   = "80-TCP"
+  }]
   validation {
-    condition     = alltrue([for proto in var.protocols : contains(["TCP", "UDP"], proto)])
-    error_message = "Only TCP or UDP is allowed"
+    condition = alltrue(
+      [for port_map in var.port_mapper : contains(["TCP", "UDP"], port_map.protocol)]
+    )
+    error_message = "Only numeric on containerPort and TCP or UDP on protocol is allowed"
   }
+  # validation {
+  #   condition = (var.svc_type == "NodePort") == alltrue(
+  #     [for port_map in var.port_mapper : port_map.port >= 30000 && port_map.port <= 32767]
+  #   )
+  #   error_message = "The range of valid ports is 30000-32767 for a NodePort type"
+  # }
 }
+
 variable "target_host" {
   type    = string
   default = ""
 }
-variable "node_ports" {
-  type    = list(number)
-  default = [30080]
-  validation {
-    condition     = alltrue([for port in var.node_ports : port >= 30000 && port <= 32767])
-    error_message = "The range of valid ports is 30000-32767"
-  }
-}
-variable "lb_ports" {
-  type = list(object({
-    name = string
-    port = object({
-      number = number
-    })
-  }))
-  default = []
-}
+
 variable "lb_policy" {
   type    = string
   default = "Cluster"