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

* feat: update TPG version constraints to allow 4.0 * fmt * fix: reset c.g.c demos to 3.53 Co-authored-by: Morgante Pell <morgantep@google.com>
terraform-google-modules · Dec 14, 2021 · 537186d · 537186d
1 parent 2e16ff4
commit 537186d
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 50 deletions.
diff --git a/examples/dns_forward_and_reverse/versions.tf b/examples/dns_forward_and_reverse/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/dns_forward_example/versions.tf b/examples/dns_forward_example/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/global_external_address/main.tf b/examples/global_external_address/main.tf
@@ -14,14 +14,6 @@
  * limitations under the License.
  */
 
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
 # [START compute_external_ip_create]
 resource "google_compute_global_address" "default" {
   project      = var.project_id # Replace this with your service project ID in quotes

diff --git a/examples/global_external_address/versions.tf b/examples/global_external_address/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+  }
 }
diff --git a/examples/internal_with_dynamic_ip/main.tf b/examples/internal_with_dynamic_ip/main.tf
@@ -14,14 +14,6 @@
  * limitations under the License.
  */
 
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
 # [START compute_internal_ip_create]
 module "address" {
   source     = "terraform-google-modules/address/google"

diff --git a/examples/internal_with_dynamic_ip/versions.tf b/examples/internal_with_dynamic_ip/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+  }
 }
diff --git a/examples/internal_with_specific_ip/main.tf b/examples/internal_with_specific_ip/main.tf
@@ -14,14 +14,6 @@
  * limitations under the License.
  */
 
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
 # [START compute_internal_ip_create]
 module "address" {
   source     = "terraform-google-modules/address/google"

diff --git a/examples/internal_with_specific_ip/versions.tf b/examples/internal_with_specific_ip/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+  }
 }
diff --git a/examples/ip_address_only/versions.tf b/examples/ip_address_only/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/ip_address_with_specific_ip/versions.tf b/examples/ip_address_with_specific_ip/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/regional_external_address/main.tf b/examples/regional_external_address/main.tf
@@ -14,14 +14,6 @@
  * limitations under the License.
  */
 
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
 # [START compute_external_ip_create]
 module "address" {
   source       = "terraform-google-modules/address/google"

diff --git a/examples/regional_external_address/versions.tf b/examples/regional_external_address/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+  }
 }
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,18 @@
  */
 
 terraform {
-  required_version = ">=0.12"
-}
-
-provider "google" {
-  version = "3.50.0"
-}
-
-provider "google-beta" {
-  version = "3.50.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "3.50.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "3.50.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
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"
     }
   }