From 338fb323c595cc708a520c2b1e634aa02e6618db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Mon, 23 Oct 2023 15:07:12 +0200
Subject: [PATCH] fix

---
 share/dataset-pg/databases.tf | 19 ------------
 share/dataset-pg/index.yaml   | 56 +++++++++++++++++------------------
 share/dataset-pg/roles.tf     |  7 +++--
 3 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/share/dataset-pg/databases.tf b/share/dataset-pg/databases.tf
index 776e820..ccaf4d3 100644
--- a/share/dataset-pg/databases.tf
+++ b/share/dataset-pg/databases.tf
@@ -26,18 +26,6 @@ locals {
         db if db.name == name
     ]
   ])
-  roles = concat(var.roles, var.extentions.postgrest.enable?[{
-    "name" = "anonymous"
-  }]:[])
-  sorted-role-name = reverse(distinct(sort([
-    for role in local.roles: role.name
-  ])))
-  sorted-roles = flatten([
-    for name in local.sorted-role-name: [
-      for role in local.roles:
-        role if role.name == name
-    ]
-  ])
 }
 
 
@@ -86,10 +74,3 @@ resource "postgresql_database" "my_db" {
   connection_limit  = -1
   allow_connections = true
 }
-
-
-resource "postgresql_role" "roles" {
-  depends_on        = [ time_sleep.wait_pg_ready ]
-  count             = length(local.sorted-roles)
-  name              = "${local.sorted-roles[count.index].name}"
-}
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index 1c7abb5..3634fb6 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,16 +6,6 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   extentions:
     default:
       pool:
@@ -122,10 +112,19 @@ options:
             type: object
         type: object
     type: object
-  sub-domain:
-    default: dataset-pg
+  databases:
+    default: []
+    items:
+      properties:
+        name:
+          default: db
+          type: string
+      type: object
+    type: array
+  ingress-class:
+    default: traefik
     examples:
-    - dataset-pg
+    - traefik
     type: string
   backups:
     default:
@@ -181,29 +180,25 @@ options:
         default: backup-settings
         type: string
     type: object
-  storage:
-    default: 8Gi
+  sub-domain:
+    default: dataset-pg
     examples:
-    - 8Gi
+    - dataset-pg
     type: string
-  databases:
-    default: []
-    items:
-      properties:
-        name:
-          default: db
-          type: string
-      type: object
-    type: array
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  ingress-class:
-    default: traefik
+  storage:
+    default: 8Gi
     examples:
-    - traefik
+    - 8Gi
     type: string
   roles:
     default: []
@@ -214,6 +209,11 @@ options:
           type: string
       type: object
     type: array
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/dataset-pg/roles.tf b/share/dataset-pg/roles.tf
index f1becf0..93169b3 100644
--- a/share/dataset-pg/roles.tf
+++ b/share/dataset-pg/roles.tf
@@ -1,8 +1,11 @@
 locals {
-  sorted-roles-name = reverse(distinct(sort([for r in var.roles: r.name])))
+  roles = concat(var.roles, var.extentions.postgrest.enable?[{
+    "name" = "anonymous"
+  }]:[])
+  sorted-roles-name = reverse(distinct(sort([for r in local.roles: r.name])))
   sorted-roles = flatten([
     for name in local.sorted-roles-name: [
-      for r in var.roles:
+      for r in local.roles:
         r if r.name == name
     ]
   ])