feat(deps): Update Terraform Google Provider to v6 (major) (#425)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody <[email protected]>
terraform-google-modules · Sep 9, 2024 · b9b818e · b9b818e
1 parent ddb6985
commit b9b818e
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 25 deletions.
diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.48, < 6"
+      version = ">= 4.48, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.48, < 6"
+      version = ">= 4.48, < 7"
     }
   }
   provider_meta "google" {

diff --git a/examples/mig_stateful/main.tf b/examples/mig_stateful/main.tf
@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-}
-
-provider "google-beta" {
-}
-
 resource "random_string" "suffix" {
   length  = 4
   special = "false"

diff --git a/modules/compute_disk_snapshot/versions.tf b/modules/compute_disk_snapshot/versions.tf
@@ -19,7 +19,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.71, < 6"
+      version = ">= 3.71, < 7"
     }
     null = {
       source  = "hashicorp/null"

diff --git a/modules/compute_instance/versions.tf b/modules/compute_instance/versions.tf
@@ -19,7 +19,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.88, < 6"
+      version = ">= 3.88, < 7"
     }
   }
   provider_meta "google" {

diff --git a/modules/instance_template/versions.tf b/modules/instance_template/versions.tf
@@ -19,7 +19,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.36, < 6"
+      version = ">= 5.36, < 7"
     }
   }
   provider_meta "google" {

diff --git a/modules/mig/versions.tf b/modules/mig/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.48, < 6"
+      version = ">= 4.48, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.48, < 6"
+      version = ">= 4.48, < 7"
     }
   }
   provider_meta "google" {

diff --git a/modules/mig_with_percent/versions.tf b/modules/mig_with_percent/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.48, < 6"
+      version = ">= 4.48, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.48, < 6"
+      version = ">= 4.48, < 7"
     }
   }
   provider_meta "google" {

diff --git a/modules/preemptible_and_regular_instance_templates/versions.tf b/modules/preemptible_and_regular_instance_templates/versions.tf
@@ -17,8 +17,8 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google      = ">= 3.88, < 6"
-    google-beta = ">= 3.88, < 6"
+    google      = ">= 3.88, < 7"
+    google-beta = ">= 3.88, < 7"
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:preemptible_and_regular_instance_templates/v11.1.0"

diff --git a/modules/umig/versions.tf b/modules/umig/versions.tf
@@ -19,7 +19,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.88, < 6"
+      version = ">= 3.88, < 7"
     }
   }
   provider_meta "google" {

diff --git a/test/fixtures/compute_instance/simple_zone/main.tf b/test/fixtures/compute_instance/simple_zone/main.tf
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 module "instance_simple" {
   source          = "../../../../examples/compute_instance/simple"
   project_id      = var.project_id

diff --git a/test/fixtures/compute_instance/simple_zone/versions.tf b/test/fixtures/compute_instance/simple_zone/versions.tf
@@ -16,4 +16,10 @@
 
 terraform {
   required_version = ">=0.12.6"
+  required_providers {
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.0"
+    }
+  }
 }
diff --git a/test/fixtures/shared/network.tf b/test/fixtures/shared/network.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "random" {
-  version = "~> 3.0"
-}
-
 resource "random_string" "suffix" {
   length  = 4
   special = "false"

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.71, < 6"
+      version = ">= 3.71, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.71, < 6"
+      version = ">= 3.71, < 7"
     }
     null = {
       source  = "hashicorp/null"