File tree 6 files changed +9
-6
lines changed
6 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -194,6 +194,7 @@ resource "google_sql_database" "additional_databases" {
194
194
}
195
195
196
196
resource "random_password" "user-password" {
197
+ count = var. enable_default_user ? 1 : 0
197
198
length = 8
198
199
special = true
199
200
@@ -226,7 +227,7 @@ resource "google_sql_user" "default" {
226
227
name = var. user_name
227
228
project = var. project_id
228
229
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 )
230
231
depends_on = [null_resource. module_depends_on , google_sql_database_instance . default ]
231
232
}
232
233
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ output "instance_service_account_email_address" {
57
57
58
58
output "generated_user_password" {
59
59
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 : " "
61
61
sensitive = true
62
62
}
63
63
Original file line number Diff line number Diff line change @@ -224,6 +224,7 @@ resource "google_sql_database" "additional_databases" {
224
224
}
225
225
226
226
resource "random_password" "user-password" {
227
+ count = var. enable_default_user ? 1 : 0
227
228
keepers = {
228
229
name = google_sql_database_instance.default.name
229
230
}
@@ -269,7 +270,7 @@ resource "google_sql_user" "default" {
269
270
project = var. project_id
270
271
instance = google_sql_database_instance. default . name
271
272
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
273
274
depends_on = [
274
275
null_resource. module_depends_on ,
275
276
google_sql_database_instance . default ,
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ output "read_replica_instance_names" {
95
95
96
96
output "generated_user_password" {
97
97
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 : " "
99
99
sensitive = true
100
100
}
101
101
Original file line number Diff line number Diff line change @@ -231,6 +231,7 @@ resource "google_sql_database" "additional_databases" {
231
231
}
232
232
233
233
resource "random_password" "user-password" {
234
+ count = var. enable_default_user ? 1 : 0
234
235
keepers = {
235
236
name = google_sql_database_instance.default.name
236
237
}
@@ -275,7 +276,7 @@ resource "google_sql_user" "default" {
275
276
name = var. user_name
276
277
project = var. project_id
277
278
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
279
280
depends_on = [
280
281
null_resource. module_depends_on ,
281
282
google_sql_database_instance . default ,
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ output "read_replica_instance_names" {
100
100
101
101
output "generated_user_password" {
102
102
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 : " "
104
104
sensitive = true
105
105
}
106
106
You can’t perform that action at this time.
0 commit comments