feat: cloudrunv2 jobs and services support passing flags to gcsfuse in beta (#12226) (#8613)

[upstream:536f2e3e9ef8e2cf720862aecde1fb6fc1d570c1]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/12226.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudrunv2: added `gcs.mount_options` to `google_cloud_run_v2_service` and `google_cloud_run_v2_job` (beta)
+```

google-beta/services/cloudrunv2/resource_cloud_run_v2_job.go

@@ -285,6 +285,15 @@ A duration in seconds with up to nine fractional digits, ending with 's'. Exampl
 																Required:    true,
 																Description: `Name of the cloud storage bucket to back the volume. The resource service account must have permission to access the bucket.`,
 															},
+															"mount_options": {
+																Type:     schema.TypeList,
+																Optional: true,
+																Description: `A list of flags to pass to the gcsfuse command for configuring this volume.
+Flags should be passed without leading dashes.`,
+																Elem: &schema.Schema{
+																	Type: schema.TypeString,
+																},
+															},
 															"read_only": {
 																Type:        schema.TypeBool,
 																Optional:    true,
@@ -1845,6 +1854,8 @@ func flattenCloudRunV2JobTemplateTemplateVolumesGcs(v interface{}, d *schema.Res
 		flattenCloudRunV2JobTemplateTemplateVolumesGcsBucket(original["bucket"], d, config)
 	transformed["read_only"] =
 		flattenCloudRunV2JobTemplateTemplateVolumesGcsReadOnly(original["readOnly"], d, config)
+	transformed["mount_options"] =
+		flattenCloudRunV2JobTemplateTemplateVolumesGcsMountOptions(original["mountOptions"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudRunV2JobTemplateTemplateVolumesGcsBucket(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -1855,6 +1866,10 @@ func flattenCloudRunV2JobTemplateTemplateVolumesGcsReadOnly(v interface{}, d *sc
 	return v
 }
 
+func flattenCloudRunV2JobTemplateTemplateVolumesGcsMountOptions(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenCloudRunV2JobTemplateTemplateVolumesNfs(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -2911,6 +2926,13 @@ func expandCloudRunV2JobTemplateTemplateVolumesGcs(v interface{}, d tpgresource.
 		transformed["readOnly"] = transformedReadOnly
 	}
 
+	transformedMountOptions, err := expandCloudRunV2JobTemplateTemplateVolumesGcsMountOptions(original["mount_options"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedMountOptions); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["mountOptions"] = transformedMountOptions
+	}
+
 	return transformed, nil
 }
 
@@ -2922,6 +2944,10 @@ func expandCloudRunV2JobTemplateTemplateVolumesGcsReadOnly(v interface{}, d tpgr
 	return v, nil
 }
 
+func expandCloudRunV2JobTemplateTemplateVolumesGcsMountOptions(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudRunV2JobTemplateTemplateVolumesNfs(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {

google-beta/services/cloudrunv2/resource_cloud_run_v2_job_test.go

@@ -389,6 +389,8 @@ func testAccCloudRunV2Job_cloudrunv2JobWithGcsVolume(context map[string]interfac
           gcs {
             bucket = "gcp-public-data-landsat"
             read_only = true
+mount_options = ["log-severity=info"]
+
           }
         }
       }

google-beta/services/cloudrunv2/resource_cloud_run_v2_service.go

@@ -619,6 +619,15 @@ A duration in seconds with up to nine fractional digits, ending with 's'. Exampl
 													Required:    true,
 													Description: `GCS Bucket name`,
 												},
+												"mount_options": {
+													Type:     schema.TypeList,
+													Optional: true,
+													Description: `A list of flags to pass to the gcsfuse command for configuring this volume.
+Flags should be passed without leading dashes.`,
+													Elem: &schema.Schema{
+														Type: schema.TypeString,
+													},
+												},
 												"read_only": {
 													Type:        schema.TypeBool,
 													Optional:    true,
@@ -2871,6 +2880,8 @@ func flattenCloudRunV2ServiceTemplateVolumesGcs(v interface{}, d *schema.Resourc
 		flattenCloudRunV2ServiceTemplateVolumesGcsBucket(original["bucket"], d, config)
 	transformed["read_only"] =
 		flattenCloudRunV2ServiceTemplateVolumesGcsReadOnly(original["readOnly"], d, config)
+	transformed["mount_options"] =
+		flattenCloudRunV2ServiceTemplateVolumesGcsMountOptions(original["mountOptions"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudRunV2ServiceTemplateVolumesGcsBucket(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -2881,6 +2892,10 @@ func flattenCloudRunV2ServiceTemplateVolumesGcsReadOnly(v interface{}, d *schema
 	return v
 }
 
+func flattenCloudRunV2ServiceTemplateVolumesGcsMountOptions(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenCloudRunV2ServiceTemplateVolumesNfs(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -4642,6 +4657,13 @@ func expandCloudRunV2ServiceTemplateVolumesGcs(v interface{}, d tpgresource.Terr
 		transformed["readOnly"] = transformedReadOnly
 	}
 
+	transformedMountOptions, err := expandCloudRunV2ServiceTemplateVolumesGcsMountOptions(original["mount_options"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedMountOptions); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["mountOptions"] = transformedMountOptions
+	}
+
 	return transformed, nil
 }
 
@@ -4653,6 +4675,10 @@ func expandCloudRunV2ServiceTemplateVolumesGcsReadOnly(v interface{}, d tpgresou
 	return v, nil
 }
 
+func expandCloudRunV2ServiceTemplateVolumesGcsMountOptions(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudRunV2ServiceTemplateVolumesNfs(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {

google-beta/services/cloudrunv2/resource_cloud_run_v2_service_test.go

@@ -272,6 +272,8 @@ resource "google_cloud_run_v2_service" "default" {
       gcs {
         bucket = "gcp-public-data-landsat"
         read_only = true
+mount_options = ["log-severity=info"]
+
       }
     }
     containers {

website/docs/r/cloud_run_v2_job.html.markdown

@@ -654,6 +654,11 @@ The following arguments are supported:
   (Optional)
   If true, mount this volume as read-only in all mounts. If false, mount this volume as read-write.
 
+* `mount_options` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  A list of flags to pass to the gcsfuse command for configuring this volume.
+  Flags should be passed without leading dashes.
+
 <a name="nested_nfs"></a>The `nfs` block supports:
 
 * `server` -

website/docs/r/cloud_run_v2_service.html.markdown

@@ -1115,6 +1115,11 @@ The following arguments are supported:
   (Optional)
   If true, mount the GCS bucket as read-only
 
+* `mount_options` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  A list of flags to pass to the gcsfuse command for configuring this volume.
+  Flags should be passed without leading dashes.
+
 <a name="nested_nfs"></a>The `nfs` block supports:
 
 * `server` -