Move serverless and tenant into better structure

This commit is contained in:
Greyscale 2024-12-26 20:29:01 +01:00
parent 4881f02463
commit d52e15ebd8
Signed by: grey
GPG key ID: DDB392AE64B32D89
15 changed files with 10 additions and 7 deletions

View file

@ -73,7 +73,14 @@ variable "engine_version" {
} }
} }
locals { locals {
engine_version = var.engine_version != null ? var.engine_version : "8.0" engine_version = (
local.is_mysql
? (var.engine_version != null ? element(local.supported_mysql, length(local.supported_mysql)-1) : false)
: (local.is_postgres
? (var.engine_version != null ? element(local.supported_postgres, length(local.supported_postgres)-1) : false)
: false
)
)
} }
variable "scaling" { variable "scaling" {

View file

@ -1,12 +1,8 @@
data "aws_rds_engine_version" "latest" { data "aws_rds_engine_version" "latest" {
for_each = toset([var.engine_version]) for_each = toset([var.engine_version])
engine = var.engine engine = var.engine
version = var.engine_version version = local.engine_version
latest = true latest = true
filter {
name = "engine-version"
values = [var.engine_version]
}
filter { filter {
name = "engine-mode" name = "engine-mode"
values = ["provisioned"] values = ["provisioned"]

View file

@ -1,7 +1,7 @@
module "tenants" { module "tenants" {
depends_on = [aws_rds_cluster.cluster, aws_rds_cluster_instance.instance] depends_on = [aws_rds_cluster.cluster, aws_rds_cluster_instance.instance]
for_each = var.tenants for_each = var.tenants
source = "./tenant" source = "../tenant"
username = each.value.username username = each.value.username
database = each.value.database database = each.value.database
vpc_id = data.aws_vpc.current.id vpc_id = data.aws_vpc.current.id