Skip to content

Commit ed83b8b

Browse files
ravisiddhubharathkkbrenovate[bot]g-awmalikcloud-foundation-bot
authored
fix: prevent auto-update of random_password resource (#446)
Co-authored-by: Bharath KKB <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: g-awmalik <[email protected]> Co-authored-by: Awais Malik <[email protected]> Co-authored-by: CFT Bot <[email protected]>
1 parent 64618c4 commit ed83b8b

File tree

2 files changed

+32
-8
lines changed

2 files changed

+32
-8
lines changed

‎modules/mysql/main.tf‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,15 @@ resource "random_password" "user-password" {
198198
min_numeric = 1
199199
min_upper = 1
200200
length = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
201-
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
202-
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
201+
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? true : false) : false)
202+
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? 1 : 0) : 0)
203203
depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
204+
205+
lifecycle {
206+
ignore_changes = [
207+
min_lower, min_upper, min_numeric
208+
]
209+
}
204210
}
205211

206212
resource "random_password" "additional_passwords" {
@@ -212,9 +218,15 @@ resource "random_password" "additional_passwords" {
212218
min_numeric = 1
213219
min_upper = 1
214220
length = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
215-
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
216-
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
221+
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? true : false) : false)
222+
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? 1 : 0) : 0)
217223
depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
224+
225+
lifecycle {
226+
ignore_changes = [
227+
min_lower, min_upper, min_numeric
228+
]
229+
}
218230
}
219231

220232
resource "google_sql_user" "default" {

‎modules/postgresql/main.tf‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,15 @@ resource "random_password" "user-password" {
202202
min_numeric = 1
203203
min_upper = 1
204204
length = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
205-
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
206-
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
205+
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? true : false) : false)
206+
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? 1 : 0) : 0)
207207
depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
208+
209+
lifecycle {
210+
ignore_changes = [
211+
min_lower, min_upper, min_numeric
212+
]
213+
}
208214
}
209215

210216
resource "random_password" "additional_passwords" {
@@ -216,9 +222,15 @@ resource "random_password" "additional_passwords" {
216222
min_numeric = 1
217223
min_upper = 1
218224
length = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
219-
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
220-
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
225+
special = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? true : false) : false)
226+
min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity == "COMPLEXITY_DEFAULT" ? 1 : 0) : 0)
221227
depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
228+
229+
lifecycle {
230+
ignore_changes = [
231+
min_lower, min_upper, min_numeric
232+
]
233+
}
222234
}
223235

224236
resource "google_sql_user" "default" {

0 commit comments

Comments
 (0)