Refacto OAuth2

service/svc.tf

@@ -1,11 +1,10 @@
 locals {
-  selector = var.selector==null?var.labels:var.selector
-  app_slug = "${var.instance}${var.component==""?"":"-"}${var.component}"
-  cluster_ports = var.svc_type == "ClusterIP" ? [for idx, target in var.targets : {
-    "name"       = target
-    "port"       = var.ports[idx]
-    "protocol"   = var.protocols[idx]
-    "targetPort" = target
+  app_slug = "${var.instance}${var.component == "" ? "" : "-"}${var.component}"
+  default_ports = var.svc_type != "NodePort" ? [for port_map in var.port_mapper : {
+    "name"       = port_map.name != null && port_map.name != "" ? port_map.name : "${port_map.port}-${port_map.protocol}"
+    "port"       = port_map.port
+    "protocol"   = port_map.protocol
+    "targetPort" = port_map.target
   }] : []
   node_ports = var.svc_type == "NodePort" ? [for port_map in var.port_mapper : {
     "port"       = port_map.port
@@ -24,9 +23,10 @@ locals {
   )
   spec = {
     "ClusterIP" = {
-      type     = "ClusterIP"
-      ports    = local.cluster_ports
-      selector = local.selector
+      type           = "ClusterIP"
+      ports          = local.default_ports
+      selector       = var.labels
+      ipFamilyPolicy = var.ip_family
     },
     "ExternalName" = {
       type         = "ExternalName"
@@ -34,14 +34,15 @@ locals {
       ports        = local.default_ports
     },
     "NodePort" = {
-      type     = "NodePort"
-      selector = local.selector
-      ports    = local.node_ports
+      type           = "NodePort"
+      selector       = var.labels
+      ports          = local.node_ports
+      ipFamilyPolicy = var.ip_family
     },
     "LoadBalancer" = {
-      type     = "LoadBalancer"
-      selector = local.selector
-      ports    = local.lb_ports
+      type                  = "LoadBalancer"
+      selector              = var.labels
+      ports                 = local.default_ports
       externalTrafficPolicy = var.lb_policy
       ipFamilyPolicy        = var.ip_family
     }

service/variables.tf

@@ -10,10 +10,6 @@ variable "namespace" {
 variable "labels" {
   type = map(string)
 }
-variable "selector" {
-  type = map(string)
-  default = null
-}
 variable "annotations" {
   type    = map(string)
   default = {}