Skip to content

Commit 98c7f8c

Browse files
authored
fix: disable random_pass when default user off (#602)
1 parent 1c18d78 commit 98c7f8c

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

modules/mssql/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ resource "google_sql_database" "additional_databases" {
194194
}
195195

196196
resource "random_password" "user-password" {
197+
count = var.enable_default_user ? 1 : 0
197198
length = 8
198199
special = true
199200

@@ -226,7 +227,7 @@ resource "google_sql_user" "default" {
226227
name = var.user_name
227228
project = var.project_id
228229
instance = google_sql_database_instance.default.name
229-
password = coalesce(var.user_password, random_password.user-password.result)
230+
password = coalesce(var.user_password, random_password.user-password[0].result)
230231
depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
231232
}
232233

modules/mssql/outputs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ output "instance_service_account_email_address" {
5757

5858
output "generated_user_password" {
5959
description = "The auto generated default user password if not input password was provided"
60-
value = random_password.user-password.result
60+
value = var.enable_default_user ? random_password.user-password[0].result : ""
6161
sensitive = true
6262
}
6363

modules/mysql/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ resource "google_sql_database" "additional_databases" {
224224
}
225225

226226
resource "random_password" "user-password" {
227+
count = var.enable_default_user ? 1 : 0
227228
keepers = {
228229
name = google_sql_database_instance.default.name
229230
}
@@ -269,7 +270,7 @@ resource "google_sql_user" "default" {
269270
project = var.project_id
270271
instance = google_sql_database_instance.default.name
271272
host = var.user_host
272-
password = var.user_password == "" ? random_password.user-password.result : var.user_password
273+
password = var.user_password == "" ? random_password.user-password[0].result : var.user_password
273274
depends_on = [
274275
null_resource.module_depends_on,
275276
google_sql_database_instance.default,

modules/mysql/outputs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ output "read_replica_instance_names" {
9595

9696
output "generated_user_password" {
9797
description = "The auto generated default user password if not input password was provided"
98-
value = random_password.user-password.result
98+
value = var.enable_default_user ? random_password.user-password[0].result : ""
9999
sensitive = true
100100
}
101101

modules/postgresql/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ resource "google_sql_database" "additional_databases" {
231231
}
232232

233233
resource "random_password" "user-password" {
234+
count = var.enable_default_user ? 1 : 0
234235
keepers = {
235236
name = google_sql_database_instance.default.name
236237
}
@@ -275,7 +276,7 @@ resource "google_sql_user" "default" {
275276
name = var.user_name
276277
project = var.project_id
277278
instance = google_sql_database_instance.default.name
278-
password = var.user_password == "" ? random_password.user-password.result : var.user_password
279+
password = var.user_password == "" ? random_password.user-password[0].result : var.user_password
279280
depends_on = [
280281
null_resource.module_depends_on,
281282
google_sql_database_instance.default,

modules/postgresql/outputs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ output "read_replica_instance_names" {
100100

101101
output "generated_user_password" {
102102
description = "The auto generated default user password if not input password was provided"
103-
value = random_password.user-password.result
103+
value = var.enable_default_user ? random_password.user-password[0].result : ""
104104
sensitive = true
105105
}
106106

0 commit comments

Comments
 (0)