Refacto and add modules

forward/variables.tf

@@ -6,10 +6,6 @@ variable "instance" {
   type = string
 }
 
-variable "icon" {
-  type = string
-}
-
 variable "domain" {
   type = string
 }
@@ -18,12 +14,16 @@ variable "namespace" {
   type = string
 }
 
+variable "labels" {
+  type = map(string)
+}
+
 variable "ingress_class" {
   type = string
 }
 
-variable "labels" {
-  type = map(string)
+variable "icon" {
+  type = string
 }
 
 variable "dns_names" {
@@ -36,11 +36,17 @@ variable "access_token_validity" {
 }
 
 variable "app_name" {
-  type = string
+  type    = string
   default = ""
 }
 
 variable "service" {
+  type = object({
+    name = string
+    port = object({
+      number = number
+    })
+  })
 }
 
 variable "request_headers" {