fix
This commit is contained in:
@@ -23,14 +23,14 @@ locals {
|
||||
for station in local.sorted-station-names: "${var.domain}-devspaces-${station}"
|
||||
],flatten([
|
||||
for org in local.sorted-organisations:[
|
||||
for stage in reverse(distinct(sort([for s in org.stages: s.name]))): "${var.domain}-${org.name}-${stage}"
|
||||
] if org.stages != null
|
||||
for stage in reverse(distinct(sort([for s in lookup(org, "stages", []): s.name]))): "${var.domain}-${org.name}-${stage}"
|
||||
]
|
||||
])
|
||||
)
|
||||
}, { for k, v in var.apps.okd : k => v if k!="enable" })
|
||||
dbgate = merge({
|
||||
"pg" = concat(
|
||||
flatten([for ds in local.sorted-datasets: [for db in ds.databases: {
|
||||
flatten([for ds in local.sorted-datasets: [for db in lookup(ds, "databases", []): {
|
||||
"name" = "${ds.name}-dataset-pg"
|
||||
"namespace" = ds.namespace
|
||||
"dbname" = db.name
|
||||
@@ -39,8 +39,8 @@ locals {
|
||||
"name" = "${ds.name}-dataset-pg-${db.name}"
|
||||
"key" = "POSGRESQL_PASSWORD"
|
||||
}
|
||||
}] if ds.engine=="pg" && ds.databases != null]),
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in org.stages: flatten([for ds in org.datasets: [for db in ds.databases:{
|
||||
}] if ds.engine=="pg"]),
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in lookup(org, "stages", []): flatten([for ds in org.datasets: [for db in lookup(ds, "databases", []):{
|
||||
"name" = "${ds.name}-dataset-pg"
|
||||
"namespace" = "${var.domain}-${org.name}-${stage.name}"
|
||||
"dbname" = db.name
|
||||
@@ -49,7 +49,7 @@ locals {
|
||||
"name" = "${ds.name}-dataset-pg-${db.name}"
|
||||
"key" = "POSGRESQL_PASSWORD"
|
||||
}
|
||||
}] if ds.engine=="pg" && ds.databases != null])]) if org.stages != null ]),
|
||||
}] if ds.engine=="pg"])])]),
|
||||
var.external-pgs
|
||||
)
|
||||
"maria" = concat(
|
||||
@@ -63,7 +63,7 @@ locals {
|
||||
"key" = "password"
|
||||
}
|
||||
} if ds.engine=="maria"]),
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in org.stages: [for ds in org.datasets: {
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in lookup(org, "stages", []): [for ds in org.datasets: {
|
||||
"name" = "${ds.name}-dataset-maria"
|
||||
"namespace" = "${var.domain}-${org.name}-${stage.name}"
|
||||
"dbname" = ds.name
|
||||
@@ -72,7 +72,7 @@ locals {
|
||||
"name" = "${ds.name}-dataset-maria"
|
||||
"key" = "password"
|
||||
}
|
||||
} if ds.engine=="maria"]]) if org.stages != null]),
|
||||
} if ds.engine=="maria"]])]),
|
||||
var.external-marias
|
||||
)
|
||||
"mongo" = concat(
|
||||
@@ -86,7 +86,7 @@ locals {
|
||||
"key" = "password"
|
||||
}
|
||||
} if ds.engine=="mongo"]),
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in org.stages: [for ds in org.datasets: {
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in lookup(org, "stages", []): [for ds in org.datasets: {
|
||||
"name" = "${ds.name}-dataset-mongo"
|
||||
"namespace" = "${var.domain}-${org.name}-${stage.name}"
|
||||
"dbname" = ds.name
|
||||
@@ -95,7 +95,7 @@ locals {
|
||||
"name" = "${ds.name}-dataset-mongo"
|
||||
"key" = "password"
|
||||
}
|
||||
} if ds.engine=="mongo"]]) if org.stages != null]),
|
||||
} if ds.engine=="mongo"]])]),
|
||||
var.external-mongos
|
||||
)
|
||||
"redis" = concat(
|
||||
@@ -103,10 +103,10 @@ locals {
|
||||
"name" = "${ds.name}-dataset-redis"
|
||||
"namespace" = ds.namespace
|
||||
} if ds.engine=="redis"]),
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in org.stages: [for ds in org.datasets: {
|
||||
flatten([for org in local.sorted-organisations: flatten([for stage in lookup(org, "stages", []): [for ds in org.datasets: {
|
||||
"name" = "${ds.name}-dataset-redis"
|
||||
"namespace" = "${var.domain}-${org.name}-${stage.name}"
|
||||
} if ds.engine=="redis"]]) if org.stages != null]),
|
||||
} if ds.engine=="redis"]])]),
|
||||
var.external-redis
|
||||
)
|
||||
}, { for k, v in var.apps.dbgate : k => v if k!="enable" })
|
||||
|
||||
Reference in New Issue
Block a user