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

terraform-google-modules · Dec 20, 2021 · 15bbce5 · 15bbce5
1 parent 67c3d62
commit 15bbce5
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 35 deletions.
diff --git a/examples/dataproc_profile/main.tf b/examples/dataproc_profile/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.0"
-}
-
 data "google_client_config" "current" {
 }
 

diff --git a/examples/dataproc_profile/versions.tf b/examples/dataproc_profile/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    cdap = {
+      source  = "GoogleCloudPlatform/cdap"
+      version = "~> 0.9.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/hub_artifact/main.tf b/examples/hub_artifact/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.0"
-}
-
 data "google_client_config" "current" {
 }
 

diff --git a/examples/hub_artifact/versions.tf b/examples/hub_artifact/versions.tf
@@ -0,0 +1,13 @@
+terraform {
+  required_providers {
+    cdap = {
+      source  = "GoogleCloudPlatform/cdap"
+      version = "~> 0.9.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/namespace/main.tf b/examples/namespace/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.0"
-}
-
 data "google_client_config" "current" {}
 
 provider "cdap" {

diff --git a/examples/namespace/versions.tf b/examples/namespace/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    cdap = {
+      source  = "GoogleCloudPlatform/cdap"
+      version = "~> 0.9.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/modules/dataproc_profile/versions.tf b/modules/dataproc_profile/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/modules/hub_artifact/versions.tf b/modules/hub_artifact/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/modules/namespace/versions.tf b/modules/namespace/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/modules/private_network/versions.tf b/modules/private_network/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/modules/wait_healthy/versions.tf b/modules/wait_healthy/versions.tf
@@ -20,11 +20,11 @@ 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/fixtures/simple_example/main.tf b/test/fixtures/simple_example/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "random" {
-  version = "~> 2.0"
-}
-
 resource "random_pet" "main" {
   length    = 1
   prefix    = "simple-example"

diff --git a/test/fixtures/simple_example/versions.tf b/test/fixtures/simple_example/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.0"
+    }
+  }
 }
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
-provider "google-beta" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53.0"
+    }
+  }
 }
diff --git a/versions.tf b/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }