Skip to content

Commit d320348

Browse files
magreenbaummagreenbaum
authored
feat: Multi-az rds cluster ca cert identifier (#458)
* multi-az rds cluster ca cert identifier * update variable description * remove param for testing
1 parent e9eb2b6 commit d320348

File tree

21 files changed

+60
-26
lines changed

21 files changed

+60
-26
lines changed

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ Terraform documentation is generated automatically using [pre-commit hooks](http
224224
| Name | Version |
225225
|------|---------|
226226
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
227-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
227+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.58 |
228228

229229
## Providers
230230

231231
| Name | Version |
232232
|------|---------|
233-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.42 |
233+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.58 |
234234

235235
## Modules
236236

@@ -283,6 +283,7 @@ No modules.
283283
| <a name="input_cloudwatch_log_group_kms_key_id"></a> [cloudwatch\_log\_group\_kms\_key\_id](#input\_cloudwatch\_log\_group\_kms\_key\_id) | The ARN of the KMS Key to use when encrypting log data | `string` | `null` | no |
284284
| <a name="input_cloudwatch_log_group_retention_in_days"></a> [cloudwatch\_log\_group\_retention\_in\_days](#input\_cloudwatch\_log\_group\_retention\_in\_days) | The number of days to retain CloudWatch logs for the DB instance | `number` | `7` | no |
285285
| <a name="input_cloudwatch_log_group_skip_destroy"></a> [cloudwatch\_log\_group\_skip\_destroy](#input\_cloudwatch\_log\_group\_skip\_destroy) | Set to true if you do not wish the log group (and any logs it may contain) to be deleted at destroy time, and instead just remove the log group from the Terraform state | `bool` | `null` | no |
286+
| <a name="input_cluster_ca_cert_identifier"></a> [cluster\_ca\_cert\_identifier](#input\_cluster\_ca\_cert\_identifier) | The CA certificate identifier to use for the DB cluster's server certificate. Currently only supported for multi-az DB clusters | `string` | `null` | no |
286287
| <a name="input_cluster_members"></a> [cluster\_members](#input\_cluster\_members) | List of RDS Instances that are a part of this cluster | `list(string)` | `null` | no |
287288
| <a name="input_cluster_tags"></a> [cluster\_tags](#input\_cluster\_tags) | A map of tags to add to only the cluster. Used for AWS Instance Scheduler tagging | `map(string)` | `{}` | no |
288289
| <a name="input_cluster_timeouts"></a> [cluster\_timeouts](#input\_cluster\_timeouts) | Create, update, and delete timeout configurations for the cluster | `map(string)` | `{}` | no |
@@ -392,6 +393,8 @@ No modules.
392393
|------|-------------|
393394
| <a name="output_additional_cluster_endpoints"></a> [additional\_cluster\_endpoints](#output\_additional\_cluster\_endpoints) | A map of additional cluster endpoints and their attributes |
394395
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | Amazon Resource Name (ARN) of cluster |
396+
| <a name="output_cluster_ca_certificate_identifier"></a> [cluster\_ca\_certificate\_identifier](#output\_cluster\_ca\_certificate\_identifier) | CA identifier of the CA certificate used for the DB instance's server certificate |
397+
| <a name="output_cluster_ca_certificate_valid_till"></a> [cluster\_ca\_certificate\_valid\_till](#output\_cluster\_ca\_certificate\_valid\_till) | Expiration date of the DB instance’s server certificate |
395398
| <a name="output_cluster_database_name"></a> [cluster\_database\_name](#output\_cluster\_database\_name) | Name for an automatically created database on cluster creation |
396399
| <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Writer endpoint for the cluster |
397400
| <a name="output_cluster_engine_version_actual"></a> [cluster\_engine\_version\_actual](#output\_cluster\_engine\_version\_actual) | The running version of the cluster database |

‎examples/autoscaling/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.58 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.42 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.58 |
3030

3131
## Modules
3232

‎examples/autoscaling/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.42"
7+
version = ">= 5.58"
88
}
99
}
1010
}

‎examples/global-cluster/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Note that this example may create resources which cost money. Run `terraform des
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.58 |
2424
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.2 |
2525

2626
## Providers
2727

2828
| Name | Version |
2929
|------|---------|
30-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.42 |
31-
| <a name="provider_aws.secondary"></a> [aws.secondary](#provider\_aws.secondary) | >= 5.42 |
30+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.58 |
31+
| <a name="provider_aws.secondary"></a> [aws.secondary](#provider\_aws.secondary) | >= 5.58 |
3232
| <a name="provider_random"></a> [random](#provider\_random) | >= 2.2 |
3333

3434
## Modules

‎examples/global-cluster/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.42"
7+
version = ">= 5.58"
88
}
99

1010
random = {

‎examples/multi-az/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.58 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.42 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.58 |
3030

3131
## Modules
3232

@@ -51,6 +51,8 @@ No inputs.
5151
|------|-------------|
5252
| <a name="output_additional_cluster_endpoints"></a> [additional\_cluster\_endpoints](#output\_additional\_cluster\_endpoints) | A map of additional cluster endpoints and their attributes |
5353
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | Amazon Resource Name (ARN) of cluster |
54+
| <a name="output_cluster_ca_certificate_identifier"></a> [cluster\_ca\_certificate\_identifier](#output\_cluster\_ca\_certificate\_identifier) | CA identifier of the CA certificate used for the DB instance's server certificate |
55+
| <a name="output_cluster_ca_certificate_valid_till"></a> [cluster\_ca\_certificate\_valid\_till](#output\_cluster\_ca\_certificate\_valid\_till) | Expiration date of the DB instance’s server certificate |
5456
| <a name="output_cluster_database_name"></a> [cluster\_database\_name](#output\_cluster\_database\_name) | Name for an automatically created database on cluster creation |
5557
| <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Writer endpoint for the cluster |
5658
| <a name="output_cluster_engine_version_actual"></a> [cluster\_engine\_version\_actual](#output\_cluster\_engine\_version\_actual) | The running version of the cluster database |

‎examples/multi-az/main.tf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module "aurora" {
2727

2828
name = local.name
2929
engine = "postgres" # This uses RDS engine, not Aurora
30-
engine_version = "14.5"
30+
engine_version = "15.7"
3131
master_username = "root"
3232

3333
vpc_id = module.vpc.vpc_id
@@ -45,6 +45,8 @@ module "aurora" {
4545
iops = 2500
4646
storage_type = "io1"
4747

48+
cluster_ca_cert_identifier = "rds-ca-rsa4096-g1"
49+
4850
skip_final_snapshot = true
4951

5052
tags = local.tags

‎examples/multi-az/outputs.tf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ output "cluster_hosted_zone_id" {
6666
value = module.aurora.cluster_hosted_zone_id
6767
}
6868

69+
output "cluster_ca_certificate_identifier" {
70+
description = "CA identifier of the CA certificate used for the DB instance's server certificate"
71+
value = module.aurora.cluster_ca_certificate_identifier
72+
}
73+
74+
output "cluster_ca_certificate_valid_till" {
75+
description = "Expiration date of the DB instance’s server certificate"
76+
value = module.aurora.cluster_ca_certificate_valid_till
77+
}
78+
6979
################################################################################
7080
# Cluster Instance(s)
7181
################################################################################

‎examples/multi-az/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.42"
7+
version = ">= 5.58"
88
}
99
}
1010
}

‎examples/mysql/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.58 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.42 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.58 |
3030

3131
## Modules
3232

0 commit comments

Comments
 (0)