feat: Upgrade aws provider version and update examples (#382)

magreenbaum · web-flow · commit b792d84b6808 · 2023-05-24T18:52:39.000-04:00
* upgrade aws provider version, add master_username to examples, add aurora_iopt1 example

* serverless does not support managed master password

* update comment

* manage_master_user_password must be set to false for global clusters

---------

Co-authored-by: magreenbaum &lt;magreenbaum&gt;
diff --git a/README.md b/README.md
@@ -224,13 +224,13 @@ Terraform documentation is generated automatically using [pre-commit hooks](http
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
 
 ## Modules
 
diff --git a/examples/autoscaling/README.md b/examples/autoscaling/README.md
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
 
 ## Modules
 
diff --git a/examples/autoscaling/main.tf b/examples/autoscaling/main.tf
@@ -25,11 +25,12 @@ locals {
 module "aurora" {
   source = "../../"
 
-  name           = local.name
-  engine         = "aurora-postgresql"
-  engine_version = "14.5"
-  instance_class = "db.r6g.large"
-  instances      = { 1 = {} }
+  name            = local.name
+  engine          = "aurora-postgresql"
+  engine_version  = "14.5"
+  instance_class  = "db.r6g.large"
+  instances       = { 1 = {} }
+  master_username = "root"
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
diff --git a/examples/autoscaling/versions.tf b/examples/autoscaling/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
   }
 }
diff --git a/examples/global-cluster/README.md b/examples/global-cluster/README.md
@@ -20,15 +20,15 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.2 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
-| <a name="provider_aws.secondary"></a> [aws.secondary](#provider\_aws.secondary) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
+| <a name="provider_aws.secondary"></a> [aws.secondary](#provider\_aws.secondary) | ~> 4.67 |
 | <a name="provider_random"></a> [random](#provider\_random) | >= 2.2 |
 
 ## Modules
diff --git a/examples/global-cluster/main.tf b/examples/global-cluster/main.tf
@@ -50,6 +50,7 @@ module "aurora_primary" {
   database_name             = aws_rds_global_cluster.this.database_name
   engine                    = aws_rds_global_cluster.this.engine
   engine_version            = aws_rds_global_cluster.this.engine_version
+  master_username           = "root"
   global_cluster_identifier = aws_rds_global_cluster.this.id
   instance_class            = "db.r6g.large"
   instances                 = { for i in range(2) : i => {} }
@@ -64,7 +65,8 @@ module "aurora_primary" {
   }
 
   # Global clusters do not support managed master user password
-  master_password = random_password.master.result
+  manage_master_user_password = false
+  master_password             = random_password.master.result
 
   skip_final_snapshot = true
 
diff --git a/examples/global-cluster/versions.tf b/examples/global-cluster/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
 
     random = {
diff --git a/examples/multi-az/README.md b/examples/multi-az/README.md
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
 
 ## Modules
 
diff --git a/examples/multi-az/main.tf b/examples/multi-az/main.tf
@@ -25,9 +25,10 @@ locals {
 module "aurora" {
   source = "../../"
 
-  name           = local.name
-  engine         = "postgres" # This uses RDS engine, not Aurora
-  engine_version = "14.5"
+  name            = local.name
+  engine          = "postgres" # This uses RDS engine, not Aurora
+  engine_version  = "14.5"
+  master_username = "root"
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
diff --git a/examples/multi-az/versions.tf b/examples/multi-az/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
   }
 }
diff --git a/examples/mysql/README.md b/examples/mysql/README.md
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
 
 ## Modules
 
diff --git a/examples/mysql/main.tf b/examples/mysql/main.tf
@@ -25,9 +25,10 @@ locals {
 module "aurora" {
   source = "../../"
 
-  name           = local.name
-  engine         = "aurora-mysql"
-  engine_version = "8.0"
+  name            = local.name
+  engine          = "aurora-mysql"
+  engine_version  = "8.0"
+  master_username = "root"
   instances = {
     1 = {
       instance_class      = "db.r5.large"
diff --git a/examples/mysql/versions.tf b/examples/mysql/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
   }
 }
diff --git a/examples/postgresql/README.md b/examples/postgresql/README.md
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
 
 ## Modules
 
diff --git a/examples/postgresql/main.tf b/examples/postgresql/main.tf
@@ -25,9 +25,11 @@ locals {
 module "aurora" {
   source = "../../"
 
-  name           = local.name
-  engine         = "aurora-postgresql"
-  engine_version = "14.5"
+  name            = local.name
+  engine          = "aurora-postgresql"
+  engine_version  = "14.7"
+  master_username = "root"
+  storage_type    = "aurora-iopt1"
   instances = {
     1 = {
       instance_class      = "db.r5.2xlarge"
diff --git a/examples/postgresql/versions.tf b/examples/postgresql/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
   }
 }
diff --git a/examples/s3-import/README.md b/examples/s3-import/README.md
@@ -49,13 +49,13 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.67 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.61 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.67 |
 
 ## Modules
 
diff --git a/examples/s3-import/main.tf b/examples/s3-import/main.tf
@@ -25,11 +25,12 @@ locals {
 module "aurora" {
   source = "../../"
 
-  name           = local.name
-  engine         = "aurora-mysql"
-  engine_version = "5.7.12"
-  instance_class = "db.r5.large"
-  instances      = { 1 = {} }
+  name            = local.name
+  engine          = "aurora-mysql"
+  engine_version  = "5.7.12"
+  master_username = "root"
+  instance_class  = "db.r5.large"
+  instances       = { 1 = {} }
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
diff --git a/examples/s3-import/versions.tf b/examples/s3-import/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
   }
 }
diff --git a/examples/serverless/README.md b/examples/serverless/README.md
@@ -20,13 +20,15 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.67 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.5 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.67 |
+| <a name="provider_random"></a> [random](#provider\_random) | >= 3.5 |
 
 ## Modules
 
@@ -42,6 +44,7 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Type |
 |------|------|
+| [random_password.master](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password) | resource |
 | [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
 | [aws_rds_engine_version.postgresql](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/rds_engine_version) | data source |
 
diff --git a/examples/serverless/main.tf b/examples/serverless/main.tf
@@ -29,6 +29,7 @@ module "aurora_postgresql" {
   engine            = "aurora-postgresql"
   engine_mode       = "serverless"
   storage_encrypted = true
+  master_username   = "root"
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
@@ -38,6 +39,10 @@ module "aurora_postgresql" {
     }
   }
 
+  # Serverless v1 clusters do not support managed master user password
+  manage_master_user_password = false
+  master_password             = random_password.master.result
+
   monitoring_interval = 60
 
   apply_immediately   = true
@@ -67,6 +72,7 @@ module "aurora_mysql" {
   engine            = "aurora-mysql"
   engine_mode       = "serverless"
   storage_encrypted = true
+  master_username   = "root"
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
@@ -76,6 +82,10 @@ module "aurora_mysql" {
     }
   }
 
+  # Serverless v1 clusters do not support managed master user password
+  manage_master_user_password = false
+  master_password             = random_password.master.result
+
   monitoring_interval = 60
 
   apply_immediately   = true
@@ -106,6 +116,7 @@ module "aurora_mysql_v2" {
   engine_mode       = "provisioned"
   engine_version    = "8.0"
   storage_encrypted = true
+  master_username   = "root"
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
@@ -151,6 +162,7 @@ module "aurora_postgresql_v2" {
   engine_mode       = "provisioned"
   engine_version    = data.aws_rds_engine_version.postgresql.version
   storage_encrypted = true
+  master_username   = "root"
 
   vpc_id               = module.vpc.vpc_id
   db_subnet_group_name = module.vpc.database_subnet_group_name
@@ -182,6 +194,10 @@ module "aurora_postgresql_v2" {
 ################################################################################
 # Supporting Resources
 ################################################################################
+resource "random_password" "master" {
+  length  = 20
+  special = false
+}
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
diff --git a/examples/serverless/versions.tf b/examples/serverless/versions.tf
@@ -4,7 +4,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.30"
+      version = ">= 4.67"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.5"
     }
   }
 }
diff --git a/versions.tf b/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.61"
+      version = "~> 4.67"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "~> 4.61"`
	`7`	`+ version = "~> 4.67"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`