Fix linter, improve rabbit

service/outputs.tf

@@ -5,7 +5,7 @@ output "ingress_backend_exposure" {
   value = [for port_map in var.port_mapper :
     {
       "service" = {
-        "name" = "${local.app_slug}"
+        "name" = local.app_slug
         "port" = {
           "name" = port_map.name
         }

service/svc.tf

@@ -1,7 +1,8 @@
 locals {
   app_slug = "${var.instance}${var.component == "" ? "" : "-"}${var.component}"
+  selector = length(var.selector) > 0 ? var.selector : var.labels
   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}"
+    "name"       = lower(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
@@ -25,7 +26,7 @@ locals {
     "ClusterIP" = {
       type           = "ClusterIP"
       ports          = local.default_ports
-      selector       = var.labels
+      selector       = local.selector
       ipFamilyPolicy = var.ip_family
     },
     "ExternalName" = {
@@ -35,13 +36,13 @@ locals {
     },
     "NodePort" = {
       type           = "NodePort"
-      selector       = var.labels
+      selector       = local.selector
       ports          = local.node_ports
       ipFamilyPolicy = var.ip_family
     },
     "LoadBalancer" = {
       type                  = "LoadBalancer"
-      selector              = var.labels
+      selector              = local.selector
       ports                 = local.default_ports
       externalTrafficPolicy = var.lb_policy
       ipFamilyPolicy        = var.ip_family

service/variables.tf

@@ -8,7 +8,13 @@ variable "namespace" {
   type = string
 }
 variable "labels" {
-  type = map(string)
+  type        = map(string)
+  description = "Service labels"
+}
+variable "selector" {
+  type        = map(string)
+  description = "Service selector labels (default same as labels)"
+  default     = {}
 }
 variable "annotations" {
   type    = map(string)
@@ -33,6 +39,7 @@ variable "ip_family" {
 }
 
 variable "port_mapper" {
+  description = "List information for port mapping in the service"
   type = list(object({
     name     = optional(string)
     port     = number