From d6490ac4ba1b6a4b7be06f44cc48f88b9df6519c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:44:22 +0000 Subject: [PATCH 1/3] feat(deps): Update Terraform Google Provider to v6 --- modules/compute_disk_snapshot/versions.tf | 2 +- modules/compute_instance/versions.tf | 2 +- modules/instance_template/versions.tf | 2 +- modules/mig/versions.tf | 4 ++-- modules/mig_with_percent/versions.tf | 4 ++-- .../preemptible_and_regular_instance_templates/versions.tf | 4 ++-- modules/umig/versions.tf | 2 +- test/setup/versions.tf | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/compute_disk_snapshot/versions.tf b/modules/compute_disk_snapshot/versions.tf index 2bbdb243..674c1f0d 100644 --- 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 index 7361a05f..201c5282 100644 --- 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 index 319a1fbd..aa7c7552 100644 --- 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 index fbb10041..99899dc0 100644 --- 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 index 50d2a6f5..d0304c49 100644 --- 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 index 5546d88a..0a404690 100644 --- 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 index fb0ec57f..4e25f4b7 100644 --- 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/setup/versions.tf b/test/setup/versions.tf index 86a62f1e..6c5f5dfd 100644 --- 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" From cb212aa91afdd0e40ec7d0a9abf375eaa5c59cfb Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Mon, 9 Sep 2024 15:45:46 +0000 Subject: [PATCH 2/3] update tpml --- autogen/versions.tf.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl index ace24c91..c93eaec6 100644 --- 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" { From 10009a8e59814e675a33b2a4a0ab0da6524e5e6a Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Mon, 9 Sep 2024 16:17:45 +0000 Subject: [PATCH 3/3] fixes --- examples/mig_stateful/main.tf | 6 ------ test/fixtures/compute_instance/simple_zone/main.tf | 1 - test/fixtures/compute_instance/simple_zone/versions.tf | 6 ++++++ test/fixtures/shared/network.tf | 4 ---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/examples/mig_stateful/main.tf b/examples/mig_stateful/main.tf index 6463a530..1ecf1a81 100644 --- 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/test/fixtures/compute_instance/simple_zone/main.tf b/test/fixtures/compute_instance/simple_zone/main.tf index e6fc7604..b26aec2b 100644 --- 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 index fb3fee63..414e8784 100644 --- 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 index 41a9444e..c89a8e6f 100644 --- 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"