Skip to content

Commit 5fbcb24

Browse files
committed
Merge branch 'master' of github.com:clowdhaus/terraform-aws-vpc into feature/managed-default-security-group
2 parents 99e8d19 + 2ec2697 commit 5fbcb24

File tree

13 files changed

+1169
-28
lines changed

13 files changed

+1169
-28
lines changed

.pre-commit-config.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
repos:
2-
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.27.0
4-
hooks:
5-
- id: terraform_fmt
6-
- id: terraform_docs
7-
- repo: git://github.com/pre-commit/pre-commit-hooks
8-
rev: v2.5.0
9-
hooks:
10-
- id: check-merge-conflict
2+
- repo: git://github.com/antonbabenko/pre-commit-terraform
3+
rev: v1.31.0
4+
hooks:
5+
- id: terraform_fmt
6+
- id: terraform_docs
7+
- repo: git://github.com/pre-commit/pre-commit-hooks
8+
rev: v3.1.0
9+
hooks:
10+
- id: check-merge-conflict

CHANGELOG.md

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,61 @@ All notable changes to this project will be documented in this file.
77

88

99

10+
<a name="v2.41.0"></a>
11+
## [v2.41.0] - 2020-06-20
12+
13+
- fix: Output list of external_nat_ips when using external eips ([#432](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/432))
14+
15+
16+
<a name="v2.40.0"></a>
17+
## [v2.40.0] - 2020-06-20
18+
19+
- Updated pre-commit hooks
20+
- feat: Add support for VPC flow log max_aggregation_interval ([#431](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/431))
21+
- feat: Add support for tagging egress only internet gateway ([#430](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/430))
22+
23+
24+
<a name="v2.39.0"></a>
25+
## [v2.39.0] - 2020-06-06
26+
27+
- feat: Enable support for Terraform 0.13 as a valid version by setting minimum version required ([#455](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/455))
28+
29+
30+
<a name="v2.38.0"></a>
31+
## [v2.38.0] - 2020-05-25
32+
33+
- feat: add vpc_owner_id to outputs ([#428](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/428))
34+
- docs: Fixed README
35+
- Merge branch 'master' into master
36+
- Updated description of vpc_owner_id
37+
- added owner_id output ([#1](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1))
38+
39+
40+
<a name="v2.37.0"></a>
41+
## [v2.37.0] - 2020-05-25
42+
43+
- fix: Fix wrong ACM PCA output ([#450](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/450))
44+
45+
46+
<a name="v2.36.0"></a>
47+
## [v2.36.0] - 2020-05-25
48+
49+
- feat: Added support for more VPC endpoints ([#369](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/369))
50+
51+
52+
<a name="v2.35.0"></a>
53+
## [v2.35.0] - 2020-05-25
54+
55+
- feat: Add VPC Endpoint for SES ([#449](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/449))
56+
57+
58+
<a name="v2.34.0"></a>
59+
## [v2.34.0] - 2020-05-25
60+
61+
- feat: Add routes table association and route attachment outputs ([#398](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/398))
62+
- fix: Updated outputs in ipv6 example ([#375](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/375))
63+
64+
1065
<a name="v2.33.0"></a>
1166
## [v2.33.0] - 2020-04-02
1267

@@ -863,7 +918,15 @@ All notable changes to this project will be documented in this file.
863918
- Initial commit
864919

865920

866-
[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.33.0...HEAD
921+
[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.41.0...HEAD
922+
[v2.41.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.40.0...v2.41.0
923+
[v2.40.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.39.0...v2.40.0
924+
[v2.39.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.38.0...v2.39.0
925+
[v2.38.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.37.0...v2.38.0
926+
[v2.37.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.36.0...v2.37.0
927+
[v2.36.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.35.0...v2.36.0
928+
[v2.35.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.34.0...v2.35.0
929+
[v2.34.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.33.0...v2.34.0
867930
[v2.33.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.32.0...v2.33.0
868931
[v2.32.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.31.0...v2.32.0
869932
[v2.31.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.30.0...v2.31.0

README.md

Lines changed: 122 additions & 5 deletions
Large diffs are not rendered by default.

examples/complete-vpc/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ module "vpc" {
115115
enable_flow_log = true
116116
create_flow_log_cloudwatch_log_group = true
117117
create_flow_log_cloudwatch_iam_role = true
118+
flow_log_max_aggregation_interval = 60
118119

119120
tags = {
120121
Owner = "user"

examples/ipv6/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ No input.
3333

3434
| Name | Description |
3535
|------|-------------|
36-
| ipv6\_association\_id | The IPv6 CIDR block |
37-
| ipv6\_cidr\_block | The association ID for the IPv6 CIDR block |
36+
| ipv6\_association\_id | The association ID for the IPv6 CIDR block |
37+
| ipv6\_cidr\_block | The IPv6 CIDR block |
3838
| vpc\_id | The ID of the VPC |
3939

4040
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/ipv6/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ output "vpc_id" {
44
value = module.vpc.vpc_id
55
}
66

7-
output "ipv6_association_id" {
7+
output "ipv6_cidr_block" {
88
description = "The IPv6 CIDR block"
99
value = module.vpc.vpc_ipv6_cidr_block
1010
}
1111

12-
output "ipv6_cidr_block" {
12+
output "ipv6_association_id" {
1313
description = "The association ID for the IPv6 CIDR block"
1414
value = module.vpc.vpc_ipv6_association_id
1515
}

examples/vpc-flow-logs/cloud-watch-logs.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module "vpc_with_flow_logs_cloudwatch_logs_default" {
1515
enable_flow_log = true
1616
create_flow_log_cloudwatch_log_group = true
1717
create_flow_log_cloudwatch_iam_role = true
18+
flow_log_max_aggregation_interval = 60
1819

1920
vpc_flow_log_tags = {
2021
Name = "vpc-flow-logs-cloudwatch-logs-default"

main.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,14 @@ resource "aws_egress_only_internet_gateway" "this" {
148148
count = var.create_vpc && var.enable_ipv6 && local.max_subnet_length > 0 ? 1 : 0
149149

150150
vpc_id = local.vpc_id
151+
152+
tags = merge(
153+
{
154+
"Name" = format("%s", var.name)
155+
},
156+
var.tags,
157+
var.igw_tags,
158+
)
151159
}
152160

153161
################

0 commit comments

Comments
 (0)