Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autogen/versions.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
6 changes: 0 additions & 6 deletions examples/mig_stateful/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
* limitations under the License.
*/

provider "google" {
}

provider "google-beta" {
}

resource "random_string" "suffix" {
length = 4
special = "false"
Expand Down
2 changes: 1 addition & 1 deletion modules/compute_disk_snapshot/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.71, < 6"
version = ">= 3.71, < 7"
}
null = {
source = "hashicorp/null"
Expand Down
2 changes: 1 addition & 1 deletion modules/compute_instance/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.88, < 6"
version = ">= 3.88, < 7"
}
}
provider_meta "google" {
Expand Down
2 changes: 1 addition & 1 deletion modules/instance_template/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {
required_providers {
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.36, < 6"
version = ">= 5.36, < 7"
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions modules/mig/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions modules/mig_with_percent/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/umig/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.88, < 6"
version = ">= 3.88, < 7"
}
}
provider_meta "google" {
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/compute_instance/simple_zone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/


module "instance_simple" {
source = "../../../../examples/compute_instance/simple"
project_id = var.project_id
Expand Down
6 changes: 6 additions & 0 deletions test/fixtures/compute_instance/simple_zone/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@

terraform {
required_version = ">=0.12.6"
required_providers {
random = {
source = "hashicorp/random"
version = ">= 3.0"
}
}
}
4 changes: 0 additions & 4 deletions test/fixtures/shared/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
* limitations under the License.
*/

provider "random" {
version = "~> 3.0"
}

resource "random_string" "suffix" {
length = 4
special = "false"
Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading