Skip to content

Commit dd9beb3

Browse files
cloud-foundation-botbharathkkb
cloud-foundation-bot
and
bharathkkb
authored
feat: update TPG version constraints to allow 4.0 (#636)
* feat: update TPG version constraints to allow 4.0 * fix gsuite provider, deprecated syntax Co-authored-by: bharathkkb <[email protected]>
1 parent e1c6a53 commit dd9beb3

File tree

39 files changed

+121
-389
lines changed

39 files changed

+121
-389
lines changed

‎examples/app_engine/main.tf‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google" {
18-
version = "~> 3.30"
19-
}
20-
21-
provider "google-beta" {
22-
version = "~> 3.30"
23-
}
24-
25-
provider "null" {
26-
version = "~> 2.1"
27-
}
28-
29-
provider "random" {
30-
version = "~> 2.2"
31-
}
32-
3317
resource "random_string" "suffix" {
3418
length = 4
3519
special = false

‎examples/app_engine/versions.tf‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
21+
source = "hashicorp/google"
22+
version = "~> 3.30"
2223
}
2324
google-beta = {
24-
source = "hashicorp/google-beta"
25+
source = "hashicorp/google-beta"
26+
version = "~> 3.30"
2527
}
2628
null = {
27-
source = "hashicorp/null"
29+
source = "hashicorp/null"
30+
version = "~> 2.1"
2831
}
2932
random = {
30-
source = "hashicorp/random"
33+
source = "hashicorp/random"
34+
version = "~> 2.2"
3135
}
3236
}
3337
}

‎examples/budget_project/main.tf‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google" {
18-
version = "~> 3.30"
19-
}
20-
21-
provider "google-beta" {
22-
version = "~> 3.30"
23-
}
24-
25-
provider "null" {
26-
version = "~> 2.1"
27-
}
28-
29-
provider "random" {
30-
version = "~> 2.2"
31-
}
32-
3317
resource "random_string" "suffix" {
3418
length = 4
3519
special = false

‎examples/budget_project/versions.tf‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
21+
source = "hashicorp/google"
22+
version = "~> 3.30"
2223
}
2324
google-beta = {
24-
source = "hashicorp/google-beta"
25+
source = "hashicorp/google-beta"
26+
version = "~> 3.30"
2527
}
2628
null = {
27-
source = "hashicorp/null"
29+
source = "hashicorp/null"
30+
version = "~> 2.1"
2831
}
2932
random = {
30-
source = "hashicorp/random"
33+
source = "hashicorp/random"
34+
version = "~> 2.2"
3135
}
3236
}
3337
}

‎examples/fabric_project/main.tf‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google" {
18-
version = "~> 3.30"
19-
}
20-
21-
provider "random" {
22-
version = "~> 2.2"
23-
}
24-
2517
locals {
2618
prefix = var.prefix == "" ? random_string.prefix.result : var.prefix
2719
}

‎examples/fabric_project/versions.tf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
21+
source = "hashicorp/google"
22+
version = "~> 3.30"
2223
}
2324
random = {
24-
source = "hashicorp/random"
25+
source = "hashicorp/random"
26+
version = "~> 2.2"
2527
}
2628
}
2729
}

‎examples/gke_shared_vpc/main.tf‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google" {
18-
version = "~> 3.30"
19-
}
20-
21-
provider "google-beta" {
22-
version = "~> 3.30"
23-
}
24-
25-
provider "null" {
26-
version = "~> 2.1"
27-
}
28-
29-
provider "random" {
30-
version = "~> 2.2"
31-
}
32-
3317
module "project-factory" {
3418
source = "../../"
3519
random_project_id = true

‎examples/gke_shared_vpc/versions.tf‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
21+
source = "hashicorp/google"
22+
version = "~> 3.30"
2223
}
2324
google-beta = {
24-
source = "hashicorp/google-beta"
25+
source = "hashicorp/google-beta"
26+
version = "~> 3.30"
2527
}
2628
null = {
27-
source = "hashicorp/null"
29+
source = "hashicorp/null"
30+
version = "~> 2.1"
2831
}
2932
random = {
30-
source = "hashicorp/random"
33+
source = "hashicorp/random"
34+
version = "~> 2.2"
3135
}
3236
}
3337
}

‎examples/group_project/main.tf‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
/******************************************
1818
Provider configuration
1919
*****************************************/
20-
provider "google" {
21-
version = "~> 3.30"
22-
}
23-
24-
provider "google-beta" {
25-
version = "~> 3.30"
26-
}
27-
2820
provider "gsuite" {
2921
impersonated_user_email = var.admin_email
3022

@@ -33,15 +25,6 @@ provider "gsuite" {
3325
"https://www.googleapis.com/auth/admin.directory.group.member",
3426
]
3527

36-
version = "~> 0.1.12"
37-
}
38-
39-
provider "null" {
40-
version = "~> 2.1"
41-
}
42-
43-
provider "random" {
44-
version = "~> 2.2"
4528
}
4629

4730
module "project-factory" {

‎examples/group_project/versions.tf‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,24 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
21+
source = "hashicorp/google"
22+
version = "~> 3.30"
2223
}
2324
google-beta = {
24-
source = "hashicorp/google-beta"
25+
source = "hashicorp/google-beta"
26+
version = "~> 3.30"
2527
}
2628
gsuite = {
27-
source = "DeviaVir/gsuite"
29+
source = "deviavir/gsuite"
30+
version = "~> 0.1.12"
2831
}
2932
null = {
30-
source = "hashicorp/null"
33+
source = "hashicorp/null"
34+
version = "~> 2.1"
3135
}
3236
random = {
33-
source = "hashicorp/random"
37+
source = "hashicorp/random"
38+
version = "~> 2.2"
3439
}
3540
}
3641
}

0 commit comments

Comments
 (0)