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

* feat: update TPG version constraints to allow 4.0 * Delete make_source.sh Co-authored-by: Bharath KKB <[email protected]>
terraform-google-modules · Dec 22, 2021 · 10a2f46 · 10a2f46
1 parent 503bc0a
commit 10a2f46
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 97 deletions.
diff --git a/examples/forwarding-zone/versions.tf b/examples/forwarding-zone/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/examples/peering-zone/versions.tf b/examples/peering-zone/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/examples/private-zone/providers.tf b/examples/private-zone/providers.tf
diff --git a/examples/forwarding-zone/providers.tf → examples/private-zone/versions.tf b/examples/forwarding-zone/providers.tf → examples/private-zone/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,16 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = ">= 2.14"
-}
-
-provider "google-beta" {
-  version = ">= 2.14"
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/public-zone/providers.tf b/examples/public-zone/providers.tf
diff --git a/examples/peering-zone/providers.tf → examples/public-zone/versions.tf b/examples/peering-zone/providers.tf → examples/public-zone/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,16 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = ">= 2.14"
-}
-
-provider "google-beta" {
-  version = ">= 2.14"
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/test/setup/make_source.sh b/test/setup/make_source.sh
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.63"
-}
-
-provider "google-beta" {
-  version = ">= 3.63"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.63"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.63"
+    }
+  }
 }
diff --git a/versions.tf b/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"
     }
   }