Merge pull request #52 from terraform-google-modules/aaron-lane-versions

aaron-lane · web-flow · commit 53851f0581ab · 2019-12-16T12:46:33.000-05:00
Configure required versions and providers
diff --git a/examples/compute_instance/simple/main.tf b/examples/compute_instance/simple/main.tf
@@ -21,13 +21,6 @@ provider "google" {
   version     = "~> 2.7.0"
 }
 
-provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   subnetwork      = var.subnetwork
@@ -41,4 +34,3 @@ module "compute_instance" {
   hostname          = "instance-simple"
   instance_template = module.instance_template.self_link
 }
-
diff --git a/examples/compute_instance/simple/versions.tf b/examples/compute_instance/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/instance_template/additional_disks/main.tf b/examples/instance_template/additional_disks/main.tf
@@ -18,7 +18,7 @@ provider "google" {
   credentials = file(var.credentials_path)
   project     = var.project_id
   region      = var.region
-  version     = "~> 2.7"
+  version     = "~> 2.7.0"
 }
 
 module "instance_template" {
@@ -49,4 +49,3 @@ module "instance_template" {
     },
   ]
 }
-
diff --git a/examples/instance_template/additional_disks/versions.tf b/examples/instance_template/additional_disks/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/instance_template/simple/main.tf b/examples/instance_template/simple/main.tf
@@ -14,6 +14,12 @@
  * limitations under the License.
  */
 
+provider "google" {
+  credentials = file(var.credentials_path)
+  project     = var.project_id
+  region      = var.region
+  version     = "~> 2.7.0"
+}
 
 resource "google_compute_address" "ip_address" {
   name = "external-ip"
@@ -26,13 +32,6 @@ locals {
   }
 }
 
-provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   project_id      = var.project_id
@@ -43,4 +42,3 @@ module "instance_template" {
   labels          = var.labels
   access_config   = [local.access_config]
 }
-
diff --git a/examples/instance_template/simple/versions.tf b/examples/instance_template/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/mig/autoscaler/versions.tf b/examples/mig/autoscaler/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/mig/full/versions.tf b/examples/mig/full/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/mig/simple/versions.tf b/examples/mig/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/mig_with_percent/simple/versions.tf b/examples/mig_with_percent/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/preemptible_and_regular_instance_templates/simple/versions.tf b/examples/preemptible_and_regular_instance_templates/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/umig/full/main.tf b/examples/umig/full/main.tf
@@ -21,13 +21,6 @@ provider "google" {
   version     = "~> 2.7.0"
 }
 
-provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   name_prefix     = "${var.hostname}-instance-template"
@@ -69,4 +62,3 @@ module "umig" {
   instance_template  = module.instance_template.self_link
   named_ports        = var.named_ports
 }
-
diff --git a/examples/umig/full/versions.tf b/examples/umig/full/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/umig/named_ports/main.tf b/examples/umig/named_ports/main.tf
@@ -21,13 +21,6 @@ provider "google" {
   version     = "~> 2.7.0"
 }
 
-provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   subnetwork      = var.subnetwork
@@ -43,4 +36,3 @@ module "umig" {
   instance_template = module.instance_template.self_link
   named_ports       = var.named_ports
 }
-
diff --git a/examples/umig/named_ports/versions.tf b/examples/umig/named_ports/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/umig/simple/main.tf b/examples/umig/simple/main.tf
@@ -21,13 +21,6 @@ provider "google" {
   version     = "~> 2.7.0"
 }
 
-provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   subnetwork      = var.subnetwork
@@ -42,4 +35,3 @@ module "umig" {
   hostname          = "umig-simple"
   instance_template = module.instance_template.self_link
 }
-
diff --git a/examples/umig/simple/versions.tf b/examples/umig/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/examples/umig/static_ips/main.tf b/examples/umig/static_ips/main.tf
@@ -21,13 +21,6 @@ provider "google" {
   version     = "~> 2.7.0"
 }
 
-provider "google-beta" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   subnetwork      = var.subnetwork
@@ -43,4 +36,3 @@ module "umig" {
   instance_template = module.instance_template.self_link
   static_ips        = var.static_ips
 }
-
diff --git a/examples/umig/static_ips/versions.tf b/examples/umig/static_ips/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/modules/compute_instance/versions.tf b/modules/compute_instance/versions.tf
@@ -15,5 +15,8 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
+  required_providers {
+    google = "~> 2.7"
+  }
 }
diff --git a/modules/instance_template/versions.tf b/modules/instance_template/versions.tf
@@ -15,5 +15,8 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
+  required_providers {
+    google = "~> 2.7"
+  }
 }
diff --git a/modules/mig/versions.tf b/modules/mig/versions.tf
@@ -15,5 +15,9 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
+  required_providers {
+    google      = "~> 2.7"
+    google-beta = "~> 2.7"
+  }
 }
diff --git a/modules/mig_with_percent/versions.tf b/modules/mig_with_percent/versions.tf
@@ -15,5 +15,9 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
+  required_providers {
+    google      = "~> 2.7"
+    google-beta = "~> 2.7"
+  }
 }
diff --git a/modules/preemptible_and_regular_instance_templates/versions.tf b/modules/preemptible_and_regular_instance_templates/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/modules/umig/versions.tf b/modules/umig/versions.tf
@@ -15,5 +15,8 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
+  required_providers {
+    google = "~> 2.7"
+  }
 }
diff --git a/test/fixtures/compute_instance/simple/main.tf b/test/fixtures/compute_instance/simple/main.tf
@@ -27,4 +27,3 @@ module "instance_simple" {
   num_instances    = 4
   service_account  = var.service_account
 }
-
diff --git a/test/fixtures/compute_instance/simple/versions.tf b/test/fixtures/compute_instance/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/instance_template/additional_disks/versions.tf b/test/fixtures/instance_template/additional_disks/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/instance_template/simple/versions.tf b/test/fixtures/instance_template/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/mig/autoscaler/versions.tf b/test/fixtures/mig/autoscaler/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/mig/simple/versions.tf b/test/fixtures/mig/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/mig_with_percent/simple/versions.tf b/test/fixtures/mig_with_percent/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/preemptible_and_regular_instance_templates/simple/versions.tf b/test/fixtures/preemptible_and_regular_instance_templates/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/shared/network.tf b/test/fixtures/shared/network.tf
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+provider "random" {
+  version = "~> 2.2"
+}
+
 resource "random_string" "suffix" {
   length  = 4
   special = "false"
@@ -33,4 +37,3 @@ resource "google_compute_subnetwork" "main" {
   ip_cidr_range = "10.128.0.0/20"
   network       = google_compute_network.main.self_link
 }
-
diff --git a/test/fixtures/umig/named_ports/versions.tf b/test/fixtures/umig/named_ports/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/umig/simple/versions.tf b/test/fixtures/umig/simple/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/fixtures/umig/static_ips/versions.tf b/test/fixtures/umig/static_ips/versions.tf
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.6"
 }
diff --git a/test/setup/main.tf b/test/setup/main.tf
diff --git a/test/setup/versions.tf b/test/setup/versions.tf

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"`
	`18`	`+ required_version = "~> 0.12.6"`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ provider "google" {`
`18`	`18`	`credentials = file(var.credentials_path)`
`19`	`19`	`project = var.project_id`
`20`	`20`	`region = var.region`
`21`		`- version = "~> 2.7"`
	`21`	`+ version = "~> 2.7.0"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`module "instance_template" {`
`@@ -49,4 +49,3 @@ module "instance_template" {`
`49`	`49`	`},`
`50`	`50`	`]`
`51`	`51`	`}`
`52`		`-`