fix

meta/domain-devspaces/index.yaml

@@ -6,52 +6,129 @@ metadata:
   name: domain-devspaces
   description: null
 options:
-  apps:
-    default:
-      dbgate:
-        enable: false
-      superset:
-        enable: false
-      yaade:
-        enable: false
+  organisations:
+    default: []
+    items:
+      type: object
+      properties:
+        name:
+          type: string
+          default: ''
+        datasets:
+          default: []
+          type: array
+          items:
+            type: object
+            properties:
+              name:
+                default: ''
+                type: string
+              engine:
+                default: pg
+                type: string
     examples:
-    - dbgate:
-        enable: false
-      superset:
-        enable: false
-      yaade:
-        enable: false
+    - []
+    type: array
+  storage-classes:
+    default:
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+    examples:
+    - FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
     type: object
     properties:
-      dbgate:
-        type: object
+      BlockReadWriteMany:
+        type: string
+        default: ''
+      BlockReadWriteOnce:
+        type: string
+        default: ''
+      FilesystemReadWriteMany:
+        type: string
+        default: ''
+      FilesystemReadWriteOnce:
+        type: string
+        default: ''
+  images:
+    default:
+      codeserver:
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.15
+        pullPolicy: IfNotPresent
+    properties:
+      codeserver:
         properties:
-          enable:
-            type: boolean
-            default: false
-        default:
-          enable: false
-      superset:
+          pullPolicy:
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+            default: IfNotPresent
+          registry:
+            type: string
+            default: docker.io
+          repository:
+            type: string
+            default: sebt3/code-server
+          tag:
+            type: number
+            default: 4.15
         type: object
-        properties:
-          enable:
-            type: boolean
-            default: false
         default:
-          enable: false
-      yaade:
-        type: object
-        properties:
-          enable:
-            type: boolean
-            default: false
-        default:
-          enable: false
+          registry: docker.io
+          repository: sebt3/code-server
+          tag: 4.15
+          pullPolicy: IfNotPresent
+    examples:
+    - codeserver:
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.15
+        pullPolicy: IfNotPresent
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  stations:
+    default: []
+    items:
+      type: object
+      properties:
+        name:
+          type: string
+          default: ''
+        organisations:
+          default: []
+          type: array
+          items:
+            type: string
+    examples:
+    - []
+    type: array
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
   backups:
     default:
       enable: false
@@ -125,47 +202,52 @@ options:
     examples:
     - []
     type: array
-  storage-classes:
+  apps:
     default:
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
+      dbgate:
+        enable: false
+      superset:
+        enable: false
+      yaade:
+        enable: false
     examples:
-    - FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
+    - dbgate:
+        enable: false
+      superset:
+        enable: false
+      yaade:
+        enable: false
     type: object
     properties:
-      BlockReadWriteMany:
-        type: string
-        default: ''
-      BlockReadWriteOnce:
-        type: string
-        default: ''
-      FilesystemReadWriteMany:
-        type: string
-        default: ''
-      FilesystemReadWriteOnce:
-        type: string
-        default: ''
-  stations:
-    default: []
-    items:
-      type: object
-      properties:
-        name:
-          type: string
-          default: ''
-        organisations:
-          default: []
-          type: array
-          items:
-            type: string
+      dbgate:
+        type: object
+        properties:
+          enable:
+            type: boolean
+            default: false
+        default:
+          enable: false
+      superset:
+        type: object
+        properties:
+          enable:
+            type: boolean
+            default: false
+        default:
+          enable: false
+      yaade:
+        type: object
+        properties:
+          enable:
+            type: boolean
+            default: false
+        default:
+          enable: false
+  domain-name:
+    default: your_company.com
     examples:
-    - []
-    type: array
+    - your_company.com
+    type: string
   distributions:
     default:
       domain: domain
@@ -181,93 +263,11 @@ options:
       domain:
         type: string
         default: domain
-  organisations:
-    default: []
-    items:
-      type: object
-      properties:
-        name:
-          type: string
-          default: ''
-        datasets:
-          default: []
-          type: array
-          items:
-            type: object
-            properties:
-              name:
-                default: ''
-                type: string
-              engine:
-                default: pg
-                type: string
-    examples:
-    - []
-    type: array
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  images:
-    default:
-      codeserver:
-        registry: docker.io
-        repository: sebt3/code-server
-        tag: 4.15
-        pullPolicy: IfNotPresent
-    properties:
-      codeserver:
-        properties:
-          pullPolicy:
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-            default: IfNotPresent
-          registry:
-            type: string
-            default: docker.io
-          repository:
-            type: string
-            default: sebt3/code-server
-          tag:
-            type: number
-            default: 4.15
-        type: object
-        default:
-          registry: docker.io
-          repository: sebt3/code-server
-          tag: 4.15
-          pullPolicy: IfNotPresent
-    examples:
-    - codeserver:
-        registry: docker.io
-        repository: sebt3/code-server
-        tag: 4.15
-        pullPolicy: IfNotPresent
-    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
   stations-sub-domain:
     default: code
     examples:
     - code
     type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies: []
 providers:
   kubernetes: true

meta/domain-devspaces/stations.tf

@@ -11,7 +11,7 @@ locals {
   // le tableau de toutes les BDs requises dans toutes les devstations (aka de toutes les orga dont la devstation depend) triées par station/orga/ds
   sorted-datasets = flatten([
     for station in local.sorted-stations: flatten([
-      for name in distinct(sort(station.organisations)):
+      for name in distinct(sort(station.organisations)):flatten([
         for org in local.sorted-organisations: flatten([
           for dsname in reverse(distinct(sort([for d in org.datasets: d.name]))):
             for ds in org.datasets:
@@ -23,6 +23,7 @@ locals {
                 "station" = station
               }) if ds.name = dsname
         ]) if org.name == name
+      ])
     ])
   ])
 }