From 6fbef48218e7f099cf624bc7c3ef75bbf0732b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Wed, 18 Oct 2023 17:33:56 +0200
Subject: [PATCH] fix

---
 apps/dbgate/application.tf   |  14 +++++
 apps/dbgate/index.yaml       | 114 +++++++++++++++++------------------
 modules/forward/forward.tf   |  10 ---
 modules/ingress/variables.tf |   1 -
 4 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/apps/dbgate/application.tf b/apps/dbgate/application.tf
index 2452f5d..d9db925 100644
--- a/apps/dbgate/application.tf
+++ b/apps/dbgate/application.tf
@@ -3,6 +3,18 @@ locals {
     dns-names = [local.dns-name]
 }
 
+
+provider "restapi" {
+  uri = "http://authentik.${var.domain}-auth.svc/api/v3/"
+  headers = local.request_headers
+  create_method = "PATCH"
+  update_method = "PATCH"
+  destroy_method = "PATCH"
+  write_returns_object = true
+  id_attribute = "name"
+}
+
+
 module "ingress" {
   source = "/dist/modules/ingress"
   component         = var.component
@@ -59,6 +71,8 @@ module "forward" {
   dns-names         = local.dns-names
   authentik-token   = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
   providers = {
+    restapi = restapi
+    http = http
     kubectl = kubectl
     authentik = authentik
   }
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index 8897c92..f905112 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,10 +6,25 @@ metadata:
   name: dbgate
   description: null
 options:
-  domain-name:
-    default: your_company.com
+  domain:
+    default: your-company
     examples:
-    - your_company.com
+    - your-company
+    type: string
+  use-oauth:
+    default: false
+    examples:
+    - false
+    type: boolean
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
     type: string
   pg:
     default: []
@@ -40,7 +55,12 @@ options:
           type: string
       type: object
     type: array
-  mongo:
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  maria:
     default: []
     examples:
     - []
@@ -69,59 +89,7 @@ options:
           type: string
       type: object
     type: array
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  use-oauth:
-    default: false
-    examples:
-    - false
-    type: boolean
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
-    examples:
-    - accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 1Gi
-        type: string
-      type:
-        default: Filesystem
-        enum:
-        - Filesystem
-        - Block
-        type: string
-    type: object
-  maria:
+  mongo:
     default: []
     examples:
     - []
@@ -189,6 +157,38 @@ options:
             type: string
         type: object
     type: object
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 1Gi
+        type: string
+      type:
+        default: Filesystem
+        enum:
+        - Filesystem
+        - Block
+        type: string
+    type: object
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
   app-group:
     default: dev
     examples:
diff --git a/modules/forward/forward.tf b/modules/forward/forward.tf
index 48a5f20..084e68b 100644
--- a/modules/forward/forward.tf
+++ b/modules/forward/forward.tf
@@ -79,16 +79,6 @@ data "http" "get_forward_outpost" {
   }
 }
 
-provider "restapi" {
-  uri = "http://authentik.${var.domain}-auth.svc/api/v3/"
-  headers = local.request_headers
-  create_method = "PATCH"
-  update_method = "PATCH"
-  destroy_method = "PATCH"
-  write_returns_object = true
-  id_attribute = "name"
-}
-
 resource "restapi_object" "forward_outpost_binding" {
   path = "/outposts/instances/${local.forward-outpost-pk}/"
   data = jsonencode({
diff --git a/modules/ingress/variables.tf b/modules/ingress/variables.tf
index 6856732..4091211 100644
--- a/modules/ingress/variables.tf
+++ b/modules/ingress/variables.tf
@@ -24,6 +24,5 @@ variable "middlewares" {
   type        = list(string)
 }
 variable "service" {
-  type        = object
 }