From ccb828c8811c88edb83267996e90987b13fdbdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 26 Jan 2024 20:52:51 +0100
Subject: [PATCH] fix

---
 meta/domain-devspaces/apps.tf    |  24 +-
 meta/domain-devspaces/index.yaml | 472 +++++++++++++++----------------
 2 files changed, 248 insertions(+), 248 deletions(-)

diff --git a/meta/domain-devspaces/apps.tf b/meta/domain-devspaces/apps.tf
index 6ee39b2..297f06c 100644
--- a/meta/domain-devspaces/apps.tf
+++ b/meta/domain-devspaces/apps.tf
@@ -58,10 +58,10 @@ locals {
           ]
         ])
       )
-    }, { for k, v in var.okd : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.okd, "backups", {}), local.global-backups)
-      storage = merge({ for k, v in lookup(var.okd, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.okd, "storage", {}), "volume", {}), local.global-volume)
+    }, { for k, v in var.apps.okd : k => v if !contains(["enable","storage","backups"],k) },{
+      backups = merge(lookup(var.apps.okd, "backups", {}), local.global-backups)
+      storage = merge({ for k, v in lookup(var.apps.okd, "storage", {}) : k => v if !contains(["volume"],k) }, {
+        volume = merge(lookup(lookup(var.apps.okd, "storage", {}), "volume", {}), local.global-volume)
       })
     })
     gramo = merge(local.global-apps, {
@@ -73,10 +73,10 @@ locals {
           ]
         ])
       )
-    }, { for k, v in var.gramo : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.gramo, "backups", {}), local.global-backups)
-      storage = merge({ for k, v in lookup(var.gramo, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.gramo, "storage", {}), "volume", {}), local.global-volume)
+    }, { for k, v in var.apps.gramo : k => v if !contains(["enable","storage","backups"],k) },{
+      backups = merge(lookup(var.apps.gramo, "backups", {}), local.global-backups)
+      storage = merge({ for k, v in lookup(var.apps.gramo, "storage", {}) : k => v if !contains(["volume"],k) }, {
+        volume = merge(lookup(lookup(var.apps.gramo, "storage", {}), "volume", {}), local.global-volume)
       })
     })
     dbgate = merge(local.global-apps, {
@@ -180,10 +180,10 @@ locals {
         } if ds.engine=="mongo"]])]),
         var.external-redis
       )
-    }, { for k, v in var.dbgate : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.dbgate, "backups", {}), local.global-backups)
-      storage = merge({ for k, v in lookup(var.dbgate, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.dbgate, "storage", {}), "volume", {}), local.global-volume)
+    }, { for k, v in var.apps.dbgate : k => v if !contains(["enable","storage","backups"],k) },{
+      backups = merge(lookup(var.apps.dbgate, "backups", {}), local.global-backups)
+      storage = merge({ for k, v in lookup(var.apps.dbgate, "storage", {}) : k => v if !contains(["volume"],k) }, {
+        volume = merge(lookup(lookup(var.apps.dbgate, "storage", {}), "volume", {}), local.global-volume)
       })
     })
 }
diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml
index d3261ab..386f8f5 100644
--- a/meta/domain-devspaces/index.yaml
+++ b/meta/domain-devspaces/index.yaml
@@ -6,27 +6,34 @@ metadata:
   name: domain-devspaces
   description: null
 options:
-  stations:
-    default: []
+  ingress_class:
+    default: traefik
     examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        organisations:
-          default: []
-          items:
-            type: string
-          type: array
-      type: object
-    type: array
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
+    - traefik
     type: string
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            type: string
+          class:
+            default: ''
+            type: string
+        type: object
+    type: object
   images:
     default:
       codeserver:
@@ -66,223 +73,6 @@ options:
             type: number
         type: object
     type: object
-  external-pgs:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  organisations:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        datasets:
-          default: []
-          items:
-            properties:
-              databases:
-                default: []
-                items:
-                  properties:
-                    name:
-                      default: db
-                      type: string
-                  type: object
-                type: array
-              engine:
-                default: pg
-                type: string
-              name:
-                default: ''
-                type: string
-            type: object
-          type: array
-        name:
-          default: ''
-          type: string
-        stages:
-          default: []
-          items:
-            properties:
-              name:
-                default: prod
-                type: string
-            type: object
-          type: array
-      type: object
-    type: array
-  external-marias:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
-  external-mongos:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
-  external-redis:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-      type: object
-    type: array
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  sso_vynil:
-    default: true
-    examples:
-    - true
-    type: boolean
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
-    type: string
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          class: ''
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            type: string
-          class:
-            default: ''
-            type: string
-        type: object
-    type: object
-  stations-sub_domain:
-    default: code
-    examples:
-    - code
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app_group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  haveGitea:
-    default: false
-    examples:
-    - false
-    type: boolean
   apps:
     default:
       dbgate:
@@ -354,11 +144,106 @@ options:
             type: boolean
         type: object
     type: object
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  organisations:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        datasets:
+          default: []
+          items:
+            properties:
+              databases:
+                default: []
+                items:
+                  properties:
+                    name:
+                      default: db
+                      type: string
+                  type: object
+                type: array
+              engine:
+                default: pg
+                type: string
+              name:
+                default: ''
+                type: string
+            type: object
+          type: array
+        name:
+          default: ''
+          type: string
+        stages:
+          default: []
+          items:
+            properties:
+              name:
+                default: prod
+                type: string
+            type: object
+          type: array
+      type: object
+    type: array
+  external-pgs:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        dbname:
+          default: ''
+          type: string
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
   language:
     default: fr_FR
     examples:
     - fr_FR
     type: string
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
   backups:
     default:
       enable: false
@@ -399,6 +284,121 @@ options:
         default: false
         type: boolean
     type: object
+  external-mongos:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        dbname:
+          default: ''
+          type: string
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  stations:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        organisations:
+          default: []
+          items:
+            type: string
+          type: array
+      type: object
+    type: array
+  external-redis:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+      type: object
+    type: array
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  haveGitea:
+    default: false
+    examples:
+    - false
+    type: boolean
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  stations-sub_domain:
+    default: code
+    examples:
+    - code
+    type: string
+  sso_vynil:
+    default: true
+    examples:
+    - true
+    type: boolean
+  external-marias:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  app_group:
+    default: dev
+    examples:
+    - dev
+    type: string
 dependencies: []
 providers:
   kubernetes: true