Expose rds master username and rename root_password to master_password, and default to admin

Author: CRThaze

README.md

@@ -115,7 +115,8 @@ terraform {
 | <a name="input_rds_instance_count"></a> [rds\_instance\_count](#input\_rds\_instance\_count) | Number of RDS instances in the database cluster | `number` | `2` | no |
 | <a name="input_rds_instance_type"></a> [rds\_instance\_type](#input\_rds\_instance\_type) | Instance type for RDS database | `string` | `"db.r5.xlarge"` | no |
 | <a name="input_rds_preferred_backup_window"></a> [rds\_preferred\_backup\_window](#input\_rds\_preferred\_backup\_window) | Backup window for RDS | `string` | `"07:00-09:00"` | no |
-| <a name="input_rds_root_password"></a> [rds\_root\_password](#input\_rds\_root\_password) | Root password for RDS database | `string` | n/a | yes |
+| <a name="input_rds_master_username"></a> [rds\_root\_username](#input\_rds\_root\_username) | Root username for RDS database | `string` | n/a | yes |
+| <a name="input_rds_master_password"></a> [rds\_root\_password](#input\_rds\_root\_password) | Root password for RDS database | `string` | n/a | yes |
 | <a name="input_rds_storage_encrypted"></a> [rds\_storage\_encrypted](#input\_rds\_storage\_encrypted) | Enables encryption for RDS storage | `bool` | `true` | no |
 | <a name="input_region"></a> [region](#input\_region) | AWS region to provision resources in | `string` | n/a | yes |
 | <a name="input_s3_bucket_name"></a> [s3\_bucket\_name](#input\_s3\_bucket\_name) | Name for S3 bucket | `string` | n/a | yes |

main.tf

@@ -134,7 +134,8 @@ module "comet_rds" {
   rds_backup_retention_period = var.rds_backup_retention_period
   rds_preferred_backup_window = var.rds_preferred_backup_window
   rds_database_name           = var.rds_database_name
-  rds_root_password           = var.rds_root_password
+  rds_master_username         = var.rds_master_username
+  rds_master_password         = var.rds_master_password
 }
 
 module "comet_s3" {
@@ -147,4 +148,4 @@ module "comet_s3" {
   s3_force_destroy = var.s3_force_destroy
 
   enable_mpm_infra = var.enable_mpm_infra
-}
+}

modules/comet_rds/README.md

@@ -39,7 +39,8 @@ No modules.
 | <a name="input_rds_instance_type"></a> [rds\_instance\_type](#input\_rds\_instance\_type) | Instance type for RDS database | `string` | n/a | yes |
 | <a name="input_rds_preferred_backup_window"></a> [rds\_preferred\_backup\_window](#input\_rds\_preferred\_backup\_window) | Backup window for RDS | `string` | n/a | yes |
 | <a name="input_rds_private_subnets"></a> [rds\_private\_subnets](#input\_rds\_private\_subnets) | IDs of private subnets within the VPC | `list(string)` | n/a | yes |
-| <a name="input_rds_root_password"></a> [rds\_root\_password](#input\_rds\_root\_password) | Root password for RDS database | `string` | n/a | yes |
+| <a name="input_rds_master_username"></a> [rds\_root\_username](#input\_rds\_root\_username) | Root username for RDS database | `string` | n/a | yes |
+| <a name="input_rds_master_password"></a> [rds\_root\_password](#input\_rds\_root\_password) | Root password for RDS database | `string` | n/a | yes |
 | <a name="input_rds_storage_encrypted"></a> [rds\_storage\_encrypted](#input\_rds\_storage\_encrypted) | Enables encryption for RDS storage | `bool` | n/a | yes |
 | <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | ID of the VPC that will contain the provisioned resources | `string` | n/a | yes |
 

modules/comet_rds/main.tf

@@ -29,8 +29,8 @@ resource "aws_rds_cluster" "cometml-db-cluster" {
   database_name                       = var.rds_database_name
   storage_encrypted                   = var.rds_storage_encrypted
   iam_database_authentication_enabled = var.rds_iam_db_auth
-  master_username                     = "root"
-  master_password                     = var.rds_root_password
+  master_username                     = var.rds_master_username
+  master_password                     = var.rds_master_password
   engine                              = var.rds_engine
   engine_version                      = var.rds_engine_version
   backup_retention_period             = var.rds_backup_retention_period
@@ -121,4 +121,4 @@ resource "aws_vpc_security_group_ingress_rule" "mysql_port_inbound_ec2" {
   to_port                      = local.mysql_port
   ip_protocol                  = "tcp"
   referenced_security_group_id = var.rds_allow_from_sg
-}
+}

modules/comet_rds/variables.tf

@@ -68,8 +68,14 @@ variable "rds_database_name" {
   type        = string
 }
 
-variable "rds_root_password" {
-  description = "Root password for RDS database"
+variable "rds_master_username" {
+  description = "Master username for RDS database"
+  type        = string
+	default     = "admin"
+}
+
+variable "rds_master_password" {
+  description = "Master password for RDS database"
   type        = string
 }
 

variables.tf

@@ -359,8 +359,14 @@ variable "rds_database_name" {
   default     = "logger"
 }
 
-variable "rds_root_password" {
-  description = "Root password for RDS database"
+variable "rds_master_username" {
+  description = "Master username for RDS database"
+  type        = string
+	default     = "admin"
+}
+
+variable "rds_master_password" {
+  description = "Master password for RDS database"
   type        = string
 }