add attribute to resource (#158)

Author: wangrzneu

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.38.2 (2023-09-27)
+
+FEATURES:
+
+* add `reboot_instance_for_resizing` attribute to `ucloud_disk` resource
+
 ## 1.38.1 (2023-09-03)
 
 FEATURES:

examples/rssd/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     ucloud = {
       source = "ucloud/ucloud"
-      version = "~>1.38.1"
+      version = "~>1.38.2"
     }
   }
 }

ucloud/config.go

@@ -72,7 +72,7 @@ func (c *Config) Client() (*UCloudClient, error) {
 	// enable auto retry with http/connection error
 	cfg.MaxRetries = c.MaxRetries
 	cfg.LogLevel = log.PanicLevel
-	cfg.UserAgent = "Terraform-UCloud/1.38.1"
+	cfg.UserAgent = "Terraform-UCloud/1.38.2"
 	cfg.BaseUrl = c.BaseURL
 
 	cred := auth.NewCredential()

ucloud/resource_ucloud_disk.go

@@ -85,6 +85,12 @@ func resourceUCloudDisk() *schema.Resource {
 				StateFunc:    stateFuncTag,
 			},
 
+			"reboot_instance_for_resizing": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
+
 			"create_time": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -199,33 +205,38 @@ func resourceUCloudDiskUpdate(d *schema.ResourceData, meta interface{}) error {
 			}
 			return fmt.Errorf("error on reading disk %q, %s", d.Id(), err)
 		}
-
+		allowRebootInstance := false
+		if reboot, ok := d.Get("reboot_instance_for_resizing").(bool); reboot || !ok {
+			allowRebootInstance = true
+		}
 		if diskSet.UHostId != "" {
 			uhostId := diskSet.UHostId
 			instance, err := client.describeInstanceById(uhostId)
 			if err != nil {
 				return fmt.Errorf("error on reading instance %q when updating the size of disk %q, %s", uhostId, d.Id(), err)
 			}
-			if instance.State != statusStopped {
-				stopReq := uhostConn.NewStopUHostInstanceRequest()
-				stopReq.UHostId = ucloud.String(uhostId)
-				_, err := uhostConn.StopUHostInstance(stopReq)
-				if err != nil {
-					return fmt.Errorf("error on stopping instance %q when updating the size of disk %q, %s", uhostId, d.Id(), err)
-				}
-
-				// after stop instance, we need to wait it stopped
-				stateConf := &resource.StateChangeConf{
-					Pending:    []string{statusPending},
-					Target:     []string{statusStopped},
-					Refresh:    instanceStateRefreshFunc(client, uhostId, statusStopped),
-					Timeout:    15 * time.Minute,
-					Delay:      3 * time.Second,
-					MinTimeout: 2 * time.Second,
-				}
-
-				if _, err = stateConf.WaitForState(); err != nil {
-					return fmt.Errorf("error on waiting for stopping instance %q when updating the size of disk %q, %s", uhostId, d.Id(), err)
+			if allowRebootInstance {
+				if instance.State != statusStopped {
+					stopReq := uhostConn.NewStopUHostInstanceRequest()
+					stopReq.UHostId = ucloud.String(uhostId)
+					_, err := uhostConn.StopUHostInstance(stopReq)
+					if err != nil {
+						return fmt.Errorf("error on stopping instance %q when updating the size of disk %q, %s", uhostId, d.Id(), err)
+					}
+
+					// after stop instance, we need to wait it stopped
+					stateConf := &resource.StateChangeConf{
+						Pending:    []string{statusPending},
+						Target:     []string{statusStopped},
+						Refresh:    instanceStateRefreshFunc(client, uhostId, statusStopped),
+						Timeout:    15 * time.Minute,
+						Delay:      3 * time.Second,
+						MinTimeout: 2 * time.Second,
+					}
+
+					if _, err = stateConf.WaitForState(); err != nil {
+						return fmt.Errorf("error on waiting for stopping instance %q when updating the size of disk %q, %s", uhostId, d.Id(), err)
+					}
 				}
 			}
 
@@ -250,31 +261,32 @@ func resourceUCloudDiskUpdate(d *schema.ResourceData, meta interface{}) error {
 			if err != nil {
 				return fmt.Errorf("error on reading instance %q c %q, %s", uhostId, d.Id(), err)
 			}
-
-			if instanceAfter.State != statusRunning {
-				// after instance update, we need to wait it started
-				startReq := uhostConn.NewStartUHostInstanceRequest()
-				startReq.UHostId = ucloud.String(uhostId)
-
-				if _, err := uhostConn.StartUHostInstance(startReq); err != nil {
-					return fmt.Errorf("error on starting instance %q after updating the size of disk %q, %s", uhostId, d.Id(), err)
-				}
-
-				stateConf = &resource.StateChangeConf{
-					Pending:    []string{statusPending},
-					Target:     []string{statusRunning},
-					Refresh:    instanceStateRefreshFunc(client, uhostId, statusRunning),
-					Timeout:    15 * time.Minute,
-					Delay:      3 * time.Second,
-					MinTimeout: 2 * time.Second,
-				}
-
-				if _, err = stateConf.WaitForState(); err != nil {
-					return fmt.Errorf("error on waiting for starting instance %q after updating the size of disk %q, %s", uhostId, d.Id(), err)
+			if allowRebootInstance {
+				if instanceAfter.State != statusRunning {
+					// after instance update, we need to wait it started
+					startReq := uhostConn.NewStartUHostInstanceRequest()
+					startReq.UHostId = ucloud.String(uhostId)
+
+					if _, err := uhostConn.StartUHostInstance(startReq); err != nil {
+						return fmt.Errorf("error on starting instance %q after updating the size of disk %q, %s", uhostId, d.Id(), err)
+					}
+
+					stateConf = &resource.StateChangeConf{
+						Pending:    []string{statusPending},
+						Target:     []string{statusRunning},
+						Refresh:    instanceStateRefreshFunc(client, uhostId, statusRunning),
+						Timeout:    15 * time.Minute,
+						Delay:      3 * time.Second,
+						MinTimeout: 2 * time.Second,
+					}
+
+					if _, err = stateConf.WaitForState(); err != nil {
+						return fmt.Errorf("error on waiting for starting instance %q after updating the size of disk %q, %s", uhostId, d.Id(), err)
+					}
+
+					// Executing DetachUDisk immediately after starting up the instance will cause an error, this sleep to avoid this error
+					time.Sleep(3 * time.Second)
 				}
-
-				// Executing DetachUDisk immediately after starting up the instance will cause an error, this sleep to avoid this error
-				time.Sleep(3 * time.Second)
 			}
 		} else {
 			req := conn.NewResizeUDiskRequest()

website/docs/index.html.markdown

@@ -23,7 +23,7 @@ terraform {
   required_providers {
     ucloud = {
       source = "ucloud/ucloud"
-      version = "~>1.38.1"
+      version = "~>1.38.2"
     }
   }
 }
@@ -91,7 +91,7 @@ terraform {
   required_providers {
     ucloud = {
       source = "ucloud/ucloud"
-      version = "~>1.38.1"
+      version = "~>1.38.2"
     }
   }
 }

website/docs/r/disk.html.markdown

@@ -10,7 +10,7 @@ description: |-
 
 Provides a Cloud Disk resource.
 
-~> **Note** If the disk have attached to the instance, the instance will reboot automatically to make the change take effect when update the  `disk_size`.
+~> **Note** If the disk have attached to the instance and reboot_instance_for_resizing is not set to false, the instance will reboot automatically to make the change take effect when update the  `disk_size` by default.
 
 ## Example Usage
 
@@ -35,11 +35,12 @@ The following arguments are supported:
 
 - - -
 
-* `name` - (Optional)  The name of disk, should have 6-63 characters and only support Chinese, English, numbers, '-', '_'. If not specified, terraform will auto-generate a name beginning with `tf-disk`.
+* `name` - (Optional) The name of disk, should have 6-63 characters and only support Chinese, English, numbers, '-', '_'. If not specified, terraform will auto-generate a name beginning with `tf-disk`.
 * `disk_type` - (Optional, ForceNew) The type of disk. Possible values are: `data_disk`as cloud disk, `ssd_data_disk` as ssd cloud disk, `rssd_data_disk` as RDMA-SSD cloud disk.(Default: `data_disk`).
 * `charge_type` - (Optional, ForceNew) Charge type of disk. Possible values are: `year` as pay by year, `month` as pay by month, `dynamic` as pay by hour. (Default: `month`).
 * `duration` - (Optional, ForceNew) The duration that you will buy the resource. (Default: `1`). It is not required when `dynamic` (pay by hour), the value is `0` when `month`(pay by month) and the disk will be vaild till the last day of that month.
 * `tag` - (Optional, ForceNew) A tag assigned to VPC, which contains at most 63 characters and only support Chinese, English, numbers, '-', '_', and '.'. If it is not filled in or a empty string is filled in, then default tag will be assigned. (Default: `Default`).
+* `reboot_instance_for_resizing` - (Optional) Whether the attached instance of the disk will be rebooted automatically to make the change take effect when update the  `disk_size`. (Default: `"true"`).
 
 ## Attributes Reference
 

website/docs/r/lb.html.markdown

@@ -23,7 +23,7 @@ resource "ucloud_lb" "web" {
 
 The following arguments are supported:
 
-* `internal` - (Optional, ForceNew) Indicate whether the load balancer is intranet mode.(Default: `"false"`)
+* `internal` - (Optional, ForceNew) Indicate whether the load balancer is intranet mode. (Default: `"false"`)
 * `name` - (Optional) The name of the load balancer. If not specified, terraform will auto-generate a name beginning with `tf-lb`.
 * `charge_type` - (**Deprecated**, ForceNew), argument `charge_type` is deprecated for optimizing parameters.
 * `vpc_id` - (Optional, ForceNew) The ID of the VPC linked to the Load balancer, This argument is not required if default VPC.