Merge pull request #3140 from RachaelSTamakloe/tpg_min_version_upgrade

increasing the tpg min version constraint to 5.44.2
GoogleCloudPlatform · Oct 29, 2024 · 25da7ba · 25da7ba
2 parents 7d33a37 + bb77086
commit 25da7ba
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/pkg/config/expand.go b/pkg/config/expand.go
@@ -199,11 +199,11 @@ func getDefaultGoogleProviders(bp Blueprint) map[string]TerraformProvider {
 	return map[string]TerraformProvider{
 		"google": {
 			Source:        "hashicorp/google",
-			Version:       ">= 4.84.0, < 6.8.0",
+			Version:       ">= 5.44.2, < 6.2.0",
 			Configuration: gglConf},
 		"google-beta": {
 			Source:        "hashicorp/google-beta",
-			Version:       ">= 4.84.0, < 6.8.0",
+			Version:       ">= 5.44.2, < 6.2.0",
 			Configuration: gglConf}}
 }
 

diff --git a/pkg/config/expand_test.go b/pkg/config/expand_test.go
@@ -93,10 +93,10 @@ func (s *zeroSuite) TestExpandProviders(c *C) {
 		c.Check(g.TerraformProviders, DeepEquals, map[string]PR{
 			"google": TerraformProvider{
 				Source:  "hashicorp/google",
-				Version: ">= 4.84.0, < 6.8.0"},
+				Version: ">= 5.44.2, < 6.2.0"},
 			"google-beta": TerraformProvider{
 				Source:  "hashicorp/google-beta",
-				Version: ">= 4.84.0, < 6.8.0"}})
+				Version: ">= 5.44.2, < 6.2.0"}})
 	}
 
 	{ // no def PR, group PR

diff --git a/...lidate_configs/golden_copies/expectations/igc_pkr/.ghpc/artifacts/expanded_blueprint.yaml b/...lidate_configs/golden_copies/expectations/igc_pkr/.ghpc/artifacts/expanded_blueprint.yaml
@@ -38,14 +38,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))

diff --git a/tools/validate_configs/golden_copies/expectations/igc_pkr/zero/versions.tf b/tools/validate_configs/golden_copies/expectations/igc_pkr/zero/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
   }
 }
diff --git a/...alidate_configs/golden_copies/expectations/igc_tf/.ghpc/artifacts/expanded_blueprint.yaml b/...alidate_configs/golden_copies/expectations/igc_tf/.ghpc/artifacts/expanded_blueprint.yaml
@@ -44,14 +44,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))
@@ -80,14 +80,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))

diff --git a/tools/validate_configs/golden_copies/expectations/igc_tf/one/versions.tf b/tools/validate_configs/golden_copies/expectations/igc_tf/one/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
   }
 }
diff --git a/tools/validate_configs/golden_copies/expectations/igc_tf/zero/versions.tf b/tools/validate_configs/golden_copies/expectations/igc_tf/zero/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
   }
 }
diff --git a/..._configs/golden_copies/expectations/merge_flatten/.ghpc/artifacts/expanded_blueprint.yaml b/..._configs/golden_copies/expectations/merge_flatten/.ghpc/artifacts/expanded_blueprint.yaml
@@ -39,14 +39,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))

diff --git a/tools/validate_configs/golden_copies/expectations/merge_flatten/zero/versions.tf b/tools/validate_configs/golden_copies/expectations/merge_flatten/zero/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
   }
 }
diff --git a/...gs/golden_copies/expectations/versioned_blueprint/.ghpc/artifacts/expanded_blueprint.yaml b/...gs/golden_copies/expectations/versioned_blueprint/.ghpc/artifacts/expanded_blueprint.yaml
@@ -47,14 +47,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: '>= 4.84.0, < 6.8.0'
+        version: '>= 5.44.2, < 6.2.0'
         configuration:
           project: ((var.project_id))
           region: ((var.region))

diff --git a/tools/validate_configs/golden_copies/expectations/versioned_blueprint/primary/versions.tf b/tools/validate_configs/golden_copies/expectations/versioned_blueprint/primary/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.84.0, < 6.8.0"
+      version = ">= 5.44.2, < 6.2.0"
     }
   }
 }
diff --git a/tools/validate_configs/test_configs/cloud-batch-cft-instance-template.yaml b/tools/validate_configs/test_configs/cloud-batch-cft-instance-template.yaml
@@ -44,7 +44,7 @@ deployment_groups:
           echo "Hello World" > /sw/hello.txt
 
   - id: batch-compute-template
-    source: github.com/terraform-google-modules/terraform-google-vm//modules/instance_template?ref=v7.8.0
+    source: github.com/terraform-google-modules/terraform-google-vm//modules/instance_template?ref=v12.1.0
     use: [batch-startup-script]
     settings:
       # Boiler plate to work with Cloud Foundation Toolkit