fix: Allow 3.x provider version in fabric-project submodule. (#361)

terraform-google-modules · Feb 3, 2020 · 2b32b68 · 2b32b68
1 parent 4f372dd
commit 2b32b68
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 26 deletions.
diff --git a/examples/app_engine/main.tf b/examples/app_engine/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "null" {

diff --git a/examples/budget_project/main.tf b/examples/budget_project/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "null" {

diff --git a/examples/fabric_project/main.tf b/examples/fabric_project/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.18.1"
+  version = "~> 3.6.0"
 }
 
 provider "random" {

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

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

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

diff --git a/examples/project_services/main.tf b/examples/project_services/main.tf
@@ -18,7 +18,7 @@
   Provider configuration
  *****************************************/
 provider "google" {
-  version = "~> 2.18.1"
+  version = "~> 3.6.0"
 }
 
 module "project-services" {

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

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     = "~> 3.3.0"
+  version     = "~> 3.6.0"
 }
 
 provider "google-beta" {
   credentials = file(local.credentials_file_path)
-  version     = "~> 3.3.0"
+  version     = "~> 3.6.0"
 }
 
 provider "null" {

diff --git a/modules/fabric-project/versions.tf b/modules/fabric-project/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google = "~> 2.1"
+    google = ">= 3.1, < 4.0"
   }
 }
diff --git a/test/fixtures/full/main.tf b/test/fixtures/full/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "gsuite" {

diff --git a/test/fixtures/minimal/main.tf b/test/fixtures/minimal/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "null" {

diff --git a/test/fixtures/shared_vpc_no_subnets/main.tf b/test/fixtures/shared_vpc_no_subnets/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "gsuite" {

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -15,11 +15,11 @@
  */
 
 provider "google" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.3.0"
+  version = "~> 3.6.0"
 }
 
 provider "null" {
@@ -41,7 +41,7 @@ resource "google_folder" "ci_pfactory_folder" {
 
 module "pfactory_project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 4.0"
+  version = "~> 7.0"
 
   name              = "ci-pfactory-tests"
   random_project_id = true