Skip to content

Commit

Permalink
fix(deps): expand version constraint to Terraform Google Provider to …
Browse files Browse the repository at this point in the history
…v5 (major) (#156)

Co-authored-by: Andrew Peabody <[email protected]>
  • Loading branch information
renovate-bot and apeabody authored Nov 1, 2023
1 parent bb853fd commit 7fb5ebb
Show file tree
Hide file tree
Showing 17 changed files with 25 additions and 145 deletions.
4 changes: 2 additions & 2 deletions examples/cloud_run_vpc_connector/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "vpc" {
source = "terraform-google-modules/network/google"
version = "~> 4.0"
version = "~> 7.5"

project_id = var.project_id
network_name = "cloud-run-vpc"
Expand All @@ -36,7 +36,7 @@ module "vpc" {

module "serverless_connector" {
source = "terraform-google-modules/network/google//modules/vpc-serverless-connector-beta"
version = "~> 4.0"
version = "~> 7.5"

project_id = var.project_id
vpc_connectors = [{
Expand Down
30 changes: 0 additions & 30 deletions examples/cloud_run_vpc_connector/versions.tf

This file was deleted.

30 changes: 0 additions & 30 deletions examples/secure_cloud_run/versions.tf

This file was deleted.

30 changes: 0 additions & 30 deletions examples/simple_cloud_run/versions.tf

This file was deleted.

30 changes: 0 additions & 30 deletions examples/simple_cloud_run_with_cmek/versions.tf

This file was deleted.

2 changes: 1 addition & 1 deletion modules/job-exec/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ terraform {
}
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions modules/secure-cloud-run-core/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions modules/secure-cloud-run-security/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/secure-cloud-run/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/secure-serverless-harness/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions modules/secure-serverless-net/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/service-project-factory/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/secure_cloud_run/harness.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ data "terraform_remote_state" "sfb-env-prod" {

module "serverless_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 13.0"
version = "~> 14.0"

name = "ci-cloud-run"
random_project_id = "true"
Expand All @@ -74,7 +74,7 @@ module "serverless_project" {

module "kms_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 13.0"
version = "~> 14.0"

name = "ci-cloud-run-kms"
random_project_id = "true"
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/secure_cloud_run/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
version = ">= 3.53"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.53, < 5.0"
version = ">= 3.53"
}
}
}
2 changes: 1 addition & 1 deletion test/setup/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 10.0"
version = "~> 14.0"

name = "ci-cloud-run"
random_project_id = "true"
Expand Down
6 changes: 3 additions & 3 deletions test/setup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
version = ">= 3.53"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.53, < 5.0"
version = ">= 3.53"
}
}
}
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "< 5.0"
version = "< 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "< 5.0"
version = "< 6"
}
}

Expand Down

0 comments on commit 7fb5ebb

Please sign in to comment.