update resource tencentcloud_instance to support modifying cdh_instance_type

ChrisdeR · ChrisdeR · commit 1a0d4585a88c · 2021-04-01T16:47:49.000+08:00
diff --git a/examples/tencentcloud-cdh/main.tf b/examples/tencentcloud-cdh/main.tf
@@ -1,15 +1,14 @@
-data "tencentcloud_images" "my_favorate_image" {
-  image_type = ["PUBLIC_IMAGE"]
-  os_name    = var.os_name
+provider "tencentcloud" {
+  region = "ap-shanghai"
 }
 
 resource "tencentcloud_cdh_instance" "foo" {
   availability_zone = var.availability_zone
-  host_type = "HC20"
+  host_type = "HM50"
   charge_type = "PREPAID"
   prepaid_period = 1
   host_name = "test"
-  prepaid_renew_flag = "NOTIFY_AND_MANUAL_RENEW"
+  prepaid_renew_flag = "DISABLE_NOTIFY_AND_MANUAL_RENEW"
 }
 
 data "tencentcloud_cdh_instances" "list" {
@@ -24,17 +23,33 @@ resource "tencentcloud_key_pair" "random_key" {
   public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw=="
 }
 
+resource "tencentcloud_placement_group" "foo" {
+  name = "test"
+  type = "HOST"
+}
+
 resource "tencentcloud_instance" "foo" {
-  instance_name     = var.instance_name
   availability_zone = var.availability_zone
-  image_id          = data.tencentcloud_images.my_favorate_image.images.0.image_id
+  instance_name     = var.instance_name
+  image_id          = var.image_id
+  key_name          = tencentcloud_key_pair.random_key.id
+  placement_group_id = tencentcloud_placement_group.foo.id
+  security_groups               = [var.security_group_id]
+  system_disk_type  = "CLOUD_PREMIUM"
+
   instance_charge_type = "CDHPAID"
   cdh_instance_type     = "CDH_10C10G"
   cdh_host_id = tencentcloud_cdh_instance.foo.id
-  key_name          = tencentcloud_key_pair.random_key.id
-  system_disk_type  = "CLOUD_PREMIUM"
 
+  vpc_id                     = var.vpc_id
+  subnet_id                  = var.subnet_id
   allocate_public_ip    = true
   internet_max_bandwidth_out = 2
-  count                      = 1
+  count                      = 3
+
+  data_disks {
+    data_disk_type = "CLOUD_PREMIUM"
+    data_disk_size = 50
+    encrypt = false
+  }
 }
diff --git a/examples/tencentcloud-cdh/variables.tf b/examples/tencentcloud-cdh/variables.tf
@@ -1,11 +1,23 @@
 variable "availability_zone" {
-  default = "ap-guangzhou-3"
+  default = "ap-shanghai-4"
 }
 
 variable "instance_name" {
   default = "terraform-testing"
 }
 
-variable "os_name" {
-  default = "centos"
+variable "image_id" {
+  default = "img-ix05e4px"
+}
+
+variable "security_group_id" {
+  default = "sg-9c3f33xk"
+}
+
+variable "vpc_id" {
+  default = "vpc-31zmeluu"
+}
+
+variable "subnet_id" {
+  default = "subnet-aujc02np"
 }
diff --git a/tencentcloud/resource_tc_instance.go b/tencentcloud/resource_tc_instance.go
@@ -67,6 +67,65 @@ resource "tencentcloud_instance" "my_awesome_app" {
 }
 ```
 
+Create CVM instance based on CDH
+```hcl
+variable "availability_zone" {
+  default = "ap-shanghai-4"
+}
+
+resource "tencentcloud_cdh_instance" "foo" {
+  availability_zone = var.availability_zone
+  host_type = "HM50"
+  charge_type = "PREPAID"
+  prepaid_period = 1
+  host_name = "test"
+  prepaid_renew_flag = "DISABLE_NOTIFY_AND_MANUAL_RENEW"
+}
+
+data "tencentcloud_cdh_instances" "list" {
+  availability_zone = var.availability_zone
+  host_id = tencentcloud_cdh_instance.foo.id
+  host_name = "test"
+  host_state = "RUNNING"
+}
+
+resource "tencentcloud_key_pair" "random_key" {
+  key_name   = "tf_example_key6"
+  public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw=="
+}
+
+resource "tencentcloud_placement_group" "foo" {
+  name = "test"
+  type = "HOST"
+}
+
+resource "tencentcloud_instance" "foo" {
+  availability_zone = var.availability_zone
+  instance_name     = "terraform-testing"
+  image_id          = "img-ix05e4px"
+  key_name          = tencentcloud_key_pair.random_key.id
+  placement_group_id = tencentcloud_placement_group.foo.id
+  security_groups               = ["sg-9c3f33xk"]
+  system_disk_type  = "CLOUD_PREMIUM"
+
+  instance_charge_type = "CDHPAID"
+  cdh_instance_type     = "CDH_10C10G"
+  cdh_host_id = tencentcloud_cdh_instance.foo.id
+
+  vpc_id                     = "vpc-31zmeluu"
+  subnet_id                  = "subnet-aujc02np"
+  allocate_public_ip    = true
+  internet_max_bandwidth_out = 2
+  count                      = 3
+
+  data_disks {
+    data_disk_type = "CLOUD_PREMIUM"
+    data_disk_size = 50
+    encrypt = false
+  }
+}
+```
+
 Import
 
 CVM instance can be imported using the id, e.g.
@@ -199,6 +258,7 @@ func resourceTencentCloudInstance() *schema.Resource {
 			"cdh_host_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 				Description: "Id of cdh instance. Note: it only works when instance_charge_type is set to `CDHPAID`.",
 			},
 			// network
@@ -816,6 +876,10 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	_ = d.Set("expired_time", instance.ExpiredTime)
 	_ = d.Set("cam_role_name", instance.CamRoleName)
 
+	if *instance.InstanceChargeType == CVM_CHARGE_TYPE_CDHPAID {
+		_ = d.Set("cdh_instance_type", instance.InstanceType)
+	}
+
 	if _, ok := d.GetOkExists("allocate_public_ip"); !ok {
 		_ = d.Set("allocate_public_ip", len(instance.PublicIpAddresses) > 0)
 	}
@@ -1063,6 +1127,32 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 		}
 	}
 
+	if d.HasChange("cdh_instance_type") {
+		err := cvmService.ModifyInstanceType(ctx, instanceId, d.Get("cdh_instance_type").(string))
+		if err != nil {
+			return err
+		}
+		d.SetPartial("cdh_instance_type")
+
+		// wait for status
+		err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
+			instance, errRet := cvmService.DescribeInstanceById(ctx, instanceId)
+			if errRet != nil {
+				return retryError(errRet, InternalError)
+			}
+			// Modifying instance type need restart the instance
+			// so status of CVM must be running when running flag is true
+			if instance != nil && (*instance.LatestOperationState == CVM_LATEST_OPERATION_STATE_OPERATING ||
+				(flag && *instance.InstanceState != CVM_STATUS_RUNNING)) {
+				return resource.RetryableError(fmt.Errorf("cvm instance latest operetion status is %s, retry...", *instance.LatestOperationState))
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+	}
+
 	if d.HasChange("password") {
 		err := cvmService.ModifyPassword(ctx, instanceId, d.Get("password").(string))
 		if err != nil {
diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown
@@ -77,6 +77,66 @@ resource "tencentcloud_instance" "my_awesome_app" {
 }
 ```
 
+Create CVM instance based on CDH
+
+```hcl
+variable "availability_zone" {
+  default = "ap-shanghai-4"
+}
+
+resource "tencentcloud_cdh_instance" "foo" {
+  availability_zone  = var.availability_zone
+  host_type          = "HM50"
+  charge_type        = "PREPAID"
+  prepaid_period     = 1
+  host_name          = "test"
+  prepaid_renew_flag = "DISABLE_NOTIFY_AND_MANUAL_RENEW"
+}
+
+data "tencentcloud_cdh_instances" "list" {
+  availability_zone = var.availability_zone
+  host_id           = tencentcloud_cdh_instance.foo.id
+  host_name         = "test"
+  host_state        = "RUNNING"
+}
+
+resource "tencentcloud_key_pair" "random_key" {
+  key_name   = "tf_example_key6"
+  public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw=="
+}
+
+resource "tencentcloud_placement_group" "foo" {
+  name = "test"
+  type = "HOST"
+}
+
+resource "tencentcloud_instance" "foo" {
+  availability_zone  = var.availability_zone
+  instance_name      = "terraform-testing"
+  image_id           = "img-ix05e4px"
+  key_name           = tencentcloud_key_pair.random_key.id
+  placement_group_id = tencentcloud_placement_group.foo.id
+  security_groups    = ["sg-9c3f33xk"]
+  system_disk_type   = "CLOUD_PREMIUM"
+
+  instance_charge_type = "CDHPAID"
+  cdh_instance_type    = "CDH_10C10G"
+  cdh_host_id          = tencentcloud_cdh_instance.foo.id
+
+  vpc_id                     = "vpc-31zmeluu"
+  subnet_id                  = "subnet-aujc02np"
+  allocate_public_ip         = true
+  internet_max_bandwidth_out = 2
+  count                      = 3
+
+  data_disks {
+    data_disk_type = "CLOUD_PREMIUM"
+    data_disk_size = 50
+    encrypt        = false
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -85,7 +145,7 @@ The following arguments are supported:
 * `image_id` - (Required, ForceNew) The image to use for the instance. Changing `image_id` will cause the instance to be destroyed and re-created.
 * `allocate_public_ip` - (Optional, ForceNew) Associate a public IP address with an instance in a VPC or Classic. Boolean value, Default is false.
 * `cam_role_name` - (Optional, ForceNew) CAM role name authorized to access.
-* `cdh_host_id` - (Optional) Id of cdh instance. Note: it only works when instance_charge_type is set to `CDHPAID`.
+* `cdh_host_id` - (Optional, ForceNew) Id of cdh instance. Note: it only works when instance_charge_type is set to `CDHPAID`.
 * `cdh_instance_type` - (Optional) Type of instance created on cdh, the value of this parameter is in the format of CDH_XCXG based on the number of CPU cores and memory capacity. Note: it only works when instance_charge_type is set to `CDHPAID`.
 * `data_disks` - (Optional, ForceNew) Settings for data disks.
 * `disable_monitor_service` - (Optional) Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed.
