Merge pull request GoogleCloudPlatform#4314 from Shuang-cnt/update-terraform-provider

update terraform-provider version to v6.41.0

Author: Shuang-cnt

modules/file-system/managed-lustre/README.md

@@ -271,6 +271,7 @@ No modules.
 | <a name="input_name"></a> [name](#input\_name) | Name of the Lustre instance | `string` | n/a | yes |
 | <a name="input_network_id"></a> [network\_id](#input\_network\_id) | The ID of the GCE VPC network to which the instance is connected given in the format:<br/>`projects/<project_id>/global/networks/<network_name>`" | `string` | n/a | yes |
 | <a name="input_network_self_link"></a> [network\_self\_link](#input\_network\_self\_link) | Network self-link this instance will be on, required for checking private service access | `string` | n/a | yes |
+| <a name="input_per_unit_storage_throughput"></a> [per\_unit\_storage\_throughput](#input\_per\_unit\_storage\_throughput) | Throughput of the instance in MB/s/TiB. Valid values are 125, 250, 500, 1000. | `number` | `1000` | no |
 | <a name="input_private_vpc_connection_peering"></a> [private\_vpc\_connection\_peering](#input\_private\_vpc\_connection\_peering) | The name of the VPC Network peering connection.<br/>If using new VPC, please use community/modules/network/private-service-access to create private-service-access and<br/>If using existing VPC with private-service-access enabled, set this manually." | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | ID of project in which Lustre instance will be created. | `string` | n/a | yes |
 | <a name="input_remote_mount"></a> [remote\_mount](#input\_remote\_mount) | Remote mount point of the Managed Lustre instance | `string` | n/a | yes |

modules/file-system/managed-lustre/main.tf

@@ -65,8 +65,9 @@ resource "google_lustre_instance" "lustre_instance" {
   instance_id = local.instance_id
   location    = var.zone
 
-  filesystem   = var.remote_mount
-  capacity_gib = var.size_gib
+  filesystem                  = var.remote_mount
+  capacity_gib                = var.size_gib
+  per_unit_storage_throughput = var.per_unit_storage_throughput
 
   labels  = local.labels
   network = var.network_id

modules/file-system/managed-lustre/variables.tf

@@ -77,6 +77,12 @@ variable "size_gib" {
   default     = 18000
 }
 
+variable "per_unit_storage_throughput" {
+  description = "Throughput of the instance in MB/s/TiB. Valid values are 125, 250, 500, 1000."
+  type        = number
+  default     = 1000
+}
+
 variable "labels" {
   description = "Labels to add to the Managed Lustre instance. Key-value pairs."
   type        = map(string)

pkg/config/expand.go

@@ -199,11 +199,11 @@ func getDefaultGoogleProviders(bp Blueprint) map[string]TerraformProvider {
 	return map[string]TerraformProvider{
 		"google": {
 			Source:        "hashicorp/google",
-			Version:       "~> 6.39.0",
+			Version:       "~> 6.41.0",
 			Configuration: gglConf},
 		"google-beta": {
 			Source:        "hashicorp/google-beta",
-			Version:       "~> 6.39.0",
+			Version:       "~> 6.41.0",
 			Configuration: gglConf}}
 }
 

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: "~> 6.39.0"},
+				Version: "~> 6.41.0"},
 			"google-beta": TerraformProvider{
 				Source:  "hashicorp/google-beta",
-				Version: "~> 6.39.0"}})
+				Version: "~> 6.41.0"}})
 	}
 
 	{ // no def PR, group PR

tools/validate_configs/golden_copies/expectations/igc_pkr/.ghpc/artifacts/expanded_blueprint.yaml

@@ -38,14 +38,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: ~> 6.39.0
+        version: ~> 6.41.0
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: ~> 6.39.0
+        version: ~> 6.41.0
         configuration:
           project: ((var.project_id))
           region: ((var.region))

tools/validate_configs/golden_copies/expectations/igc_pkr/zero/versions.tf

@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 6.39.0"
+      version = "~> 6.41.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 6.39.0"
+      version = "~> 6.41.0"
     }
   }
 }

tools/validate_configs/golden_copies/expectations/igc_tf/.ghpc/artifacts/expanded_blueprint.yaml

@@ -44,14 +44,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: ~> 6.39.0
+        version: ~> 6.41.0
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: ~> 6.39.0
+        version: ~> 6.41.0
         configuration:
           project: ((var.project_id))
           region: ((var.region))
@@ -80,14 +80,14 @@ deployment_groups:
     terraform_providers:
       google:
         source: hashicorp/google
-        version: ~> 6.39.0
+        version: ~> 6.41.0
         configuration:
           project: ((var.project_id))
           region: ((var.region))
           zone: ((var.zone))
       google-beta:
         source: hashicorp/google-beta
-        version: ~> 6.39.0
+        version: ~> 6.41.0
         configuration:
           project: ((var.project_id))
           region: ((var.region))

tools/validate_configs/golden_copies/expectations/igc_tf/one/versions.tf

@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 6.39.0"
+      version = "~> 6.41.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 6.39.0"
+      version = "~> 6.41.0"
     }
   }
 }

tools/validate_configs/golden_copies/expectations/igc_tf/zero/versions.tf

@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 6.39.0"
+      version = "~> 6.41.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 6.39.0"
+      version = "~> 6.41.0"
     }
   }
 }