Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 2 additions & 4 deletions 0-bootstrap/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@ terraform {
required_providers {
google = {
// version 4.31.0 removed because of issue https://github.com/hashicorp/terraform-provider-google/issues/12226
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, != 4.31.0, < 6.26.0"
version = ">= 3.50, != 4.31.0, < 7.0"
}

google-beta = {
// version 4.31.0 removed because of issue https://github.com/hashicorp/terraform-provider-google/issues/12226
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, != 4.31.0, < 6.26.0"
version = ">= 3.50, != 4.31.0, < 7.0"
}

// Un-comment gitlab required_providers when using gitlab CI/CD
Expand Down
6 changes: 2 additions & 4 deletions 3-networks-hub-and-spoke/envs/development/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-hub-and-spoke/envs/nonproduction/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-hub-and-spoke/envs/production/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-hub-and-spoke/envs/shared/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-hub-and-spoke/modules/base_env/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.82, < 6.26.0"
version = ">= 3.82"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.82, < 6.26.0"
version = ">= 3.82"
}
random = {
source = "hashicorp/random"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
4 changes: 2 additions & 2 deletions 3-networks-hub-and-spoke/modules/shared_vpc/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.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
random = {
source = "hashicorp/random"
Expand Down
6 changes: 2 additions & 4 deletions 3-networks-hub-and-spoke/modules/transitivity/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
6 changes: 2 additions & 4 deletions 3-networks-svpc/envs/development/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-svpc/envs/nonproduction/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-svpc/envs/production/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-svpc/envs/shared/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}
}
6 changes: 2 additions & 4 deletions 3-networks-svpc/modules/base_env/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
6 changes: 2 additions & 4 deletions 3-networks-svpc/modules/dedicated_interconnect/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
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.82, < 6.26.0"
version = ">= 3.82"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.82, < 6.26.0"
version = ">= 3.82"
}
random = {
source = "hashicorp/random"
Expand Down
6 changes: 2 additions & 4 deletions 3-networks-svpc/modules/partner_interconnect/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down
4 changes: 2 additions & 2 deletions 3-networks-svpc/modules/shared_vpc/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.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
random = {
source = "hashicorp/random"
Expand Down
6 changes: 2 additions & 4 deletions 4-projects/modules/infra_pipelines/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ terraform {
required_providers {
google = {
// version 4.31.0 removed because of issue https://github.com/hashicorp/terraform-provider-google/issues/12226
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, != 4.31.0, < 6.26.0"
version = ">= 3.50, != 4.31.0"
}
google-beta = {
// version 4.31.0 removed because of issue https://github.com/hashicorp/terraform-provider-google/issues/12226
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, != 4.31.0, < 6.26.0"
version = ">= 3.50, != 4.31.0"
}
null = {
source = "hashicorp/null"
Expand Down
6 changes: 2 additions & 4 deletions 4-projects/modules/single_project/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ terraform {
required_version = ">= 1.3"
required_providers {
google = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
google-beta = {
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
source = "hashicorp/google-beta"
version = ">= 3.50, < 6.26.0"
version = ">= 3.50"
}
}

Expand Down