Skip to content

Commit

Permalink
feat: add support for tpg v5
Browse files Browse the repository at this point in the history
  • Loading branch information
@apeabody
apeabody committed Oct 5, 2023
1 parent 05dbb8f commit ac95545
Show file tree
Hide file tree
Showing 28 changed files with 49 additions and 81 deletions.
6 changes: 2 additions & 4 deletions examples/app_engine/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
3 changes: 1 addition & 2 deletions examples/budget_project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
random = {
source = "hashicorp/random"
Expand Down
6 changes: 2 additions & 4 deletions examples/essential_contacts/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
}
}
3 changes: 1 addition & 2 deletions examples/fabric_project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
random = {
source = "hashicorp/random"
Expand Down
6 changes: 2 additions & 4 deletions examples/gke_shared_vpc/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions examples/group_project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
gsuite = {
source = "deviavir/gsuite"
Expand Down
6 changes: 2 additions & 4 deletions examples/project-hierarchy/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
gsuite = {
source = "deviavir/gsuite"
Expand Down
6 changes: 2 additions & 4 deletions examples/project_services/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
}
}
6 changes: 2 additions & 4 deletions examples/quota_project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions examples/shared_vpc/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions examples/simple_project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
2 changes: 1 addition & 1 deletion modules/app_engine/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.43, < 5.0"
version = ">= 3.43, < 6"
}
}
}
2 changes: 1 addition & 1 deletion modules/budget/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.28"
version = ">= 4.28, < 6"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/core_project_factory/versions.tf
View file
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.50, < 5.0"
version = ">= 3.50, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.50, < 5.0"
version = ">= 3.50, < 6"
}
null = {
source = "hashicorp/null"
Expand Down
4 changes: 2 additions & 2 deletions modules/essential_contacts/versions.tf
View file
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.43, <5.0"
version = ">= 3.43, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.43, <5.0"
version = ">= 3.43, < 6"
}
}
provider_meta "google" {
Expand Down
2 changes: 1 addition & 1 deletion modules/fabric-project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.43, < 5.0"
version = ">= 3.43, < 6"
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions modules/gsuite_enabled/versions.tf
View file
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.11"
version = ">= 4.11, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.11"
version = ">= 4.11, < 6"
}
gsuite = {
source = "DeviaVir/gsuite"
Expand Down
2 changes: 1 addition & 1 deletion modules/gsuite_group/versions.tf
View file
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.43, < 5.0"
version = ">= 3.43, < 6"
}
}
}
4 changes: 2 additions & 2 deletions modules/project_services/versions.tf
View file
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.43, < 5.0"
version = ">= 3.43, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.43, < 5.0"
version = ">= 3.43, < 6"
}
}
provider_meta "google" {
Expand Down
2 changes: 1 addition & 1 deletion modules/quota_manager/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform {
required_providers {
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.11"
version = ">= 4.11, < 6"
}
}
}
4 changes: 2 additions & 2 deletions modules/shared_vpc_access/versions.tf
View file
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.43, < 5.0"
version = ">= 3.43, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.43, < 5.0"
version = ">= 3.43, < 6"
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions modules/svpc_service_project/versions.tf
View file
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.5"
version = ">= 4.5, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
version = ">= 4.5, < 6"
}
}
provider_meta "google" {
Expand Down
6 changes: 2 additions & 4 deletions test/fixtures/full/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
gsuite = {
source = "deviavir/gsuite"
Expand Down
6 changes: 2 additions & 4 deletions test/fixtures/minimal/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions test/fixtures/shared_vpc_no_subnets/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions test/fixtures/vpc_sc_project/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions test/setup/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
source = "hashicorp/google-beta"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ terraform {
required_version = ">=0.13.0"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.28"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.28"
source = "hashicorp/google-beta"
}
}
provider_meta "google" {
Expand Down

0 comments on commit ac95545

Please sign in to comment.