Skip to content

Commit 2f27803

Browse files
committed
fix: Remove empty logging list, add default password management to replace prior default password generation
1 parent 912284f commit 2f27803

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ No modules.
266266
| <a name="input_iam_role_tags"></a> [iam\_role\_tags](#input\_iam\_role\_tags) | A map of additional tags to add to the scheduled action IAM role created | `map(string)` | `{}` | no |
267267
| <a name="input_iam_role_use_name_prefix"></a> [iam\_role\_use\_name\_prefix](#input\_iam\_role\_use\_name\_prefix) | Determines whether scheduled action the IAM role name (`iam_role_name`) is used as a prefix | `string` | `true` | no |
268268
| <a name="input_kms_key_arn"></a> [kms\_key\_arn](#input\_kms\_key\_arn) | The ARN for the KMS encryption key. When specifying `kms_key_arn`, `encrypted` needs to be set to `true` | `string` | `null` | no |
269-
| <a name="input_logging"></a> [logging](#input\_logging) | Logging configuration for the cluster | <pre>object({<br/> bucket_name = optional(string)<br/> log_destination_type = optional(string)<br/> log_exports = optional(list(string), [])<br/> s3_key_prefix = optional(string)<br/> })</pre> | `null` | no |
269+
| <a name="input_logging"></a> [logging](#input\_logging) | Logging configuration for the cluster | <pre>object({<br/> bucket_name = optional(string)<br/> log_destination_type = optional(string)<br/> log_exports = optional(list(string))<br/> s3_key_prefix = optional(string)<br/> })</pre> | `null` | no |
270270
| <a name="input_maintenance_track_name"></a> [maintenance\_track\_name](#input\_maintenance\_track\_name) | The name of the maintenance track for the restored cluster. When you take a snapshot, the snapshot inherits the MaintenanceTrack value from the cluster. The snapshot might be on a different track than the cluster that was the source for the snapshot. Default value is `current` | `string` | `null` | no |
271-
| <a name="input_manage_master_password"></a> [manage\_master\_password](#input\_manage\_master\_password) | Whether to use AWS SecretsManager to manage the cluster admin credentials. Conflicts with `master_password`. One of `master_password` or `manage_master_password` is required unless `snapshot_identifier` is provided | `bool` | `false` | no |
271+
| <a name="input_manage_master_password"></a> [manage\_master\_password](#input\_manage\_master\_password) | Whether to use AWS SecretsManager to manage the cluster admin credentials. Conflicts with `master_password_wo`. One of `master_password_wo` or `manage_master_password` is required unless `snapshot_identifier` is provided | `bool` | `true` | no |
272272
| <a name="input_manage_master_password_rotation"></a> [manage\_master\_password\_rotation](#input\_manage\_master\_password\_rotation) | Whether to manage the master user password rotation. Setting this value to false after previously having been set to true will disable automatic rotation | `bool` | `false` | no |
273273
| <a name="input_manual_snapshot_retention_period"></a> [manual\_snapshot\_retention\_period](#input\_manual\_snapshot\_retention\_period) | The default number of days to retain a manual snapshot. If the value is -1, the snapshot is retained indefinitely. This setting doesn't change the retention period of existing snapshots. Valid values are between `-1` and `3653`. Default value is `-1` | `number` | `null` | no |
274274
| <a name="input_master_password_rotate_immediately"></a> [master\_password\_rotate\_immediately](#input\_master\_password\_rotate\_immediately) | Specifies whether to rotate the secret immediately or wait until the next scheduled rotation window | `bool` | `null` | no |

docs/UPGRADE-7.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Please consult the `examples` directory for reference example configurations. If
88
- AWS provider `v6.18` is now minimum supported version
99
- The ability for the module to create a random password has been removed in order to ensure passwords are not stored in plain text within the state file. Users must now provide their own password via the `master_password_wo` variable.
1010
- `master_password` is no longer supported and only the write-only equivalent is supported (`master_password_wo` and `master_password_wo_version`)
11+
- `manage_master_password` default changed from `false` to `true` to ensure password rotation is managed by default.
1112
- The variable(s) used to create access endpoints has changed from creating a single endpoint to n-number of endpoints
1213

1314
## Additional changes
@@ -21,6 +22,7 @@ Please consult the `examples` directory for reference example configurations. If
2122

2223
- Variable definitions now contain detailed `object` types in place of the previously used any type.
2324
- Default value for `parameter_group_family` changed from `redshift-1.0` to `redshift-2.0`
25+
- `manage_master_password` default changed from `false` to `true`
2426

2527
### Removed
2628

variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ variable "maintenance_track_name" {
105105
}
106106

107107
variable "manage_master_password" {
108-
description = "Whether to use AWS SecretsManager to manage the cluster admin credentials. Conflicts with `master_password`. One of `master_password` or `manage_master_password` is required unless `snapshot_identifier` is provided"
108+
description = "Whether to use AWS SecretsManager to manage the cluster admin credentials. Conflicts with `master_password_wo`. One of `master_password_wo` or `manage_master_password` is required unless `snapshot_identifier` is provided"
109109
type = bool
110-
default = false
110+
default = true
111111
}
112112

113113
variable "manual_snapshot_retention_period" {
@@ -465,7 +465,7 @@ variable "logging" {
465465
type = object({
466466
bucket_name = optional(string)
467467
log_destination_type = optional(string)
468-
log_exports = optional(list(string), [])
468+
log_exports = optional(list(string))
469469
s3_key_prefix = optional(string)
470470
})
471471
default = null

wrappers/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module "wrapper" {
3939
kms_key_arn = try(each.value.kms_key_arn, var.defaults.kms_key_arn, null)
4040
logging = try(each.value.logging, var.defaults.logging, null)
4141
maintenance_track_name = try(each.value.maintenance_track_name, var.defaults.maintenance_track_name, null)
42-
manage_master_password = try(each.value.manage_master_password, var.defaults.manage_master_password, false)
42+
manage_master_password = try(each.value.manage_master_password, var.defaults.manage_master_password, true)
4343
manage_master_password_rotation = try(each.value.manage_master_password_rotation, var.defaults.manage_master_password_rotation, false)
4444
manual_snapshot_retention_period = try(each.value.manual_snapshot_retention_period, var.defaults.manual_snapshot_retention_period, null)
4545
master_password_rotate_immediately = try(each.value.master_password_rotate_immediately, var.defaults.master_password_rotate_immediately, null)

0 commit comments

Comments
 (0)