Update tests for volume resizing

Author: kilokahn

docs/core/volumes.md

@@ -6,7 +6,7 @@
 
 The following attributes are exported:
 
-* `availability_domain` - The Availability Domain of the volume.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - The availability domain of the volume.  Example: `Uocm:PHX-AD-1` 
 * `compartment_id` - The OCID of the compartment that contains the volume.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
@@ -15,7 +15,7 @@ The following attributes are exported:
 * `is_hydrated` - Specifies whether the cloned volume's data has finished copying from the source volume or backup.
 * `size_in_gbs` - The size of the volume in GBs.
 * `size_in_mbs` - The size of the volume in MBs. This field is deprecated. Use `size_in_gbs` instead.
-* `source_details` - The volume source, either an existing volume in the same Availability Domain or a volume backup. If null, an empty volume is created. 
+* `source_details` - The volume source, either an existing volume in the same availability domain or a volume backup. If null, an empty volume is created. 
 	* `id` - The OCID of the volume or volume backup.
 	* `type` - The type of volume source. It should be set to either `volumeBackup` or `volume`.
 * `state` - The current state of a volume.
@@ -30,11 +30,11 @@ Creates a new volume in the specified compartment. Volumes can be created in siz
 For general information about block volumes, see
 [Overview of Block Volume Service](https://docs.us-phoenix-1.oraclecloud.com/Content/Block/Concepts/overview.htm).
 
-A volume and instance can be in separate compartments but must be in the same Availability Domain.
+A volume and instance can be in separate compartments but must be in the same availability domain.
 For information about access control and compartments, see
 [Overview of the IAM Service](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/overview.htm). For information about
-Availability Domains, see [Regions and Availability Domains](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/regions.htm).
-To get a list of Availability Domains, use the `ListAvailabilityDomains` operation
+availability domains, see [Regions and Availability Domains](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/regions.htm).
+To get a list of availability domains, use the `ListAvailabilityDomains` operation
 in the Identity and Access Management Service API.
 
 You may optionally specify a *display name* for the volume, which is simply a friendly name or
@@ -43,15 +43,15 @@ description. It does not have to be unique, and you can change it. Avoid enterin
 
 The following arguments are supported:
 
-* `availability_domain` - (Required) The Availability Domain of the volume.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - (Required) The availability domain of the volume.  Example: `Uocm:PHX-AD-1` 
 * `backup_policy_id` - (Optional) If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned. 
 * `compartment_id` - (Required) The OCID of the compartment that contains the volume.
 * `defined_tags` - (Optional) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
 * `display_name` - (Optional) A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - (Optional) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `size_in_gbs` - (Optional) The size of the volume in GBs.
 * `size_in_mbs` - (Optional) The size of the volume in MBs. The value must be a multiple of 1024. This field is deprecated. Use sizeInGBs instead. 
-* `source_details` - (Optional) Specifies the volume source details for a new Block volume. The volume source is either another Block volume in the same Availability Domain or a Block volume backup. This is an optional field. If not specified or set to null, the new Block volume will be empty. When specified, the new Block volume will contain data from the source volume or backup. 
+* `source_details` - (Optional) Specifies the volume source details for a new Block volume. The volume source is either another Block volume in the same availability domain or a Block volume backup. This is an optional field. If not specified or set to null, the new Block volume will be empty. When specified, the new Block volume will contain data from the source volume or backup. 
 	* `id` - (Required) The OCID of the volume or volume backup.
 	* `type` - (Required) The type of volume source. It should be set to either `volumeBackup` or `volume`.
 * `volume_backup_id` - (Optional) The OCID of the volume backup from which the data should be restored on the newly created volume. This field is deprecated. Use the `source_details` field instead to specify the backup for the volume. 
@@ -66,6 +66,7 @@ The following arguments support updates:
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
+* `size_in_gbs` - The size of the volume in GBs.
 
 
 ** IMPORTANT **
@@ -101,11 +102,11 @@ resource "oci_core_volume" "test_volume" {
 Gets a list of volumes.
 
 ### List Operation
-Lists the volumes in the specified compartment and Availability Domain.
+Lists the volumes in the specified compartment and availability domain.
 
 The following arguments are supported:
 
-* `availability_domain` - (Optional) The name of the Availability Domain.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - (Optional) The name of the availability domain.  Example: `Uocm:PHX-AD-1` 
 * `compartment_id` - (Required) The OCID of the compartment.
 * `display_name` - (Optional) A filter to return only resources that match the given display name exactly. 
 * `state` - (Optional) A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive. 

oci/core_volume_resource.go

@@ -67,7 +67,6 @@ func VolumeResource() *schema.Resource {
 				Type:             schema.TypeString,
 				Optional:         true,
 				Computed:         true,
-				ForceNew:         true,
 				ValidateFunc:     validateInt64TypeString,
 				DiffSuppressFunc: int64StringDiffSuppressFunction,
 			},
@@ -209,6 +208,18 @@ func (s *VolumeResourceCrud) DeletedTarget() []string {
 	}
 }
 
+func (s *VolumeResourceCrud) UpdatedPending() []string {
+	return []string{
+		string(oci_core.VolumeLifecycleStateProvisioning),
+	}
+}
+
+func (s *VolumeResourceCrud) UpdatedTarget() []string {
+	return []string{
+		string(oci_core.VolumeLifecycleStateAvailable),
+	}
+}
+
 func (s *VolumeResourceCrud) Create() error {
 	request := oci_core.CreateVolumeRequest{}
 
@@ -331,6 +342,15 @@ func (s *VolumeResourceCrud) Update() error {
 		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if sizeInGBs, ok := s.D.GetOkExists("size_in_gbs"); ok {
+		tmp := sizeInGBs.(string)
+		tmpInt64, err := strconv.ParseInt(tmp, 10, 64)
+		if err != nil {
+			return fmt.Errorf("unable to convert sizeInGBs string: %s to an int64 and encountered error: %v", tmp, err)
+		}
+		request.SizeInGBs = &tmpInt64
+	}
+
 	tmp := s.D.Id()
 	request.VolumeId = &tmp
 

oci/core_volume_test.go

@@ -47,7 +47,7 @@ resource "oci_core_volume" "test_volume" {
 variable "volume_defined_tags_value" { default = "value" }
 variable "volume_display_name" { default = "displayName" }
 variable "volume_freeform_tags" { default = {"Department"= "Finance"} }
-variable "volume_size_in_gbs" { default = 50 }
+variable "volume_size_in_gbs" { default = 51 }
 variable "volume_source_details_type" { default = "volume" }
 variable "volume_state" { default = "AVAILABLE" }
 
@@ -127,8 +127,8 @@ func TestCoreVolumeResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "size_in_gbs", "50"),
-					resource.TestCheckResourceAttr(resourceName, "size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(resourceName, "size_in_gbs", "51"),
+					resource.TestCheckResourceAttr(resourceName, "size_in_mbs", "52224"),
 					resource.TestCheckResourceAttr(resourceName, "source_details.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "source_details.0.type", "volume"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -149,7 +149,7 @@ func TestCoreVolumeResource_basic(t *testing.T) {
 variable "volume_defined_tags_value" { default = "updatedValue" }
 variable "volume_display_name" { default = "displayName2" }
 variable "volume_freeform_tags" { default = {"Department"= "Accounting"} }
-variable "volume_size_in_gbs" { default = 50 }
+variable "volume_size_in_gbs" { default = 52 }
 variable "volume_source_details_type" { default = "volume" }
 variable "volume_state" { default = "AVAILABLE" }
 
@@ -162,8 +162,8 @@ variable "volume_state" { default = "AVAILABLE" }
 					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "size_in_gbs", "50"),
-					resource.TestCheckResourceAttr(resourceName, "size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(resourceName, "size_in_gbs", "52"),
+					resource.TestCheckResourceAttr(resourceName, "size_in_mbs", "53248"),
 					resource.TestCheckResourceAttr(resourceName, "source_details.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "source_details.0.type", "volume"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -186,7 +186,7 @@ variable "volume_state" { default = "AVAILABLE" }
 variable "volume_defined_tags_value" { default = "updatedValue" }
 variable "volume_display_name" { default = "displayName2" }
 variable "volume_freeform_tags" { default = {"Department"= "Accounting"} }
-variable "volume_size_in_gbs" { default = 50 }
+variable "volume_size_in_gbs" { default = 52 }
 variable "volume_source_details_type" { default = "volume" }
 variable "volume_state" { default = "AVAILABLE" }
 
@@ -221,8 +221,8 @@ data "oci_core_volumes" "test_volumes" {
 					resource.TestCheckResourceAttr(datasourceName, "volumes.0.display_name", "displayName2"),
 					resource.TestCheckResourceAttr(datasourceName, "volumes.0.freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "volumes.0.id"),
-					resource.TestCheckResourceAttr(datasourceName, "volumes.0.size_in_gbs", "50"),
-					resource.TestCheckResourceAttr(datasourceName, "volumes.0.size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(datasourceName, "volumes.0.size_in_gbs", "52"),
+					resource.TestCheckResourceAttr(datasourceName, "volumes.0.size_in_mbs", "53248"),
 					resource.TestCheckResourceAttrSet(datasourceName, "volumes.0.state"),
 					resource.TestCheckResourceAttrSet(datasourceName, "volumes.0.time_created"),
 				),

website/docs/d/core_volumes.html.markdown

@@ -9,7 +9,7 @@ description: |-
 # Data Source: oci_core_volumes
 The `oci_core_volumes` data source allows access to the list of OCI volumes
 
-Lists the volumes in the specified compartment and Availability Domain.
+Lists the volumes in the specified compartment and availability domain.
 
 
 ## Example Usage
@@ -31,7 +31,7 @@ data "oci_core_volumes" "test_volumes" {
 
 The following arguments are supported:
 
-* `availability_domain` - (Optional) The name of the Availability Domain.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - (Optional) The name of the availability domain.  Example: `Uocm:PHX-AD-1` 
 * `compartment_id` - (Required) The OCID of the compartment.
 * `display_name` - (Optional) A filter to return only resources that match the given display name exactly. 
 * `state` - (Optional) A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive. 
@@ -48,7 +48,7 @@ The following attributes are exported:
 
 The following attributes are exported:
 
-* `availability_domain` - The Availability Domain of the volume.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - The availability domain of the volume.  Example: `Uocm:PHX-AD-1` 
 * `compartment_id` - The OCID of the compartment that contains the volume.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
@@ -57,7 +57,7 @@ The following attributes are exported:
 * `is_hydrated` - Specifies whether the cloned volume's data has finished copying from the source volume or backup.
 * `size_in_gbs` - The size of the volume in GBs.
 * `size_in_mbs` - The size of the volume in MBs. This field is deprecated. Use `size_in_gbs` instead.
-* `source_details` - The volume source, either an existing volume in the same Availability Domain or a volume backup. If null, an empty volume is created. 
+* `source_details` - The volume source, either an existing volume in the same availability domain or a volume backup. If null, an empty volume is created. 
 	* `id` - The OCID of the volume or volume backup.
 	* `type` - The type of volume source. It should be set to either `volumeBackup` or `volume`.
 * `state` - The current state of a volume.