Merge branch 'master' into bugfix/firewall-allow-internal

aaron-lane · web-flow · commit b93c3223f82d · 2019-12-11T15:42:54.000-05:00
diff --git a/README.md b/README.md
@@ -155,8 +155,10 @@ The routes list contains maps, where each object represents a route. For the nex
 
 ## Requirements
 ### Installed Software
-- [Terraform](https://www.terraform.io/downloads.html) ~> 0.12.0
-- [Terraform Provider for GCP][terraform-provider-google] ~> 2.19.0
+- [Terraform](https://www.terraform.io/downloads.html) ~> 0.12.6
+- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) ~> 2.19
+- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) ~>
+  2.19
 - [gcloud](https://cloud.google.com/sdk/gcloud/) >243.0.0
 
 ### Configure a Service Account
diff --git a/examples/delete_default_gateway_routes/versions.tf b/examples/delete_default_gateway_routes/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/multi_vpc/versions.tf b/examples/multi_vpc/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/secondary_ranges/versions.tf b/examples/secondary_ranges/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/simple_project/versions.tf b/examples/simple_project/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/simple_project_with_regional_network/versions.tf b/examples/simple_project_with_regional_network/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/submodule_firewall/versions.tf b/examples/submodule_firewall/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/submodule_network_peering/main.tf b/examples/submodule_network_peering/main.tf
@@ -14,6 +14,18 @@
  * limitations under the License.
  */
 
+provider "google" {
+  version = "~> 2.19.0"
+}
+
+provider "google-beta" {
+  version = "~> 2.19.0"
+}
+
+provider "null" {
+  version = "~> 2.1"
+}
+
 module "local-network" {
   source       = "../../"
   project_id   = var.project_id
diff --git a/examples/submodule_network_peering/versions.tf b/examples/submodule_network_peering/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/submodule_svpc_access/main.tf b/examples/submodule_svpc_access/main.tf
@@ -14,6 +14,14 @@
  * limitations under the License.
  */
 
+provider "google" {
+  version = "~> 2.19.0"
+}
+
+provider "null" {
+  version = "~> 2.1"
+}
+
 locals {
   net_data_users = compact(concat(
     var.service_project_owners,
diff --git a/examples/submodule_svpc_access/versions.tf b/examples/submodule_svpc_access/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
 }
diff --git a/modules/fabric-net-firewall/versions.tf b/modules/fabric-net-firewall/versions.tf
@@ -15,8 +15,8 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
   required_providers {
-    google = "~> 2.19.0"
+    google = "~> 2.19"
   }
 }
diff --git a/modules/fabric-net-svpc-access/versions.tf b/modules/fabric-net-svpc-access/versions.tf
@@ -15,8 +15,8 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
   required_providers {
-    google = "~> 2.19.0"
+    google = "~> 2.19"
   }
 }
diff --git a/modules/network-peering/providers.tf b/modules/network-peering/providers.tf
diff --git a/modules/network-peering/versions.tf b/modules/network-peering/versions.tf
@@ -15,5 +15,8 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
+  required_providers {
+    google-beta = "~> 2.19"
+  }
 }
diff --git a/modules/routes/versions.tf b/modules/routes/versions.tf
@@ -15,8 +15,8 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
   required_providers {
-    google = "~> 2.19.0"
+    google = "~> 2.19"
   }
 }
diff --git a/modules/subnets/versions.tf b/modules/subnets/versions.tf
@@ -15,8 +15,8 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
   required_providers {
-    google = "~> 2.19.0"
+    google = "~> 2.19"
   }
 }
diff --git a/modules/vpc/versions.tf b/modules/vpc/versions.tf
@@ -15,8 +15,8 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
   required_providers {
-    google = "~> 2.19.0"
+    google = "~> 2.19"
   }
 }
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,13 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
 
 provider "google" {
-  version = "~> 2.18.0"
+  version = "~> 2.12.0"
 }
 
 provider "google-beta" {
-  version = "~> 2.18.0"
+  version = "~> 2.12.0"
 }
diff --git a/versions.tf b/versions.tf
@@ -15,8 +15,8 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.12.6"
   required_providers {
-    google = "~> 2.19.0"
+    google = "~> 2.19"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`terraform {`
`18`		`- required_version = "~> 0.12.0"`
	`18`	`+ required_version = "~> 0.12.6"`
`19`	`19`	`}`