Skip to content

Commit bb05127

Browse files
bryantbiggsbryantbiggs
committed
chore: upgrade engines to latest version
1 parent 2418f85 commit bb05127

File tree

11 files changed

+51
-53
lines changed

11 files changed

+51
-53
lines changed

‎examples/complete-mssql/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ module "db" {
116116
identifier = local.name
117117

118118
engine = "sqlserver-ex"
119-
engine_version = "15.00.4073.23.v1"
119+
engine_version = "15.00.4153.1.v1"
120120
family = "sqlserver-ex-15.0" # DB parameter group
121121
major_engine_version = "15.00" # DB option group
122122
instance_class = "db.t3.large"

‎examples/complete-mysql/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ module "db" {
6565

6666
# All available versions: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt
6767
engine = "mysql"
68-
engine_version = "8.0.20"
68+
engine_version = "8.0.27"
6969
family = "mysql8.0" # DB parameter group
7070
major_engine_version = "8.0" # DB option group
71-
instance_class = "db.t3.large"
71+
instance_class = "db.t3a.large"
7272

7373
allocated_storage = 20
7474
max_allocated_storage = 100
@@ -130,10 +130,10 @@ module "db_default" {
130130

131131
# All available versions: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt
132132
engine = "mysql"
133-
engine_version = "8.0.20"
133+
engine_version = "8.0.27"
134134
family = "mysql8.0" # DB parameter group
135135
major_engine_version = "8.0" # DB option group
136-
instance_class = "db.t3.large"
136+
instance_class = "db.t3a.large"
137137

138138
allocated_storage = 20
139139

‎examples/complete-oracle/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ module "db" {
6464
identifier = "demodb-oracle"
6565

6666
engine = "oracle-ee"
67-
engine_version = "12.1.0.2.v8"
68-
family = "oracle-ee-12.1" # DB parameter group
69-
major_engine_version = "12.1" # DB option group
67+
engine_version = "19.0.0.0.ru-2021-10.rur-2021-10.r1"
68+
family = "oracle-ee-19.0" # DB parameter group
69+
major_engine_version = "19.0" # DB option group
7070
instance_class = "db.t3.large"
7171
license_model = "bring-your-own-license"
7272

‎examples/complete-postgres/main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ module "db" {
6565

6666
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
6767
engine = "postgres"
68-
engine_version = "11.10"
69-
family = "postgres11" # DB parameter group
70-
major_engine_version = "11" # DB option group
71-
instance_class = "db.t3.large"
68+
engine_version = "14.1"
69+
family = "postgres14" # DB parameter group
70+
major_engine_version = "14" # DB option group
71+
instance_class = "db.t3a.large"
7272

7373
allocated_storage = 20
7474
max_allocated_storage = 100
@@ -129,10 +129,10 @@ module "db_default" {
129129

130130
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
131131
engine = "postgres"
132-
engine_version = "11.10"
133-
family = "postgres11" # DB parameter group
134-
major_engine_version = "11" # DB option group
135-
instance_class = "db.t3.large"
132+
engine_version = "14.1"
133+
family = "postgres14" # DB parameter group
134+
major_engine_version = "14" # DB option group
135+
instance_class = "db.t3a.large"
136136

137137
allocated_storage = 20
138138

‎examples/cross-region-replica-postgres/main.tf

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ locals {
1717
}
1818

1919
engine = "postgres"
20-
engine_version = "11.10"
21-
family = "postgres11" # DB parameter group
22-
major_engine_version = "11" # DB option group
23-
instance_class = "db.t3.large"
20+
engine_version = "14.1"
21+
family = "postgres14" # DB parameter group
22+
major_engine_version = "14" # DB option group
23+
instance_class = "db.t3a.large"
2424
allocated_storage = 20
2525
max_allocated_storage = 100
2626
port = 5432
@@ -169,8 +169,9 @@ module "replica" {
169169
identifier = "${local.name}-replica"
170170

171171
# Source database. For cross-region use db_instance_arn
172-
replicate_source_db = module.master.db_instance_arn
173-
cross_region_replica = true
172+
replicate_source_db = module.master.db_instance_arn
173+
cross_region_replica = true
174+
create_random_password = false
174175

175176
engine = local.engine
176177
engine_version = local.engine_version

‎examples/enhanced-monitoring/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ module "db" {
9494

9595
# All available versions: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt
9696
engine = "mysql"
97-
engine_version = "8.0.20"
97+
engine_version = "8.0.27"
9898
family = "mysql8.0" # DB parameter group
9999
major_engine_version = "8.0" # DB option group
100-
instance_class = "db.t3.large"
100+
instance_class = "db.t3a.large"
101101

102102
allocated_storage = 20
103103
max_allocated_storage = 100

‎examples/groups/main.tf

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ module "default_postgres" {
2626
parameter_group_name = "${local.name}-default-postgresql"
2727
db_subnet_group_name = "foo"
2828

29-
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
3029
create_db_instance = false
3130
engine = "postgres"
32-
engine_version = "11.10"
33-
family = "postgres11" # DB parameter group
34-
major_engine_version = "11" # DB option group
35-
instance_class = "db.t3.large"
31+
engine_version = "14.1"
32+
family = "postgres14" # DB parameter group
33+
major_engine_version = "14" # DB option group
34+
instance_class = "db.t3a.large"
3635

3736
allocated_storage = 20
3837

@@ -58,13 +57,12 @@ module "default_mysql" {
5857
parameter_group_name = "${local.name}-default-mysql"
5958
db_subnet_group_name = "foo"
6059

61-
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
6260
create_db_instance = false
6361
engine = "mysql"
64-
engine_version = "8.0.20"
62+
engine_version = "8.0.27"
6563
family = "mysql8.0" # DB parameter group
6664
major_engine_version = "8.0" # DB option group
67-
instance_class = "db.t3.large"
65+
instance_class = "db.t3a.large"
6866

6967
allocated_storage = 20
7068

@@ -94,13 +92,12 @@ module "default_mysql_name" {
9492

9593
db_subnet_group_name = "foo"
9694

97-
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
9895
create_db_instance = false
9996
engine = "mysql"
100-
engine_version = "8.0.20"
97+
engine_version = "8.0.27"
10198
family = "mysql8.0" # DB parameter group
10299
major_engine_version = "8.0" # DB option group
103-
instance_class = "db.t3.large"
100+
instance_class = "db.t3a.large"
104101

105102
allocated_storage = 20
106103

@@ -127,13 +124,12 @@ module "default_mysql_default_aws" {
127124

128125
db_subnet_group_name = "foo"
129126

130-
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
131127
create_db_instance = false
132128
engine = "mysql"
133-
engine_version = "8.0.20"
129+
engine_version = "8.0.27"
134130
family = "mysql8.0" # DB parameter group
135131
major_engine_version = "8.0" # DB option group
136-
instance_class = "db.t3.large"
132+
instance_class = "db.t3a.large"
137133

138134
allocated_storage = 20
139135

@@ -163,13 +159,12 @@ module "byo_mysql" {
163159

164160
db_subnet_group_name = "foo"
165161

166-
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
167162
create_db_instance = false
168163
engine = "mysql"
169-
engine_version = "8.0.20"
164+
engine_version = "8.0.27"
170165
family = "mysql8.0" # DB parameter group
171166
major_engine_version = "8.0" # DB option group
172-
instance_class = "db.t3.large"
167+
instance_class = "db.t3a.large"
173168

174169
allocated_storage = 20
175170

‎examples/replica-mysql/main.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ locals {
1111
}
1212

1313
engine = "mysql"
14-
engine_version = "8.0.20"
14+
engine_version = "8.0.27"
1515
family = "mysql8.0" # DB parameter group
1616
major_engine_version = "8.0" # DB option group
17-
instance_class = "db.t3.large"
17+
instance_class = "db.t3a.large"
1818
allocated_storage = 20
1919
max_allocated_storage = 100
2020
port = 3306
@@ -112,7 +112,8 @@ module "replica" {
112112
identifier = "${local.name}-replica"
113113

114114
# Source database. For cross-region use db_instance_arn
115-
replicate_source_db = module.master.db_instance_id
115+
replicate_source_db = module.master.db_instance_id
116+
create_random_password = false
116117

117118
engine = local.engine
118119
engine_version = local.engine_version

‎examples/replica-postgres/main.tf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ locals {
1111
}
1212

1313
engine = "postgres"
14-
engine_version = "11.10"
15-
family = "postgres11" # DB parameter group
16-
major_engine_version = "11" # DB option group
17-
instance_class = "db.t3.large"
14+
engine_version = "14.1"
15+
family = "postgres14" # DB parameter group
16+
major_engine_version = "14" # DB option group
17+
instance_class = "db.t3a.large"
1818
allocated_storage = 20
1919
max_allocated_storage = 100
2020
port = 5432
@@ -113,7 +113,8 @@ module "replica" {
113113
identifier = "${local.name}-replica"
114114

115115
# Source database. For cross-region use db_instance_arn
116-
replicate_source_db = module.master.db_instance_id
116+
replicate_source_db = module.master.db_instance_id
117+
create_random_password = false
117118

118119
engine = local.engine
119120
engine_version = local.engine_version

‎examples/s3-import-mysql/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ module "db" {
168168

169169
# All available versions: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt
170170
engine = "mysql"
171-
engine_version = "8.0.20"
171+
engine_version = "8.0.27"
172172
family = "mysql8.0" # DB parameter group
173173
major_engine_version = "8.0" # DB option group
174-
instance_class = "db.t3.large"
174+
instance_class = "db.t3a.large"
175175

176176
allocated_storage = 20
177177
max_allocated_storage = 100
@@ -182,7 +182,7 @@ module "db" {
182182

183183
# S3 import https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/MySQL.Procedural.Importing.html
184184
s3_import = {
185-
source_engine_version = "8.0.20"
185+
source_engine_version = "8.0.27"
186186
bucket_name = aws_s3_bucket.import.id
187187
ingestion_role = aws_iam_role.s3_import.arn
188188
}

‎main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
locals {
2-
create_random_password = var.create_db_instance && var.create_random_password && !(var.snapshot_identifier != null || var.replicate_source_db != null)
2+
create_random_password = var.create_db_instance && var.create_random_password && var.snapshot_identifier != null
33
master_password = local.create_random_password ? random_password.master_password[0].result : var.password
44
db_subnet_group_name = !var.cross_region_replica && var.replicate_source_db != null ? null : try(module.db_subnet_group.db_subnet_group_id, var.db_subnet_group_name)
55

0 commit comments

Comments
 (0)