Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions examples/autoscaling/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 6 additions & 5 deletions examples/autoscaling/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscaling/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}
}
}
6 changes: 3 additions & 3 deletions examples/global-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion examples/global-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {} }
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/global-cluster/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}

random = {
Expand Down
4 changes: 2 additions & 2 deletions examples/multi-az/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions examples/multi-az/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/multi-az/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}
}
}
4 changes: 2 additions & 2 deletions examples/mysql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions examples/mysql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}
}
}
4 changes: 2 additions & 2 deletions examples/postgresql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 5 additions & 3 deletions examples/postgresql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/postgresql/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}
}
}
4 changes: 2 additions & 2 deletions examples/s3-import/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 6 additions & 5 deletions examples/s3-import/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/s3-import/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}
}
}
7 changes: 5 additions & 2 deletions examples/serverless/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 |

Expand Down
16 changes: 16 additions & 0 deletions examples/serverless/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion examples/serverless/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 4.30"
version = ">= 4.67"
}
random = {
source = "hashicorp/random"
version = ">= 3.5"
}
}
}
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.61"
version = "~> 4.67"
}
}
}