add blockDevices and ISCSI changes for volume resource (#15405) (#10974)

[upstream:1e1ffeda88f34212b3717e09eefe0703877d3885]

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

Author: modular-magician

.changelog/15405.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+netapp: added `block_devices` field and `ISCSI` protocol support to `goolge_netapp_volume` resource, and increased timeouts on its operations
+```

google-beta/services/netapp/resource_netapp_volume.go

@@ -35,6 +35,29 @@ import (
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/verify"
 )
 
+// Suppress diffs when the value read from api
+// has the project ID instead of the project number
+func ProjectIDDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
+
+	const marker = "/locations"
+
+	// Find the starting index of "/locations" in both strings.
+	index1 := strings.Index(old, marker)
+	index2 := strings.Index(new, marker)
+
+	// If "/locations" is not found in either string, they can't be compared as requested.
+	if index1 == -1 || index2 == -1 {
+		return false
+	}
+
+	// Extract the substrings from the marker to the end.
+	suffix1 := old[index1:]
+	suffix2 := new[index2:]
+
+	// Compare the extracted suffixes.
+	return suffix1 == suffix2
+}
+
 func ResourceNetappVolume() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceNetappVolumeCreate,
@@ -47,9 +70,9 @@ func ResourceNetappVolume() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(20 * time.Minute),
-			Update: schema.DefaultTimeout(20 * time.Minute),
-			Delete: schema.DefaultTimeout(20 * time.Minute),
+			Create: schema.DefaultTimeout(50 * time.Minute),
+			Update: schema.DefaultTimeout(30 * time.Minute),
+			Delete: schema.DefaultTimeout(30 * time.Minute),
 		},
 
 		CustomizeDiff: customdiff.All(
@@ -79,18 +102,12 @@ func ResourceNetappVolume() *schema.Resource {
 				Type:        schema.TypeList,
 				Required:    true,
 				ForceNew:    true,
-				Description: `The protocol of the volume. Allowed combinations are '['NFSV3']', '['NFSV4']', '['SMB']', '['NFSV3', 'NFSV4']', '['SMB', 'NFSV3']' and '['SMB', 'NFSV4']'. Possible values: ["NFSV3", "NFSV4", "SMB"]`,
+				Description: `The protocol of the volume. Allowed combinations are '['NFSV3']', '['NFSV4']', '['SMB']', '['NFSV3', 'NFSV4']', '['SMB', 'NFSV3']' and '['SMB', 'NFSV4']'. Possible values: ["NFSV3", "NFSV4", "SMB", "ISCSI"]`,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,
-					ValidateFunc: verify.ValidateEnum([]string{"NFSV3", "NFSV4", "SMB"}),
+					ValidateFunc: verify.ValidateEnum([]string{"NFSV3", "NFSV4", "SMB", "ISCSI"}),
 				},
 			},
-			"share_name": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: `Share name (SMB) or export path (NFS) of the volume. Needs to be unique per location.`,
-			},
 			"storage_pool": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -125,6 +142,63 @@ Format: 'projects/{{projectId}}/locations/{{location}}/backupVaults/{{backupVaul
 					},
 				},
 			},
+			"block_devices": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Description: `Block device represents the device(s) which are stored in the block volume.
+Currently, only one block device is permitted per Volume.`,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"os_type": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ForceNew:     true,
+							ValidateFunc: verify.ValidateEnum([]string{"LINUX", "WINDOWS", "ESXI"}),
+							Description: `The OS type of the volume.
+This field can't be changed after the block device is created. Possible values: ["LINUX", "WINDOWS", "ESXI"]`,
+						},
+						"host_groups": {
+							Type:             schema.TypeList,
+							Computed:         true,
+							Optional:         true,
+							DiffSuppressFunc: ProjectIDDiffSuppress,
+							Description: `A list of host groups that identify hosts that can mount the block volume.
+Format:
+'projects/{project_id}/locations/{location}/hostGroups/{host_group_id}'
+This field can be updated after the block device is created.`,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+							Optional: true,
+							Description: `User-defined name for the block device, unique within the Volume. In case
+no user input is provided, name will be autogenerated in the backend.
+The name must meet the following requirements:
+*   Be between 1 and 255 characters long.
+*   Contain only uppercase or lowercase letters (A-Z, a-z), numbers (0-9),
+    and the following special characters: "-", "_", "}", "{", ".".
+*   Spaces are not allowed.`,
+						},
+						"identifier": {
+							Type:     schema.TypeString,
+							Computed: true,
+							Description: `Device identifier of the Block volume. This represents lun_serial_number
+for ISCSI volumes`,
+						},
+						"size_gib": {
+							Type:     schema.TypeInt,
+							Computed: true,
+							Description: `The size of the block device in GiB.
+Any value provided in this field during Volume creation is IGNORED.
+The block device's size is system-managed and will be set to match
+the parent Volume's 'capacity_gib'.`,
+						},
+					},
+				},
+			},
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -366,6 +440,12 @@ Format: 'projects/{{project}}/locations/{{location}}/volumes/{{volume}}/snapshot
 				Description: `Security Style of the Volume. Use UNIX to use UNIX or NFSV4 ACLs for file permissions.
 Use NTFS to use NTFS ACLs for file permissions. Can only be set for volumes which use SMB together with NFS as protocol. Possible values: ["NTFS", "UNIX"]`,
 			},
+			"share_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: `Share name (SMB) or export path (NFS) of the volume. Needs to be unique per location.`,
+			},
 			"smb_settings": {
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -833,6 +913,12 @@ func resourceNetappVolumeCreate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("throughput_mibps"); !tpgresource.IsEmptyValue(reflect.ValueOf(throughputMibpsProp)) && (ok || !reflect.DeepEqual(v, throughputMibpsProp)) {
 		obj["throughputMibps"] = throughputMibpsProp
 	}
+	blockDevicesProp, err := expandNetappVolumeBlockDevices(d.Get("block_devices"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("block_devices"); !tpgresource.IsEmptyValue(reflect.ValueOf(blockDevicesProp)) && (ok || !reflect.DeepEqual(v, blockDevicesProp)) {
+		obj["blockDevices"] = blockDevicesProp
+	}
 	effectiveLabelsProp, err := expandNetappVolumeEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -1055,6 +1141,9 @@ func resourceNetappVolumeRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("hot_tier_size_used_gib", flattenNetappVolumeHotTierSizeUsedGib(res["hotTierSizeUsedGib"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Volume: %s", err)
 	}
+	if err := d.Set("block_devices", flattenNetappVolumeBlockDevices(res["blockDevices"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Volume: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetappVolumeTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Volume: %s", err)
 	}
@@ -1165,6 +1254,12 @@ func resourceNetappVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("throughput_mibps"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, throughputMibpsProp)) {
 		obj["throughputMibps"] = throughputMibpsProp
 	}
+	blockDevicesProp, err := expandNetappVolumeBlockDevices(d.Get("block_devices"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("block_devices"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, blockDevicesProp)) {
+		obj["blockDevices"] = blockDevicesProp
+	}
 	effectiveLabelsProp, err := expandNetappVolumeEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -1241,6 +1336,10 @@ func resourceNetappVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 		updateMask = append(updateMask, "throughputMibps")
 	}
 
+	if d.HasChange("block_devices") {
+		updateMask = append(updateMask, "blockDevices")
+	}
+
 	if d.HasChange("effective_labels") {
 		updateMask = append(updateMask, "labels")
 	}
@@ -1250,6 +1349,38 @@ func resourceNetappVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
+	// remove sizeGib and identifier from the update request for block_devices
+
+	if v, ok := d.GetOk("block_devices"); ok {
+
+		l := v.([]interface{})
+		newBlockDevices := make([]interface{}, 0, len(l))
+
+		for _, item := range v.([]interface{}) {
+			if item == nil {
+				continue
+			}
+			blockDevice := item.(map[string]interface{})
+			newblockDevice := make(map[string]interface{})
+
+			if val, exists := blockDevice["name"]; exists {
+				newblockDevice["name"] = val
+			}
+			if val, exists := blockDevice["host_groups"]; exists {
+				newblockDevice["host_groups"] = val
+			}
+			if val, exists := blockDevice["os_type"]; exists {
+				newblockDevice["os_type"] = val
+			}
+
+			newBlockDevices = append(newBlockDevices, newblockDevice)
+		}
+
+		log.Printf("newBlockDevices %v", newBlockDevices)
+		if len(newBlockDevices) > 0 {
+			obj["blockDevices"] = newBlockDevices
+		}
+	}
 
 	// err == nil indicates that the billing_project value was found
 	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -2108,6 +2239,61 @@ func flattenNetappVolumeHotTierSizeUsedGib(v interface{}, d *schema.ResourceData
 	return v
 }
 
+func flattenNetappVolumeBlockDevices(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	l := v.([]interface{})
+	transformed := make([]interface{}, 0, len(l))
+	for _, raw := range l {
+		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
+		transformed = append(transformed, map[string]interface{}{
+			"name":        flattenNetappVolumeBlockDevicesName(original["name"], d, config),
+			"host_groups": flattenNetappVolumeBlockDevicesHostGroups(original["hostGroups"], d, config),
+			"identifier":  flattenNetappVolumeBlockDevicesIdentifier(original["identifier"], d, config),
+			"size_gib":    flattenNetappVolumeBlockDevicesSizeGib(original["sizeGib"], d, config),
+			"os_type":     flattenNetappVolumeBlockDevicesOsType(original["osType"], d, config),
+		})
+	}
+	return transformed
+}
+func flattenNetappVolumeBlockDevicesName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetappVolumeBlockDevicesHostGroups(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetappVolumeBlockDevicesIdentifier(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetappVolumeBlockDevicesSizeGib(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	// Handles the string fixed64 format
+	if strVal, ok := v.(string); ok {
+		if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
+			return intVal
+		}
+	}
+
+	// number values are represented as float64
+	if floatVal, ok := v.(float64); ok {
+		intVal := int(floatVal)
+		return intVal
+	}
+
+	return v // let terraform core handle it otherwise
+}
+
+func flattenNetappVolumeBlockDevicesOsType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetappVolumeTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -2899,6 +3085,79 @@ func expandNetappVolumeThroughputMibps(v interface{}, d tpgresource.TerraformRes
 	return v, nil
 }
 
+func expandNetappVolumeBlockDevices(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	if v == nil {
+		return nil, nil
+	}
+	l := v.([]interface{})
+	req := make([]interface{}, 0, len(l))
+	for _, raw := range l {
+		if raw == nil {
+			continue
+		}
+		original := raw.(map[string]interface{})
+		transformed := make(map[string]interface{})
+
+		transformedName, err := expandNetappVolumeBlockDevicesName(original["name"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedName); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["name"] = transformedName
+		}
+
+		transformedHostGroups, err := expandNetappVolumeBlockDevicesHostGroups(original["host_groups"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedHostGroups); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["hostGroups"] = transformedHostGroups
+		}
+
+		transformedIdentifier, err := expandNetappVolumeBlockDevicesIdentifier(original["identifier"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedIdentifier); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["identifier"] = transformedIdentifier
+		}
+
+		transformedSizeGib, err := expandNetappVolumeBlockDevicesSizeGib(original["size_gib"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedSizeGib); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["sizeGib"] = transformedSizeGib
+		}
+
+		transformedOsType, err := expandNetappVolumeBlockDevicesOsType(original["os_type"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedOsType); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["osType"] = transformedOsType
+		}
+
+		req = append(req, transformed)
+	}
+	return req, nil
+}
+
+func expandNetappVolumeBlockDevicesName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandNetappVolumeBlockDevicesHostGroups(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandNetappVolumeBlockDevicesIdentifier(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandNetappVolumeBlockDevicesSizeGib(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandNetappVolumeBlockDevicesOsType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandNetappVolumeEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google-beta/services/netapp/resource_netapp_volume_generated_meta.yaml

@@ -9,6 +9,11 @@ fields:
   - api_field: 'backupConfig.backupPolicies'
   - api_field: 'backupConfig.backupVault'
   - api_field: 'backupConfig.scheduledBackupEnabled'
+  - api_field: 'blockDevices.hostGroups'
+  - api_field: 'blockDevices.identifier'
+  - api_field: 'blockDevices.name'
+  - api_field: 'blockDevices.osType'
+  - api_field: 'blockDevices.sizeGib'
   - api_field: 'capacityGib'
   - api_field: 'coldTierSizeGib'
   - api_field: 'createTime'