kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Cloud SQL] Add and pass-through vars.users.database_roles (#3968)

Browse Source 
* Fix weekly_schedule config section for secondary instance

* Add and pass-through vars.users.database_roles

* Merge from upstream

---------

Co-authored-by: Ludovico Magnocavallo <ludomagno@google.com>
This commit is contained in:
Brandon Tucker
2026-05-14 15:25:00 -06:00
committed by GitHub
parent 2e2bf0150a
commit 76c6d4f404
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/cloudsql-instance/main.tf
View File

@@ -47,16 +47,18 @@ locals {
for k, v in var.users : k => for k, v in var.users : k =>
local.is_mysql local.is_mysql
? { ? {
name = v.type == "BUILT_IN" ? split("@", k)[0] : k name = v.type == "BUILT_IN" ? split("@", k)[0] : k
host = v.type == "BUILT_IN" ? try(split("@", k)[1], null) : null host = v.type == "BUILT_IN" ? try(split("@", k)[1], null) : null
password = v.type == "BUILT_IN" ? try(random_password.passwords[k].result, v.password) : null password = v.type == "BUILT_IN" ? try(random_password.passwords[k].result, v.password) : null
type = v.type type = v.type
database_roles = v.database_roles
} }
: { : {
name = local.is_postgres ? try(trimsuffix(k, ".gserviceaccount.com"), k) : k name = local.is_postgres ? try(trimsuffix(k, ".gserviceaccount.com"), k) : k
host = null host = null
password = v.type == "BUILT_IN" ? try(random_password.passwords[k].result, v.password) : null password = v.type == "BUILT_IN" ? try(random_password.passwords[k].result, v.password) : null
type = v.type type = v.type
database_roles = v.database_roles
} }
} }
} }
@@ -370,13 +372,14 @@ resource "random_password" "root_password" {
} }
resource "google_sql_user" "users" { resource "google_sql_user" "users" {
for_each = local.users for_each = local.users
project = local.project_id project = local.project_id
instance = google_sql_database_instance.primary.name instance = google_sql_database_instance.primary.name
name = each.value.name name = each.value.name
host = each.value.host host = each.value.host
password = each.value.password password = each.value.password
type = each.value.type type = each.value.type
database_roles = each.value.database_roles
} }
moved { moved {

1
modules/cloudsql-instance/variables.tf
View File

@@ -332,6 +332,7 @@ variable "users" {
password = optional(string) password = optional(string)
password_version = optional(number) password_version = optional(number)
type = optional(string, "BUILT_IN") type = optional(string, "BUILT_IN")
database_roles = optional(list(string))
})) }))
default = {} default = {}
nullable = false nullable = false