feat: update TPG version constraints to allow 4.0 (#27)

terraform-google-modules · Nov 24, 2021 · 759bcb9 · 759bcb9
1 parent 9e7c47c
commit 759bcb9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/examples/simple_composer_env/main.tf b/examples/simple_composer_env/main.tf
@@ -14,17 +14,6 @@
  * limitations under the License.
  */
 
-/******************************************
-  Provider configuration
- *****************************************/
-provider "google" {
-  version = "~> 3.3"
-}
-
-provider "google-beta" {
-  version = "~> 3.3"
-}
-
 module "simple-composer-environment" {
   source = "../../modules/create_environment"
 

diff --git a/examples/simple_composer_env/versions.tf b/examples/simple_composer_env/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/modules/create_environment/versions.tf b/modules/create_environment/versions.tf
@@ -20,12 +20,12 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53"
-}
-
-provider "google-beta" {
-  version = "~> 3.53"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53"
+    }
+  }
 }
diff --git a/versions.tf b/versions.tf
@@ -20,12 +20,12 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }