feat: Added support for Terraform 0.14 (#525)

antonbabenko · web-flow · commit 20dc2c87a5c4 · 2020-10-16T22:12:56.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 terraform.tfstate
 *.tfstate*
 terraform.tfvars
+
+.terraform.lock.hcl
diff --git a/.tflint.hcl b/.tflint.hcl
diff --git a/README.md b/README.md
@@ -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
 
diff --git a/examples/complete-vpc/README.md b/examples/complete-vpc/README.md
@@ -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
 
diff --git a/examples/complete-vpc/versions.tf b/examples/complete-vpc/versions.tf
@@ -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"
   }
 }
diff --git a/examples/ipv6/README.md b/examples/ipv6/README.md
@@ -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
 
diff --git a/examples/ipv6/versions.tf b/examples/ipv6/versions.tf
@@ -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"
   }
 }
diff --git a/examples/issue-108-route-already-exists/README.md b/examples/issue-108-route-already-exists/README.md
@@ -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
 
diff --git a/examples/issue-108-route-already-exists/versions.tf b/examples/issue-108-route-already-exists/versions.tf
@@ -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"
   }
 }
diff --git a/examples/issue-44-asymmetric-private-subnets/README.md b/examples/issue-44-asymmetric-private-subnets/README.md
@@ -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
 
diff --git a/examples/issue-44-asymmetric-private-subnets/versions.tf b/examples/issue-44-asymmetric-private-subnets/versions.tf
@@ -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"
   }
 }
diff --git a/examples/issue-46-no-private-subnets/README.md b/examples/issue-46-no-private-subnets/README.md
@@ -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
 
diff --git a/examples/issue-46-no-private-subnets/versions.tf b/examples/issue-46-no-private-subnets/versions.tf
@@ -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"
   }
 }
diff --git a/examples/manage-default-vpc/README.md b/examples/manage-default-vpc/README.md
@@ -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
 
diff --git a/examples/manage-default-vpc/versions.tf b/examples/manage-default-vpc/versions.tf
@@ -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"
   }
 }
diff --git a/examples/network-acls/README.md b/examples/network-acls/README.md
@@ -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
 
diff --git a/examples/network-acls/versions.tf b/examples/network-acls/versions.tf
@@ -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"
   }
 }
diff --git a/examples/secondary-cidr-blocks/README.md b/examples/secondary-cidr-blocks/README.md
@@ -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
 
diff --git a/examples/secondary-cidr-blocks/versions.tf b/examples/secondary-cidr-blocks/versions.tf
@@ -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"
   }
 }
diff --git a/examples/simple-vpc/README.md b/examples/simple-vpc/README.md
@@ -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
 
diff --git a/examples/simple-vpc/versions.tf b/examples/simple-vpc/versions.tf
@@ -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"
   }
 }
diff --git a/examples/vpc-flow-logs/README.md b/examples/vpc-flow-logs/README.md
@@ -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
diff --git a/examples/vpc-flow-logs/versions.tf b/examples/vpc-flow-logs/versions.tf
@@ -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"
   }
 }
diff --git a/examples/vpc-separate-private-route-tables/README.md b/examples/vpc-separate-private-route-tables/README.md
@@ -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
 
diff --git a/examples/vpc-separate-private-route-tables/versions.tf b/examples/vpc-separate-private-route-tables/versions.tf
@@ -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"
   }
 }
diff --git a/main.tf b/main.tf
@@ -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]
-  }
 }
 
 #################
diff --git a/versions.tf b/versions.tf
@@ -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"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = ">= 0.12.7, < 0.14"`
	`2`	`+ required_version = ">= 0.12.7"`
`3`	`3`
`4`	`4`	`required_providers {`
`5`		`- aws = ">= 2.68, < 4.0"`
	`5`	`+ aws = ">= 2.68"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = ">= 0.12.7, < 0.14"`
	`2`	`+ required_version = ">= 0.12.7"`
`3`	`3`
`4`	`4`	`required_providers {`
`5`		`- aws = ">= 2.68, < 4.0"`
	`5`	`+ aws = ">= 2.68"`
`6`	`6`	`random = ">= 2"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,12 +217,6 @@ resource "aws_route_table" "private" {`
`217`	`217`	`var.tags,`
`218`	`218`	`var.private_route_table_tags,`
`219`	`219`	`)`
`220`		`-`
`221`		`- lifecycle {`
`222`		`- # When attaching VPN gateways it is common to define aws_vpn_gateway_route_propagation`
`223`		`- # resources that manipulate the attributes of the routing table (typically for the private subnets)`
`224`		`- ignore_changes = [propagating_vgws]`
`225`		`- }`
`226`	`220`	`}`
`227`	`221`
`228`	`222`	`#################`