Merge pull request #7 from rhythmictech/database_create

ENG-1279

Author: Scott Miller

README.md

@@ -39,6 +39,7 @@ Create and manage an RDS PostgreSQL instance. Includes the ability to manage the
 | cloudwatch\_log\_exports | Log types to export to CloudWatch | `list(string)` | <pre>[<br>  "postgresql",<br>  "upgrade"<br>]</pre> | no |
 | create\_secretmanager\_secret | True to create a secretmanager secret containing DB password (not used if `password` is set) | `bool` | `true` | no |
 | create\_ssm\_secret | True to create a SSM Parameter SecretString containing DB password (not used if `password` is set) | `bool` | `false` | no |
+| database\_name | Name of the initial database to create. (null for none) | `string` | `null` | no |
 | enable\_deletion\_protection | If `true`, deletion protection will be turned on for the RDS instance(s) | `bool` | `true` | no |
 | engine\_version | Version of database engine to use | `string` | `"11.5"` | no |
 | final\_snapshot\_identifier | name of final snapshot (will be computed automatically if not specified) | `string` | `null` | no |

main.tf

@@ -44,8 +44,8 @@ resource "aws_db_parameter_group" "this" {
 }
 
 resource "aws_db_instance" "this" {
-  identifier        = var.identifier
-  identifier_prefix = var.identifier_prefix
+  identifier        = try(substr(var.identifier, 0, 63), null)
+  identifier_prefix = try(substr(var.identifier_prefix, 0, 36), null)
 
   allocated_storage                   = var.storage
   backup_retention_period             = var.backup_retention_period
@@ -61,7 +61,7 @@ resource "aws_db_instance" "this" {
   monitoring_interval                 = var.monitoring_interval
   monitoring_role_arn                 = var.monitoring_role_arn
   multi_az                            = var.multi_az
-  name                                = replace(var.name, "/[^A-Za-z0-9]/", "")
+  name                                = var.database_name
   parameter_group_name                = local.parameter_group_name
   password                            = local.password
   performance_insights_enabled        = var.performance_insights_enabled

variables.tf

@@ -96,6 +96,12 @@ variable "cloudwatch_log_exports" {
   ]
 }
 
+variable "database_name" {
+  default     = null
+  description = "Name of the initial database to create. (null for none)"
+  type        = string
+}
+
 variable "enable_deletion_protection" {
   default     = true
   description = "If `true`, deletion protection will be turned on for the RDS instance(s)"