fix

apps/dbgate/configs.tf

@@ -7,8 +7,8 @@ locals {
     join("_",["DATABASE_pg", pg.namespace, pg.name, pg.dbname]) = pg.dbname
     join("_",["USER_pg", pg.namespace, pg.name, pg.dbname]) = pg.username
   }]...)
-  pg_secrets = merge([for index, pg in var.pg: {
-    join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = data.kubernetes_secret_v1.pgs[index].data[var.pg[index].secret.key]
+  pg_secrets = merge([for pg in var.pg: {
+    join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = data.kubernetes_secret_v1.pgs[index].data[pg.secret.key]
   }]...)
   pg_conns = [for pg in var.pg: join("_",["pg", pg.namespace, pg.name, pg.dbname])]
 
@@ -33,8 +33,8 @@ locals {
     join("_",["DATABASE_mongo", m.namespace, m.name]) = m.dbname
     join("_",["USER_mongo", m.namespace, m.name]) = m.username
   }]...)
-  mongo_secrets = merge([for index, m in var.mongo: {
-    join("_",["PASSWORD_mongo", m.namespace, m.name]) = data.kubernetes_secret_v1.mongos[index].data[var.mongo[index].secret.key]
+  mongo_secrets = merge([for m in var.mongo: {
+    join("_",["PASSWORD_mongo", m.namespace, m.name]) = data.kubernetes_secret_v1.mongos[index].data[m.secret.key]
   }]...)
   mongo_conns = [for m in var.mongo: join("_",["mongo", m.namespace, m.name])]
   oauth_config = {

apps/dbgate/index.yaml

@@ -6,26 +6,6 @@ metadata:
   name: dbgate
   description: null
 options:
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  use-oauth:
-    default: false
-    examples:
-    - false
-    type: boolean
   mongo:
     default: []
     examples:
@@ -94,16 +74,53 @@ options:
             type: string
         type: object
     type: object
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
+  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
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   pg:
     default: []
     examples:
@@ -133,11 +150,6 @@ options:
           type: string
       type: object
     type: array
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
   maria:
     default: []
     examples:
@@ -167,33 +179,21 @@ options:
           type: string
       type: object
     type: array
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
+  domain:
+    default: your-company
     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
+    - your-company
+    type: string
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  use-oauth:
+    default: false
+    examples:
+    - false
+    type: boolean
 dependencies:
 - dist: null
   category: share