chore: updates from validating examples

Author: bryantbiggs

README.md

@@ -260,7 +260,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_allow_major_version_upgrade"></a> [allow\_major\_version\_upgrade](#input\_allow\_major\_version\_upgrade) | Enable to allow major engine version upgrades when changing engine versions. Defaults to `false` | `bool` | `null` | no |
+| <a name="input_allow_major_version_upgrade"></a> [allow\_major\_version\_upgrade](#input\_allow\_major\_version\_upgrade) | Enable to allow major engine version upgrades when changing engine versions. Defaults to `false` | `bool` | `false` | no |
 | <a name="input_allowed_cidr_blocks"></a> [allowed\_cidr\_blocks](#input\_allowed\_cidr\_blocks) | A list of CIDR blocks which are allowed to access the database | `list(string)` | `[]` | no |
 | <a name="input_allowed_security_groups"></a> [allowed\_security\_groups](#input\_allowed\_security\_groups) | A list of Security Group ID's to allow access to | `list(string)` | `[]` | no |
 | <a name="input_apply_immediately"></a> [apply\_immediately](#input\_apply\_immediately) | Specifies whether any cluster modifications are applied immediately, or during the next maintenance window. Default is `false` | `bool` | `null` | no |
@@ -284,7 +284,7 @@ No modules.
 | <a name="input_create_random_password"></a> [create\_random\_password](#input\_create\_random\_password) | Determines whether to create random password for RDS primary cluster | `bool` | `true` | no |
 | <a name="input_create_security_group"></a> [create\_security\_group](#input\_create\_security\_group) | Determines whether to create security group for RDS cluster | `bool` | `true` | no |
 | <a name="input_database_name"></a> [database\_name](#input\_database\_name) | Name for an automatically created database on cluster creation | `string` | `null` | no |
-| <a name="input_db_cluster_db_instance_parameter_group_name"></a> [db\_cluster\_db\_instance\_parameter\_group\_name](#input\_db\_cluster\_db\_instance\_parameter\_group\_name) | Instance parameter group to associate with all instances of the DB cluster. The `db_cluster_`db\_instance\_parameter\_group\_name` is only valid in combination with `allow\_major\_version\_upgrade | `string` | `null` | no |
+| <a name="input_db_cluster_db_instance_parameter_group_name"></a> [db\_cluster\_db\_instance\_parameter\_group\_name](#input\_db\_cluster\_db\_instance\_parameter\_group\_name) | Instance parameter group to associate with all instances of the DB cluster. The `db_cluster_db_instance_parameter_group_name` is only valid in combination with `allow_major_version_upgrade` | `string` | `null` | no |
 | <a name="input_db_cluster_parameter_group_name"></a> [db\_cluster\_parameter\_group\_name](#input\_db\_cluster\_parameter\_group\_name) | A cluster parameter group to associate with the cluster | `string` | `null` | no |
 | <a name="input_db_parameter_group_name"></a> [db\_parameter\_group\_name](#input\_db\_parameter\_group\_name) | The name of the DB parameter group to associate with instances | `string` | `null` | no |
 | <a name="input_db_subnet_group_name"></a> [db\_subnet\_group\_name](#input\_db\_subnet\_group\_name) | The name of the subnet group name (existing or created) | `string` | `""` | no |
@@ -316,7 +316,7 @@ No modules.
 | <a name="input_kms_key_id"></a> [kms\_key\_id](#input\_kms\_key\_id) | The ARN for the KMS encryption key. When specifying `kms_key_id`, `storage_encrypted` needs to be set to `true` | `string` | `null` | no |
 | <a name="input_master_password"></a> [master\_password](#input\_master\_password) | Password for the master DB user. Note - when specifying a value here, 'create\_random\_password' should be set to `false` | `string` | `null` | no |
 | <a name="input_master_username"></a> [master\_username](#input\_master\_username) | Username for the master DB user | `string` | `"root"` | no |
-| <a name="input_monitoring_interval"></a> [monitoring\_interval](#input\_monitoring\_interval) | The interval, in seconds, between points when Enhanced Monitoring metrics are collected for instances. Set to `0` to disble. Default is `0` | `number` | `null` | no |
+| <a name="input_monitoring_interval"></a> [monitoring\_interval](#input\_monitoring\_interval) | The interval, in seconds, between points when Enhanced Monitoring metrics are collected for instances. Set to `0` to disble. Default is `0` | `number` | `0` | no |
 | <a name="input_monitoring_role_arn"></a> [monitoring\_role\_arn](#input\_monitoring\_role\_arn) | IAM role used by RDS to send enhanced monitoring metrics to CloudWatch | `string` | `""` | no |
 | <a name="input_name"></a> [name](#input\_name) | Name used across resources created | `string` | `""` | no |
 | <a name="input_performance_insights_enabled"></a> [performance\_insights\_enabled](#input\_performance\_insights\_enabled) | Specifies whether Performance Insights is enabled or not | `bool` | `null` | no |

examples/global_cluster/main.tf

@@ -130,12 +130,14 @@ module "aurora_primary" {
   engine_version            = aws_rds_global_cluster.this.engine_version
   global_cluster_identifier = aws_rds_global_cluster.this.id
   instance_class            = "db.r6g.large"
+  instances                 = { for i in range(2) : i => {} }
   kms_key_id                = aws_kms_key.primary.arn
 
-  vpc_id                = module.primary_vpc.vpc_id
-  db_subnet_group_name  = module.primary_vpc.database_subnet_group_name
-  create_security_group = true
-  allowed_cidr_blocks   = module.primary_vpc.private_subnets_cidr_blocks
+  vpc_id                 = module.primary_vpc.vpc_id
+  db_subnet_group_name   = module.primary_vpc.database_subnet_group_name
+  create_db_subnet_group = false
+  create_security_group  = true
+  allowed_cidr_blocks    = module.primary_vpc.private_subnets_cidr_blocks
 
   skip_final_snapshot = true
 
@@ -155,12 +157,14 @@ module "aurora_secondary" {
   global_cluster_identifier = aws_rds_global_cluster.this.id
   source_region             = local.primary.region
   instance_class            = "db.r6g.large"
+  instances                 = { for i in range(2) : i => {} }
   kms_key_id                = aws_kms_key.secondary.arn
 
-  vpc_id                = module.secondary_vpc.vpc_id
-  db_subnet_group_name  = module.secondary_vpc.database_subnet_group_name
-  create_security_group = true
-  allowed_cidr_blocks   = module.secondary_vpc.private_subnets_cidr_blocks
+  vpc_id                 = module.secondary_vpc.vpc_id
+  db_subnet_group_name   = module.secondary_vpc.database_subnet_group_name
+  create_db_subnet_group = false
+  create_security_group  = true
+  allowed_cidr_blocks    = module.secondary_vpc.private_subnets_cidr_blocks
 
   skip_final_snapshot = true
 

examples/mysql/main.tf

@@ -26,6 +26,9 @@ module "vpc" {
   name = local.name
   cidr = "10.99.0.0/18"
 
+  enable_dns_support   = true
+  enable_dns_hostnames = true
+
   azs              = ["${local.region}a", "${local.region}b", "${local.region}c"]
   public_subnets   = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
   private_subnets  = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
@@ -44,26 +47,27 @@ module "aurora" {
   name           = local.name
   engine         = "aurora-mysql"
   engine_version = "5.7.12"
-  instance_class = "db.r5.large"
   instances = {
     1 = {
-      instance_class      = "db.r6g.large"
+      instance_class      = "db.r5.large"
       publicly_accessible = true
     }
     2 = {
-      instance_class = "db.t3.large"
+      identifier     = "mysql-static-1"
+      instance_class = "db.r5.2xlarge"
     }
     3 = {
-      instance_name           = "reporting"
-      instance_class          = "db.r5.large"
-      instance_promotion_tier = 15
+      identifier     = "mysql-excluded-1"
+      instance_class = "db.r5.xlarge"
+      promotion_tier = 15
     }
   }
 
-  vpc_id                = module.vpc.vpc_id
-  db_subnet_group_name  = module.vpc.database_subnet_group_name
-  create_security_group = true
-  allowed_cidr_blocks   = module.vpc.private_subnets_cidr_blocks
+  vpc_id                 = module.vpc.vpc_id
+  db_subnet_group_name   = module.vpc.database_subnet_group_name
+  create_db_subnet_group = false
+  create_security_group  = true
+  allowed_cidr_blocks    = module.vpc.private_subnets_cidr_blocks
 
   iam_database_authentication_enabled = true
   master_password                     = random_password.master.result

examples/postgresql/main.tf

@@ -47,8 +47,6 @@ module "aurora" {
   name           = local.name
   engine         = "aurora-postgresql"
   engine_version = "11.12"
-  instance_class = "db.r5.large"
-  # instances      = { for i in range(3) : i => {} }
   instances = {
     1 = {
       instance_class      = "db.r5.2xlarge"

examples/s3_import/main.tf

@@ -119,10 +119,11 @@ module "aurora" {
   instance_class = "db.r5.large"
   instances      = { 1 = {} }
 
-  vpc_id                = module.vpc.vpc_id
-  db_subnet_group_name  = module.vpc.database_subnet_group_name
-  create_security_group = true
-  allowed_cidr_blocks   = module.vpc.private_subnets_cidr_blocks
+  vpc_id                 = module.vpc.vpc_id
+  db_subnet_group_name   = module.vpc.database_subnet_group_name
+  create_db_subnet_group = false
+  create_security_group  = true
+  allowed_cidr_blocks    = module.vpc.private_subnets_cidr_blocks
 
   iam_database_authentication_enabled = true
 

main.tf

@@ -41,9 +41,7 @@ resource "aws_db_subnet_group" "this" {
   description = "For Aurora cluster ${var.name}"
   subnet_ids  = var.subnets
 
-  tags = merge(var.tags, {
-    Name = local.internal_db_subnet_group_name
-  })
+  tags = var.tags
 }
 
 resource "aws_rds_cluster" "this" {
@@ -232,9 +230,7 @@ resource "aws_iam_role" "rds_enhanced_monitoring" {
   force_detach_policies = var.iam_role_force_detach_policies
   max_session_duration  = var.iam_role_max_session_duration
 
-  tags = merge(var.tags, {
-    Name = var.iam_role_name
-  })
+  tags = var.tags
 }
 
 resource "aws_iam_role_policy_attachment" "rds_enhanced_monitoring" {

variables.tf

@@ -87,7 +87,7 @@ variable "engine_version" {
 variable "allow_major_version_upgrade" {
   description = "Enable to allow major engine version upgrades when changing engine versions. Defaults to `false`"
   type        = bool
-  default     = null
+  default     = false
 }
 
 variable "enable_http_endpoint" {
@@ -205,7 +205,7 @@ variable "db_cluster_parameter_group_name" {
 }
 
 variable "db_cluster_db_instance_parameter_group_name" {
-  description = "Instance parameter group to associate with all instances of the DB cluster. The `db_cluster_`db_instance_parameter_group_name` is only valid in combination with `allow_major_version_upgrade`"
+  description = "Instance parameter group to associate with all instances of the DB cluster. The `db_cluster_db_instance_parameter_group_name` is only valid in combination with `allow_major_version_upgrade`"
   type        = string
   default     = null
 }
@@ -298,7 +298,7 @@ variable "db_parameter_group_name" {
 variable "monitoring_interval" {
   description = "The interval, in seconds, between points when Enhanced Monitoring metrics are collected for instances. Set to `0` to disble. Default is `0`"
   type        = number
-  default     = null
+  default     = 0
 }
 
 variable "auto_minor_version_upgrade" {