relax google provider versioning. Allow for 3.x

terraform-google-modules · Dec 27, 2019 · f66ff07 · f66ff07
1 parent c19c299
commit f66ff07
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -170,8 +170,8 @@ determining that location is as follows:
 -   [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0
 -   [jq](https://stedolan.github.io/jq/) >= 1.6
 -   [Terraform](https://www.terraform.io/downloads.html) >= 0.12.6
--   [terraform-provider-google] plugin 2.1.x
--   [terraform-provider-google-beta] plugin 2.1.x
+-   [terraform-provider-google] plugin >= 2.1, < 4.0
+-   [terraform-provider-google-beta] plugin >= 2.1, < 4.0
 -   [terraform-provider-gsuite] plugin 0.1.x if GSuite functionality is desired
 
 ### Permissions
@@ -233,7 +233,7 @@ credentials to pass to these scripts. Credentials can be provided via two mechan
     ```terraform
     provider "google" {
       credentials = "${file(var.credentials_path)}"
-      version = "~> 1.20"
+      version = "~> 3.3"
     }
 
     module "project-factory" {
@@ -251,7 +251,7 @@ credentials to pass to these scripts. Credentials can be provided via two mechan
    provider "google" {
      # Terraform will check the `GOOGLE_APPLICATION_CREDENTIALS` variable, so no `credentials`
      # value is needed here.
-      version = "~> 1.20"
+      version = "~> 3.3"
    }
 
    module "project-factory" {

diff --git a/examples/simple_project/main.tf b/examples/simple_project/main.tf
@@ -23,12 +23,12 @@ locals {
  *****************************************/
 provider "google" {
   credentials = file(local.credentials_file_path)
-  version     = "~> 2.18.1"
+  version     = "~> 3.3.0"
 }
 
 provider "google-beta" {
   credentials = file(local.credentials_file_path)
-  version     = "~> 2.18.1"
+  version     = "~> 3.3.0"
 }
 
 provider "null" {

diff --git a/modules/app_engine/versions.tf b/modules/app_engine/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google = "~> 2.1"
+    google = ">= 2.1, < 4.0"
   }
 }
diff --git a/modules/core_project_factory/versions.tf b/modules/core_project_factory/versions.tf
@@ -18,8 +18,8 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google      = "~> 2.1"
-    google-beta = "~> 2.1"
+    google      = ">= 2.1, < 4.0"
+    google-beta = ">= 2.1, < 4.0"
     null        = "~> 2.1"
     random      = "~> 2.2"
   }

diff --git a/modules/gsuite_group/versions.tf b/modules/gsuite_group/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google = "~> 2.1"
+    google = ">= 2.1, < 4.0"
   }
 }
diff --git a/modules/project_services/versions.tf b/modules/project_services/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google = "~> 2.1"
+    google = ">= 2.1, < 4.0"
   }
 }
diff --git a/test/fixtures/minimal/main.tf b/test/fixtures/minimal/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 2.18.1"
+  version = "~> 3.3.0"
 }
 
 provider "google-beta" {
-  version = "~> 2.18.1"
+  version = "~> 3.3.0"
 }
 
 provider "null" {