Skip to content

Commit

Permalink
feat: Added support for Terraform 0.14 (#525)
Browse files Browse the repository at this point in the history
  • Loading branch information
antonbabenko authored Oct 16, 2020
1 parent f1e4541 commit 20dc2c8
Show file tree
Hide file tree
Showing 27 changed files with 54 additions and 115 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
terraform.tfstate
*.tfstate*
terraform.tfvars

.terraform.lock.hcl
57 changes: 0 additions & 57 deletions .tflint.hcl

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,14 @@ It is possible to integrate this VPC module with [terraform-aws-transit-gateway

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

| Name | Version |
|------|---------|
| aws | >= 2.68, < 4.0 |
| aws | >= 2.68 |

## Inputs

Expand Down
6 changes: 3 additions & 3 deletions examples/complete-vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

| Name | Version |
|------|---------|
| aws | >= 2.68, < 4.0 |
| aws | >= 2.68 |

## Inputs

Expand Down
4 changes: 2 additions & 2 deletions examples/complete-vpc/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
6 changes: 3 additions & 3 deletions examples/ipv6/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

| Name | Version |
|------|---------|
| aws | >= 2.68, < 4.0 |
| aws | >= 2.68 |

## Inputs

Expand Down
4 changes: 2 additions & 2 deletions examples/ipv6/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/issue-108-route-already-exists/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/issue-108-route-already-exists/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/issue-44-asymmetric-private-subnets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/issue-44-asymmetric-private-subnets/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/issue-46-no-private-subnets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/issue-46-no-private-subnets/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/manage-default-vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Run `terraform destroy` when you don't need these resources.

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/manage-default-vpc/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/network-acls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/network-acls/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/secondary-cidr-blocks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/secondary-cidr-blocks/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
4 changes: 2 additions & 2 deletions examples/simple-vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/simple-vpc/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
6 changes: 3 additions & 3 deletions examples/vpc-flow-logs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |
| random | >= 2 |

## Providers

| Name | Version |
|------|---------|
| aws | >= 2.68, < 4.0 |
| aws | >= 2.68 |
| random | >= 2 |

## Inputs
Expand Down
4 changes: 2 additions & 2 deletions examples/vpc-flow-logs/versions.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
random = ">= 2"
}
}
4 changes: 2 additions & 2 deletions examples/vpc-separate-private-route-tables/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.12.7 |
| aws | >= 2.68 |

## Providers

Expand Down
4 changes: 2 additions & 2 deletions examples/vpc-separate-private-route-tables/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}
6 changes: 0 additions & 6 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,6 @@ resource "aws_route_table" "private" {
var.tags,
var.private_route_table_tags,
)

lifecycle {
# When attaching VPN gateways it is common to define aws_vpn_gateway_route_propagation
# resources that manipulate the attributes of the routing table (typically for the private subnets)
ignore_changes = [propagating_vgws]
}
}

#################
Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.12.7, < 0.14"
required_version = ">= 0.12.7"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 2.68"
}
}

0 comments on commit 20dc2c8

Please sign in to comment.