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

---
 share/dns/config.tf  | 18 +++++++++---------
 share/dns/index.yaml | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/share/dns/config.tf b/share/dns/config.tf
index 7013897..c433365 100644
--- a/share/dns/config.tf
+++ b/share/dns/config.tf
@@ -39,15 +39,15 @@ locals {
       "$ORIGIN ${z.name}.",
       local.soa-ns
     ],
-    lookup(z, "domain","")!=""?[format("%s. IN A %s", z.name, z.domain)]:[],
-    lookup(z, "domain6","")!=""?[format("%s. IN AAAA %s", z.name, z.domain6)]:[],
-    [for k,v in coalesce(lookup(z, "txt",[]),[]): format("%s IN TXT %s", k, v)],
-    [for k,v in coalesce(lookup(z, "hosts",[]),[]): format("%s IN A %s", k, v)],
-    [for k,v in coalesce(lookup(z, "hosts6",[]),[]): format("%s IN AAAA %s", k, v)],
-    [for k,v in coalesce(lookup(z, "alias",[]),[]): format("%s IN CNAME %s", k, v)],
-    [for mx in coalesce(lookup(z, "mx",[]),[]): format("%s IN MX %d %s", mx.name, mx.priority, mx.value)],
-    lookup(z, "wildcard","")!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[],
-    lookup(z, "wildcard6","")!=""?[format("*.%s. IN AAAA %s", z.name, z.wildcard6)]:[],
+    try(z.domain,"")!=""?[format("%s. IN A %s", z.name, z.domain)]:[],
+    try(z.domain6,"")!=""?[format("%s. IN AAAA %s", z.name, z.domain6)]:[],
+    [for k,v in try(z.txt,[]): format("%s IN TXT %s", k, v)],
+    [for k,v in try(z.hosts,[]): format("%s IN A %s", k, v)],
+    [for k,v in try(z.hosts6,[]): format("%s IN AAAA %s", k, v)],
+    [for k,v in try(z.alias,[]): format("%s IN CNAME %s", k, v)],
+    [for mx in try(z.mx,[]): format("%s IN MX %d %s", mx.name, mx.priority, mx.value)],
+    try(z.wildcard,"")!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[],
+    try(z.wildcard6,"")!=""?[format("*.%s. IN AAAA %s", z.name, z.wildcard6)]:[],
     ))
   }]...)
 }
diff --git a/share/dns/index.yaml b/share/dns/index.yaml
index 81df496..766fecc 100644
--- a/share/dns/index.yaml
+++ b/share/dns/index.yaml
@@ -6,21 +6,11 @@ metadata:
   name: dns
   description: null
 options:
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
-  sub_domain:
-    default: dns
-    examples:
-    - dns
-    type: string
   image:
     default:
       pullPolicy: IfNotPresent
@@ -103,6 +93,16 @@ options:
           type: string
       type: object
     type: array
+  sub_domain:
+    default: dns
+    examples:
+    - dns
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
 dependencies: []
 providers:
   kubernetes: true