Skip to content

Commit 6cb5a6a

Browse files
antonbabenkoantonbabenko
authored
Upgraded module to support Terraform 0.12 (terraform-aws-modules#45)
1 parent 53d5f26 commit 6cb5a6a

15 files changed

+615
-245
lines changed

‎.chglog/CHANGELOG.tpl.md

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{{ if .Versions -}}
2+
<a name="unreleased"></a>
3+
## [Unreleased]
4+
{{ if .Unreleased.CommitGroups -}}
5+
{{ range .Unreleased.CommitGroups -}}
6+
### {{ .Title }}
7+
{{ range .Commits -}}
8+
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
9+
{{ end }}
10+
{{ end -}}
11+
{{ else }}
12+
{{ range .Unreleased.Commits -}}
13+
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
14+
{{ end }}
15+
{{ end -}}
16+
{{ end -}}
17+
18+
{{ range .Versions }}
19+
<a name="{{ .Tag.Name }}"></a>
20+
## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
21+
{{ if .CommitGroups -}}
22+
{{ range .CommitGroups -}}
23+
### {{ .Title }}
24+
{{ range .Commits -}}
25+
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
26+
{{ end }}
27+
{{ end -}}
28+
{{ else }}
29+
{{ range .Commits -}}
30+
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
31+
{{ end }}
32+
{{ end -}}
33+
34+
{{- if .NoteGroups -}}
35+
{{ range .NoteGroups -}}
36+
### {{ .Title }}
37+
{{ range .Notes }}
38+
{{ .Body }}
39+
{{ end }}
40+
{{ end -}}
41+
{{ end -}}
42+
{{ end -}}
43+
44+
{{- if .Versions }}
45+
[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
46+
{{ range .Versions -}}
47+
{{ if .Tag.Previous -}}
48+
[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
49+
{{ end -}}
50+
{{ end -}}
51+
{{ end -}}

‎.chglog/config.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
style: github
2+
template: CHANGELOG.tpl.md
3+
info:
4+
title: CHANGELOG
5+
repository_url: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora
6+
options:
7+
header:
8+
pattern: "^(.*)$"
9+
pattern_maps:
10+
- Subject

‎.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
repos:
22
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.8.1
3+
rev: v1.12.0
44
hooks:
55
- id: terraform_fmt
6-
- id: terraform_docs
6+
# - id: terraform_docs
77
- repo: git://github.com/pre-commit/pre-commit-hooks
8-
rev: v2.1.0
8+
rev: v2.2.3
99
hooks:
1010
- id: check-merge-conflict

‎CHANGELOG.md

+146
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
<a name="unreleased"></a>
2+
## [Unreleased]
3+
4+
5+
6+
<a name="v2.0.0"></a>
7+
## [v2.0.0] - 2019-05-28
8+
9+
- upgrade to 0.12
10+
11+
12+
<a name="v1.13.0"></a>
13+
## [v1.13.0] - 2019-04-25
14+
15+
- Fixed formatting
16+
- Remove unused variable identifier_prefix ([#36](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/36))
17+
- Correct description of replica_scale_min variable ([#37](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/37))
18+
19+
20+
<a name="v1.12.0"></a>
21+
## [v1.12.0] - 2019-03-22
22+
23+
- Fix formatting
24+
- Feature/rds cluster resource id output ([#31](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/31))
25+
26+
27+
<a name="v1.11.0"></a>
28+
## [v1.11.0] - 2019-03-22
29+
30+
- Fix formatting and string variables
31+
- add engine_mode and global_cluster_identifier ([#32](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/32))
32+
33+
34+
<a name="v1.10.0"></a>
35+
## [v1.10.0] - 2019-02-28
36+
37+
- Fixed readme
38+
- add enabled_cloudwatch_logs_exports ([#29](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/29))
39+
40+
41+
<a name="v1.9.0"></a>
42+
## [v1.9.0] - 2019-02-16
43+
44+
- Merge pull request [#25](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/25) from Blokje5/add-support-for-database-iam-authentication
45+
- Remove validation
46+
- Add support for IAM Database authentication
47+
48+
49+
<a name="v1.8.0"></a>
50+
## [v1.8.0] - 2019-01-31
51+
52+
- Updated example with correct allowed_security_groups_count
53+
- Run pre-commit hooks
54+
- Merge pull request [#23](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/23) from dekimsey/fix-default-ingress-count-error
55+
- Hardcode number of allowed_security_groups
56+
57+
58+
<a name="v1.7.0"></a>
59+
## [v1.7.0] - 2019-01-30
60+
61+
- Merge pull request [#21](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/21) from max-rocket-internet/remove_maintainer
62+
- Removing myself from README
63+
64+
65+
<a name="v1.6.0"></a>
66+
## [v1.6.0] - 2019-01-30
67+
68+
- Merge pull request [#22](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/22) from terraform-aws-modules/pr/13
69+
- Merge remote-tracking branch 'origin/master' into pr-13
70+
- Added output for database_name
71+
- add support for database_name argument
72+
73+
74+
<a name="v1.5.0"></a>
75+
## [v1.5.0] - 2019-01-30
76+
77+
- Merge pull request [#15](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/15) from christiangjengedal/support_deletion_protection
78+
- Merge branch 'master' into support_deletion_protection
79+
- Added argument deletion_protection
80+
81+
82+
<a name="v1.4.0"></a>
83+
## [v1.4.0] - 2019-01-30
84+
85+
- Merge pull request [#20](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/20) from terraform-aws-modules/removed_azs
86+
- Removed availability_zones var (closes [#10](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/10))
87+
88+
89+
<a name="v1.3.0"></a>
90+
## [v1.3.0] - 2019-01-30
91+
92+
- Run pre-commit hooks
93+
- Merge pull request [#16](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/16) from terraform-aws-modules/fix_az
94+
- Merge branch 'master' into fix_az
95+
- Fixed variable for az
96+
97+
98+
<a name="v1.1.0"></a>
99+
## [v1.1.0] - 2019-01-30
100+
101+
- Run pre-commit hooks
102+
- Merge pull request [#17](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/17) from christiangjengedal/mod_securitygroup
103+
- 3 adjustments: - Avoid description attr on aws_security_group to avoid forcing new instance on changes - Use name-prefix to ensure unique names - Avoid unnecessary name-prefixes
104+
105+
106+
<a name="v1.0.0"></a>
107+
## [v1.0.0] - 2018-12-11
108+
109+
- Updated pre-commit hooks version
110+
- Merge pull request [#4](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/4) from FutureSharks/example_fix
111+
- Merge pull request [#3](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/3) from terraform-aws-modules/post_initial_commit
112+
- Fix for: 'count' cannot be computed
113+
- Added few files
114+
- Made small changes to be closer to other terraform-aws-modules
115+
- Merge pull request [#1](https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/issues/1) from FutureSharks/initial_commit
116+
- adding pre commit hooks config
117+
- updating readme, docs, main.tf etc
118+
- adding port output
119+
- adding 3 examples
120+
- Removing route53 record and all monitoring as requested
121+
- many fixes and changes
122+
- Initial commit
123+
124+
125+
<a name="v0.0.1"></a>
126+
## v0.0.1 - 2017-09-26
127+
128+
- Initial commit
129+
- Initial commit
130+
131+
132+
[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v2.0.0...HEAD
133+
[v2.0.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.13.0...v2.0.0
134+
[v1.13.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.12.0...v1.13.0
135+
[v1.12.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.11.0...v1.12.0
136+
[v1.11.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.10.0...v1.11.0
137+
[v1.10.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.9.0...v1.10.0
138+
[v1.9.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.8.0...v1.9.0
139+
[v1.8.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.7.0...v1.8.0
140+
[v1.7.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.6.0...v1.7.0
141+
[v1.6.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.5.0...v1.6.0
142+
[v1.5.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.4.0...v1.5.0
143+
[v1.4.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.3.0...v1.4.0
144+
[v1.3.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.1.0...v1.3.0
145+
[v1.1.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v1.0.0...v1.1.0
146+
[v1.0.0]: https://github.com/terraform-aws-modules/terraform-aws-rds-aurora/compare/v0.0.1...v1.0.0

‎Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.PHONY: changelog release
2+
3+
changelog:
4+
git-chglog -o CHANGELOG.md --next-tag `semtag final -s minor -o`
5+
6+
release:
7+
semtag final -s minor

‎README.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ These types of resources are supported:
1010
* [Application AutoScaling Policy](https://www.terraform.io/docs/providers/aws/r/appautoscaling_policy.html)
1111
* [Application AutoScaling Target](https://www.terraform.io/docs/providers/aws/r/appautoscaling_target.html)
1212

13+
## Terraform versions
14+
15+
Terraform 0.12. Pin module version to `~> v2.0`. Submit pull-requests to `master` branch.
16+
17+
Terraform 0.11. Pin module version to `~> v1.0`. Submit pull-requests to `terraform011` branch.
18+
1319
## Available features
1420

1521
- Autoscaling of read-replicas (based on CPU utilization)
@@ -19,12 +25,13 @@ These types of resources are supported:
1925

2026
```hcl
2127
module "db" {
22-
source = "terraform-aws-modules/rds-aurora/aws"
28+
source = "terraform-aws-modules/rds-aurora/aws"
29+
version = "~> 2.0"
2330
2431
name = "test-aurora-db-postgres96"
2532
2633
engine = "aurora-postgresql"
27-
engine_version = "9.6.3"
34+
engine_version = "9.6.9"
2835
2936
vpc_id = "vpc-12345678"
3037
subnets = ["subnet-12345678", "subnet-87654321"]

‎examples/advanced/main.tf

+31-48
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,27 @@ provider "aws" {
22
region = "us-east-1"
33
}
44

5-
variable "azs" {
6-
type = "list"
5+
######################################
6+
# Data sources to get VPC and subnets
7+
######################################
8+
data "aws_vpc" "default" {
9+
default = true
10+
}
711

8-
default = [
9-
"us-east-1a",
10-
"us-east-1b",
11-
"us-east-1c",
12-
]
12+
data "aws_subnet_ids" "all" {
13+
vpc_id = data.aws_vpc.default.id
1314
}
1415

16+
#############
17+
# RDS Aurora
18+
#############
1519
module "aurora" {
1620
source = "../../"
1721
name = "aurora-example"
1822
engine = "aurora-postgresql"
19-
engine_version = "9.6.3"
20-
subnets = ["${module.vpc.database_subnets}"]
21-
vpc_id = "${module.vpc.vpc_id}"
23+
engine_version = "10.4"
24+
subnets = data.aws_subnet_ids.all.ids
25+
vpc_id = data.aws_vpc.default.id
2226
replica_count = 1
2327
replica_scale_enabled = true
2428
replica_scale_min = 1
@@ -27,59 +31,38 @@ module "aurora" {
2731
instance_type = "db.r4.large"
2832
apply_immediately = true
2933
skip_final_snapshot = true
30-
db_parameter_group_name = "${aws_db_parameter_group.aurora_db_postgres96_parameter_group.id}"
31-
db_cluster_parameter_group_name = "${aws_rds_cluster_parameter_group.aurora_cluster_postgres96_parameter_group.id}"
32-
enabled_cloudwatch_logs_exports = ["audit", "error", "general", "slowquery"]
34+
db_parameter_group_name = aws_db_parameter_group.aurora_db_postgres96_parameter_group.id
35+
db_cluster_parameter_group_name = aws_rds_cluster_parameter_group.aurora_cluster_postgres96_parameter_group.id
36+
// enabled_cloudwatch_logs_exports = ["audit", "error", "general", "slowquery"]
3337
}
3438

3539
resource "aws_db_parameter_group" "aurora_db_postgres96_parameter_group" {
36-
name = "test-aurora-db-postgres96-parameter-group"
37-
family = "aurora-postgresql9.6"
38-
description = "test-aurora-db-postgres96-parameter-group"
40+
name = "test-aurora-db-postgres10-parameter-group"
41+
family = "aurora-postgresql10"
42+
description = "test-aurora-db-postgres10-parameter-group"
3943
}
4044

4145
resource "aws_rds_cluster_parameter_group" "aurora_cluster_postgres96_parameter_group" {
42-
name = "test-aurora-postgres96-cluster-parameter-group"
43-
family = "aurora-postgresql9.6"
44-
description = "test-aurora-postgres96-cluster-parameter-group"
46+
name = "test-aurora-postgres10-cluster-parameter-group"
47+
family = "aurora-postgresql10"
48+
description = "test-aurora-postgres10-cluster-parameter-group"
4549
}
4650

51+
############################
52+
# Example of security group
53+
############################
4754
resource "aws_security_group" "app_servers" {
4855
name = "app-servers"
4956
description = "For application servers"
50-
vpc_id = "${module.vpc.vpc_id}"
57+
vpc_id = data.aws_vpc.default.id
5158
}
5259

5360
resource "aws_security_group_rule" "allow_access" {
5461
type = "ingress"
55-
from_port = "${module.aurora.this_rds_cluster_port}"
56-
to_port = "${module.aurora.this_rds_cluster_port}"
62+
from_port = module.aurora.this_rds_cluster_port
63+
to_port = module.aurora.this_rds_cluster_port
5764
protocol = "tcp"
58-
source_security_group_id = "${aws_security_group.app_servers.id}"
59-
security_group_id = "${module.aurora.this_security_group_id}"
65+
source_security_group_id = aws_security_group.app_servers.id
66+
security_group_id = module.aurora.this_security_group_id
6067
}
6168

62-
module "vpc" {
63-
source = "terraform-aws-modules/vpc/aws"
64-
name = "example"
65-
cidr = "10.0.0.0/16"
66-
azs = ["${var.azs}"]
67-
68-
private_subnets = [
69-
"10.0.1.0/24",
70-
"10.0.2.0/24",
71-
"10.0.3.0/25",
72-
]
73-
74-
public_subnets = [
75-
"10.0.4.0/24",
76-
"10.0.5.0/24",
77-
"10.0.6.0/25",
78-
]
79-
80-
database_subnets = [
81-
"10.0.7.0/24",
82-
"10.0.8.0/24",
83-
"10.0.9.0/25",
84-
]
85-
}

0 commit comments

Comments
 (0)