Skip to content

Commit beb86c7

Browse files
bryantbiggsbryantbiggs
authored
chore: Remove minor/patch versions from examples (#459)
Closes undefined
1 parent 91dc39c commit beb86c7

File tree

20 files changed

+133
-76
lines changed

20 files changed

+133
-76
lines changed

‎.github/workflows/pre-commit.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Pre-Commit
33
on:
44
pull_request:
55
branches:
6+
- main
67
- master
78

89
env:
@@ -20,7 +21,7 @@ jobs:
2021

2122
- name: Get root directories
2223
id: dirs
23-
uses: clowdhaus/terraform-composite-actions/[email protected].0
24+
uses: clowdhaus/terraform-composite-actions/[email protected].3
2425

2526
preCommitMinVersions:
2627
name: Min TF pre-commit
@@ -35,22 +36,22 @@ jobs:
3536

3637
- name: Terraform min/max versions
3738
id: minMax
38-
uses: clowdhaus/[email protected].1
39+
uses: clowdhaus/[email protected].4
3940
with:
4041
directory: ${{ matrix.directory }}
4142

4243
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4344
# Run only validate pre-commit check on min version supported
4445
if: ${{ matrix.directory != '.' }}
45-
uses: clowdhaus/terraform-composite-actions/[email protected].0
46+
uses: clowdhaus/terraform-composite-actions/[email protected].3
4647
with:
4748
terraform-version: ${{ steps.minMax.outputs.minVersion }}
4849
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
4950

5051
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5152
# Run only validate pre-commit check on min version supported
5253
if: ${{ matrix.directory == '.' }}
53-
uses: clowdhaus/terraform-composite-actions/[email protected].0
54+
uses: clowdhaus/terraform-composite-actions/[email protected].3
5455
with:
5556
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5657
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
@@ -68,10 +69,10 @@ jobs:
6869

6970
- name: Terraform min/max versions
7071
id: minMax
71-
uses: clowdhaus/[email protected].1
72+
uses: clowdhaus/[email protected].4
7273

7374
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
74-
uses: clowdhaus/terraform-composite-actions/[email protected].0
75+
uses: clowdhaus/terraform-composite-actions/[email protected].3
7576
with:
7677
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
7778
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module "db" {
2020
identifier = "demodb"
2121
2222
engine = "mysql"
23-
engine_version = "5.7.25"
23+
engine_version = "5.7"
2424
instance_class = "db.t3a.large"
2525
allocated_storage = 5
2626

‎examples/complete-mssql/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Note that this example may create resources which cost money. Run `terraform des
4545
| [aws_directory_service_directory.demo](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/directory_service_directory) | resource |
4646
| [aws_iam_role.rds_ad_auth](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
4747
| [aws_iam_role_policy_attachment.rds_directory_services](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
48+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
4849
| [aws_iam_policy_document.rds_assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
4950

5051
## Inputs

‎examples/complete-mssql/main.tf‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ provider "aws" {
22
region = local.region
33
}
44

5+
data "aws_availability_zones" "available" {}
6+
57
locals {
68
name = "complete-mssql"
79
region = "eu-west-1"
810
region2 = "eu-central-1"
911

12+
vpc_cidr = "10.0.0.0/16"
13+
azs = slice(data.aws_availability_zones.available.names, 0, 3)
14+
1015
tags = {
1116
Name = local.name
1217
Example = local.name
@@ -24,7 +29,7 @@ module "db" {
2429
identifier = local.name
2530

2631
engine = "sqlserver-ex"
27-
engine_version = "15.00.4153.1.v1"
32+
engine_version = "15.00"
2833
family = "sqlserver-ex-15.0" # DB parameter group
2934
major_engine_version = "15.00" # DB option group
3035
instance_class = "db.t3.large"
@@ -42,7 +47,7 @@ module "db" {
4247
domain_iam_role_name = aws_iam_role.rds_ad_auth.name
4348

4449
multi_az = false
45-
subnet_ids = module.vpc.database_subnets
50+
db_subnet_group_name = module.vpc.database_subnet_group
4651
vpc_security_group_ids = [module.security_group.security_group_id]
4752

4853
maintenance_window = "Mon:00:00-Mon:03:00"
@@ -81,6 +86,7 @@ module "db_disabled" {
8186
################################################################################
8287
# RDS Automated Backups Replication Module
8388
################################################################################
89+
8490
provider "aws" {
8591
alias = "region2"
8692
region = local.region2
@@ -157,12 +163,12 @@ module "vpc" {
157163
version = "~> 3.0"
158164

159165
name = local.name
160-
cidr = "10.99.0.0/18"
166+
cidr = local.vpc_cidr
161167

162-
azs = ["${local.region}a", "${local.region}b", "${local.region}c"]
163-
public_subnets = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
164-
private_subnets = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
165-
database_subnets = ["10.99.7.0/24", "10.99.8.0/24", "10.99.9.0/24"]
168+
azs = local.azs
169+
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
170+
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 3)]
171+
database_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 6)]
166172

167173
create_database_subnet_group = true
168174

‎examples/complete-mysql/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Note that this example may create resources which cost money. Run `terraform des
2424

2525
## Providers
2626

27-
No providers.
27+
| Name | Version |
28+
|------|---------|
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
2830

2931
## Modules
3032

@@ -38,7 +40,9 @@ No providers.
3840

3941
## Resources
4042

41-
No resources.
43+
| Name | Type |
44+
|------|------|
45+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
4246

4347
## Inputs
4448

‎examples/complete-mysql/main.tf‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ provider "aws" {
22
region = local.region
33
}
44

5+
data "aws_availability_zones" "available" {}
6+
57
locals {
68
name = "complete-mysql"
79
region = "eu-west-1"
810

11+
vpc_cidr = "10.0.0.0/16"
12+
azs = slice(data.aws_availability_zones.available.names, 0, 3)
13+
914
tags = {
1015
Name = local.name
1116
Example = local.name
@@ -24,7 +29,7 @@ module "db" {
2429

2530
# All available versions: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt
2631
engine = "mysql"
27-
engine_version = "8.0.27"
32+
engine_version = "8.0"
2833
family = "mysql8.0" # DB parameter group
2934
major_engine_version = "8.0" # DB option group
3035
instance_class = "db.t4g.large"
@@ -37,7 +42,7 @@ module "db" {
3742
port = 3306
3843

3944
multi_az = true
40-
subnet_ids = module.vpc.database_subnets
45+
db_subnet_group_name = module.vpc.database_subnet_group
4146
vpc_security_group_ids = [module.security_group.security_group_id]
4247

4348
maintenance_window = "Mon:00:00-Mon:03:00"
@@ -90,7 +95,7 @@ module "db_default" {
9095

9196
# All available versions: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt
9297
engine = "mysql"
93-
engine_version = "8.0.27"
98+
engine_version = "8.0"
9499
family = "mysql8.0" # DB parameter group
95100
major_engine_version = "8.0" # DB option group
96101
instance_class = "db.t4g.large"
@@ -101,7 +106,7 @@ module "db_default" {
101106
username = "complete_mysql"
102107
port = 3306
103108

104-
subnet_ids = module.vpc.database_subnets
109+
db_subnet_group_name = module.vpc.database_subnet_group
105110
vpc_security_group_ids = [module.security_group.security_group_id]
106111

107112
maintenance_window = "Mon:00:00-Mon:03:00"
@@ -131,12 +136,12 @@ module "vpc" {
131136
version = "~> 3.0"
132137

133138
name = local.name
134-
cidr = "10.99.0.0/18"
139+
cidr = local.vpc_cidr
135140

136-
azs = ["${local.region}a", "${local.region}b", "${local.region}c"]
137-
public_subnets = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
138-
private_subnets = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
139-
database_subnets = ["10.99.7.0/24", "10.99.8.0/24", "10.99.9.0/24"]
141+
azs = local.azs
142+
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
143+
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 3)]
144+
database_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 6)]
140145

141146
create_database_subnet_group = true
142147

‎examples/complete-oracle/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Note that this example may create resources which cost money. Run `terraform des
4343

4444
| Name | Type |
4545
|------|------|
46+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
4647
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
4748

4849
## Inputs

‎examples/complete-oracle/main.tf‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ provider "aws" {
88
}
99

1010
data "aws_caller_identity" "current" {}
11+
data "aws_availability_zones" "available" {}
1112

1213
locals {
1314
name = "complete-oracle"
1415
region = "eu-west-1"
1516
region2 = "eu-central-1"
1617

18+
vpc_cidr = "10.0.0.0/16"
19+
azs = slice(data.aws_availability_zones.available.names, 0, 3)
20+
1721
tags = {
1822
Name = local.name
1923
Example = local.name
@@ -31,7 +35,7 @@ module "db" {
3135
identifier = "demodb-oracle"
3236

3337
engine = "oracle-ee"
34-
engine_version = "19.0.0.0.ru-2021-10.rur-2021-10.r1"
38+
engine_version = "19"
3539
family = "oracle-ee-19" # DB parameter group
3640
major_engine_version = "19" # DB option group
3741
instance_class = "db.t3.large"
@@ -47,7 +51,7 @@ module "db" {
4751
port = 1521
4852

4953
multi_az = true
50-
subnet_ids = module.vpc.database_subnets
54+
db_subnet_group_name = module.vpc.database_subnet_group
5155
vpc_security_group_ids = [module.security_group.security_group_id]
5256

5357
maintenance_window = "Mon:00:00-Mon:03:00"
@@ -121,12 +125,12 @@ module "vpc" {
121125
version = "~> 3.0"
122126

123127
name = local.name
124-
cidr = "10.99.0.0/18"
128+
cidr = local.vpc_cidr
125129

126-
azs = ["${local.region}a", "${local.region}b", "${local.region}c"]
127-
public_subnets = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
128-
private_subnets = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
129-
database_subnets = ["10.99.7.0/24", "10.99.8.0/24", "10.99.9.0/24"]
130+
azs = local.azs
131+
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
132+
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 3)]
133+
database_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 6)]
130134

131135
create_database_subnet_group = true
132136

‎examples/complete-postgres/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Note that this example may create resources which cost money. Run `terraform des
4444

4545
| Name | Type |
4646
|------|------|
47+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
4748
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
4849

4950
## Inputs

‎examples/complete-postgres/main.tf‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ provider "aws" {
33
}
44

55
data "aws_caller_identity" "current" {}
6+
data "aws_availability_zones" "available" {}
67

78
locals {
89
name = "complete-postgresql"
910
region = "eu-west-1"
1011
region2 = "eu-central-1"
1112

13+
vpc_cidr = "10.0.0.0/16"
14+
azs = slice(data.aws_availability_zones.available.names, 0, 3)
15+
1216
tags = {
1317
Name = local.name
1418
Example = local.name
@@ -27,7 +31,7 @@ module "db" {
2731

2832
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
2933
engine = "postgres"
30-
engine_version = "14.1"
34+
engine_version = "14"
3135
family = "postgres14" # DB parameter group
3236
major_engine_version = "14" # DB option group
3337
instance_class = "db.t4g.large"
@@ -94,7 +98,7 @@ module "db_default" {
9498

9599
# All available versions: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_PostgreSQL.html#PostgreSQL.Concepts
96100
engine = "postgres"
97-
engine_version = "14.1"
101+
engine_version = "14"
98102
family = "postgres14" # DB parameter group
99103
major_engine_version = "14" # DB option group
100104
instance_class = "db.t4g.large"
@@ -131,6 +135,7 @@ module "db_disabled" {
131135
################################################################################
132136
# RDS Automated Backups Replication Module
133137
################################################################################
138+
134139
provider "aws" {
135140
alias = "region2"
136141
region = local.region2
@@ -174,15 +179,14 @@ module "vpc" {
174179
version = "~> 3.0"
175180

176181
name = local.name
177-
cidr = "10.99.0.0/18"
182+
cidr = local.vpc_cidr
178183

179-
azs = ["${local.region}a", "${local.region}b", "${local.region}c"]
180-
public_subnets = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
181-
private_subnets = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
182-
database_subnets = ["10.99.7.0/24", "10.99.8.0/24", "10.99.9.0/24"]
184+
azs = local.azs
185+
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
186+
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 3)]
187+
database_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 6)]
183188

184-
create_database_subnet_group = true
185-
create_database_subnet_route_table = true
189+
create_database_subnet_group = true
186190

187191
tags = local.tags
188192
}

0 commit comments

Comments
 (0)