fix

share/organisation/gitea-user.tf

@@ -83,7 +83,7 @@ resource "gitea_user" "user-ci" {
   username             = "${var.instance}-ci"
   login_name           = "${var.instance}-ci"
   password             = random_password.password.result
-  email                = "${var.instance}-ci@${var.domain_name}"
+  email                = "${var.instance}-ci@${var.domain-name}"
   must_change_password = true
 }
 

share/organisation/index.yaml

@@ -6,18 +6,31 @@ metadata:
   name: organisation
   description: null
 options:
-  datasets:
-    default: []
-    items:
-      properties:
-        engine:
-          default: pg
-          type: string
-        name:
-          default: ''
-          type: string
-      type: object
-    type: array
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  gitea-ssh-domain:
+    default: ''
+    examples:
+    - ''
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   stages:
     default: []
     items:
@@ -27,36 +40,6 @@ options:
           type: string
       type: object
     type: array
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  haveGitea:
-    default: false
-    examples:
-    - false
-    type: boolean
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
   backups:
     default:
       enable: false
@@ -87,26 +70,43 @@ options:
         default: backup-settings
         type: string
     type: object
-  app_group:
-    default: dev
+  haveGitea:
+    default: false
     examples:
-    - dev
-    type: string
-  domain_name:
+    - false
+    type: boolean
+  datasets:
+    default: []
+    items:
+      properties:
+        engine:
+          default: pg
+          type: string
+        name:
+          default: ''
+          type: string
+      type: object
+    type: array
+  domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  domain:
-    default: your-company
+  distributions:
+    default:
+      core: core
+      domain: domain
     examples:
-    - your-company
-    type: string
-  gitea-ssh-domain:
-    default: ''
-    examples:
-    - ''
-    type: string
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
 dependencies: []
 providers:
   kubernetes: true

share/organisation/stages.tf

@@ -1,17 +1,17 @@
 locals {
   annotations = {
     "vynil.solidite.fr/name" = "${var.component}"
-    "vynil.solidite.fr/domain" = var.domain_name
+    "vynil.solidite.fr/domain" = var.domain-name
     "vynil.solidite.fr/issuer" = var.issuer
-    "vynil.solidite.fr/ingress" = var.ingress_class
+    "vynil.solidite.fr/ingress" = var.ingress-class
   }
   global = {
     "domain"         = var.namespace
-    "domain_name"    = var.domain_name
+    "domain-name"    = var.domain-name
     "issuer"         = var.issuer
-    "ingress_class"  = var.ingress_class
+    "ingress-class"  = var.ingress-class
     "backups"        = var.backups
-    "app_group"      = var.app_group
+    "app-group"      = var.app-group
   }
   sorted-stage-name = reverse(distinct(sort([for s in var.stages: s.name])))
   sorted-dataset-name = reverse(distinct(sort([for d in var.datasets: d.name])))
@@ -26,7 +26,7 @@ locals {
       for name in local.sorted-dataset-name: [
         for ds in var.datasets:
           merge(ds,{
-            "sub_domain" = "${stage}.${var.instance}"
+            "sub-domain" = "${stage}.${var.instance}"
             "namespace" = "${var.domain}-${var.instance}-${stage}"
           }) if ds.name == name
       ]