From 4d79c9aef5fc88ef8912f783f04c4bdb39e301f6 Mon Sep 17 00:00:00 2001 From: Venkaiah Chowdary Koneru Date: Thu, 28 Nov 2019 12:12:39 +0100 Subject: [PATCH 1/5] add ca_cert_identifier local variable --- main.tf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index 5890b75..b627166 100644 --- a/main.tf +++ b/main.tf @@ -1,7 +1,8 @@ locals { - port = "${var.port == "" ? "${var.engine == "aurora-postgresql" ? "5432" : "3306"}" : var.port}" - master_password = "${var.password == "" ? random_id.master_password.b64 : var.password}" - backtrack_window = "${var.backtrack_window == "" ? "${var.engine == "aurora" ? "0" : ""}" : var.backtrack_window}" + port = "${var.port == "" ? "${var.engine == "aurora-postgresql" ? "5432" : "3306"}" : var.port}" + master_password = "${var.password == "" ? random_id.master_password.b64 : var.password}" + backtrack_window = "${var.backtrack_window == "" ? "${var.engine == "aurora" ? "0" : ""}" : var.backtrack_window}" + ca_cert_identifier = "${var.ca_cert_identifier == "" ? "rds-ca-2015" : var.ca_cert_identifier}" } # Random string to use as master password unless one is specified @@ -45,6 +46,7 @@ resource "aws_rds_cluster" "this" { db_cluster_parameter_group_name = "${var.db_cluster_parameter_group_name}" iam_database_authentication_enabled = "${var.iam_database_authentication_enabled}" backtrack_window = "${local.backtrack_window}" + ca_cert_identifier = "${local.ca_cert_identifier}" enabled_cloudwatch_logs_exports = "${var.enabled_cloudwatch_logs_exports}" From d485a83ab09506cd460d4c240675de3012e20810 Mon Sep 17 00:00:00 2001 From: Venkaiah Chowdary Koneru Date: Thu, 28 Nov 2019 12:17:25 +0100 Subject: [PATCH 2/5] add ca_cert_identifier variable --- variables.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/variables.tf b/variables.tf index 5951191..60e6671 100644 --- a/variables.tf +++ b/variables.tf @@ -244,3 +244,8 @@ variable "copy_tags_to_snapshot" { description = "Indicates whether to copy all of the user-defined tags from the DB instance to snapshots of the DB instance." default = false } + +variable "ca_cert_identifier" { + description = "Specifies the identifier of the CA certificate for the DB instance. Possible values `rds-ca-2015` | `rds-ca-2019`" + default = "rds-ca-2015" +} From 0e48db2408901c6f1b538860e0b6687b58ef64d6 Mon Sep 17 00:00:00 2001 From: Venkaiah Chowdary Koneru Date: Thu, 28 Nov 2019 12:21:05 +0100 Subject: [PATCH 3/5] add ca_cert_identifier to inputs --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 55b8d36..865e5a0 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ Terraform documentation is generated automatically using [pre-commit hooks](http | auto\_minor\_version\_upgrade | Determines whether minor engine upgrades will be performed automatically in the maintenance window | string | `"true"` | no | | backtrack\_window | The target backtrack window, in seconds. Only available for aurora engine currently. To disable backtracking, set this value to 0. Defaults to 0. Must be between 0 and 259200 (72 hours) | string | `"0"` | no | | backup\_retention\_period | How long to keep backups for (in days) | string | `"7"` | no | +| ca\_cert\_identifier | Specifies the identifier of the CA certificate for the DB instance | string | `"rds-ca-2015"` | no | | copy\_tags\_to\_snapshot | Indicates whether to copy all of the user-defined tags from the DB instance to snapshots of the DB instance. | string | `"false"` | no | | database\_name | Name for an automatically created database on cluster creation | string | `""` | no | | db\_cluster\_parameter\_group\_name | The name of a DB Cluster parameter group to use | string | `"default.aurora5.6"` | no | From d287f63d3e0f69661ee051f71c69dc4eb20b304b Mon Sep 17 00:00:00 2001 From: Venkaiah Chowdary Koneru Date: Thu, 28 Nov 2019 12:28:41 +0100 Subject: [PATCH 4/5] remove local ca_cert_identifier --- main.tf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index b627166..71f53fe 100644 --- a/main.tf +++ b/main.tf @@ -1,8 +1,7 @@ locals { - port = "${var.port == "" ? "${var.engine == "aurora-postgresql" ? "5432" : "3306"}" : var.port}" - master_password = "${var.password == "" ? random_id.master_password.b64 : var.password}" - backtrack_window = "${var.backtrack_window == "" ? "${var.engine == "aurora" ? "0" : ""}" : var.backtrack_window}" - ca_cert_identifier = "${var.ca_cert_identifier == "" ? "rds-ca-2015" : var.ca_cert_identifier}" + port = "${var.port == "" ? "${var.engine == "aurora-postgresql" ? "5432" : "3306"}" : var.port}" + master_password = "${var.password == "" ? random_id.master_password.b64 : var.password}" + backtrack_window = "${var.backtrack_window == "" ? "${var.engine == "aurora" ? "0" : ""}" : var.backtrack_window}" } # Random string to use as master password unless one is specified @@ -46,7 +45,7 @@ resource "aws_rds_cluster" "this" { db_cluster_parameter_group_name = "${var.db_cluster_parameter_group_name}" iam_database_authentication_enabled = "${var.iam_database_authentication_enabled}" backtrack_window = "${local.backtrack_window}" - ca_cert_identifier = "${local.ca_cert_identifier}" + ca_cert_identifier = "${var.ca_cert_identifier}" enabled_cloudwatch_logs_exports = "${var.enabled_cloudwatch_logs_exports}" From d197a08aa8905c1b0d1d01b007731699c8ca8349 Mon Sep 17 00:00:00 2001 From: Venkaiah Chowdary Koneru Date: Thu, 28 Nov 2019 12:29:33 +0100 Subject: [PATCH 5/5] adjust formatting --- main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index 71f53fe..dfb880e 100644 --- a/main.tf +++ b/main.tf @@ -1,7 +1,7 @@ locals { - port = "${var.port == "" ? "${var.engine == "aurora-postgresql" ? "5432" : "3306"}" : var.port}" - master_password = "${var.password == "" ? random_id.master_password.b64 : var.password}" - backtrack_window = "${var.backtrack_window == "" ? "${var.engine == "aurora" ? "0" : ""}" : var.backtrack_window}" + port = "${var.port == "" ? "${var.engine == "aurora-postgresql" ? "5432" : "3306"}" : var.port}" + master_password = "${var.password == "" ? random_id.master_password.b64 : var.password}" + backtrack_window = "${var.backtrack_window == "" ? "${var.engine == "aurora" ? "0" : ""}" : var.backtrack_window}" } # Random string to use as master password unless one is specified