fix(cvm): [127281125]support ipv6_address_type and release_address (#3518)

* support ipv6_address_type and release_address

* update

* add changelog

---------

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

.changelog/3518.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_instance: support ipv6_address_type, ipv6_address_count and release_address
+```

tencentcloud/services/cvm/resource_tc_instance.go

@@ -205,6 +205,21 @@ func ResourceTencentCloudInstance() *schema.Resource {
 				ValidateFunc: tccommon.ValidateAllowedStringValue([]string{"WanIP", "HighQualityEIP", "AntiDDoSEIP"}),
 				Description:  "AddressType. Default value: WanIP. For beta users of dedicated IP. the value can be: HighQualityEIP: Dedicated IP. Note that dedicated IPs are only available in partial regions. For beta users of Anti-DDoS IP, the value can be: AntiDDoSEIP: Anti-DDoS EIP. Note that Anti-DDoS IPs are only available in partial regions.",
 			},
+			"ipv6_address_type": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				Computed:     true,
+				ValidateFunc: tccommon.ValidateAllowedStringValue([]string{"EIPv6", "HighQualityEIPv6"}),
+				Description:  "IPv6 AddressType. Default value: WanIP. EIPv6: Elastic IPv6; HighQualityEIPv6: Premium IPv6, only China Hong Kong supports premium IPv6. To allocate IPv6 addresses to resources, please specify the Elastic IPv6 type.",
+			},
+			"ipv6_address_count": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Computed:    true,
+				Description: "Specify the number of randomly generated IPv6 addresses for the Elastic Network Interface.",
+			},
 			"anti_ddos_package_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -478,6 +493,11 @@ func ResourceTencentCloudInstance() *schema.Resource {
 				ForceNew:    true,
 				Description: "The instance launch template version number. If given, a new instance launch template will be created based on the given version number.",
 			},
+			"release_address": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: "Release elastic IP. Under EIP 2.0, only the first EIP under the primary network card is provided, and the EIP types are limited to HighQualityEIP, AntiDDoSEIP, EIPv6, and HighQualityEIPv6. Default behavior is not released.",
+			},
 			// Computed values.
 			"instance_status": {
 				Type:        schema.TypeString,
@@ -674,6 +694,11 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		netWorkFlag = true
 	}
 
+	if v, ok := d.GetOk("ipv6_address_type"); ok {
+		internetAccessible.IPv6AddressType = helper.String(v.(string))
+		netWorkFlag = true
+	}
+
 	if v, ok := d.GetOk("anti_ddos_package_id"); ok {
 		internetAccessible.AntiDDoSPackageId = helper.String(v.(string))
 		netWorkFlag = true
@@ -695,6 +720,9 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		if v, ok = d.GetOk("private_ip"); ok {
 			request.VirtualPrivateCloud.PrivateIpAddresses = []*string{helper.String(v.(string))}
 		}
+		if v, ok = d.GetOkExists("ipv6_address_count"); ok {
+			request.VirtualPrivateCloud.Ipv6AddressCount = helper.IntUint64(v.(int))
+		}
 	}
 
 	if v, ok := d.GetOk("security_groups"); ok {
@@ -1192,6 +1220,10 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 			_ = d.Set("ipv4_address_type", instance.InternetAccessible.IPv4AddressType)
 		}
 
+		if instance.InternetAccessible.IPv6AddressType != nil {
+			_ = d.Set("ipv6_address_type", instance.InternetAccessible.IPv6AddressType)
+		}
+
 		if instance.InternetAccessible.AntiDDoSPackageId != nil {
 			_ = d.Set("anti_ddos_package_id", instance.InternetAccessible.AntiDDoSPackageId)
 		}
@@ -1710,6 +1742,10 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 		_ = d.Set("user_data_raw", string(userDataRaw))
 	}
 
+	if instance.VirtualPrivateCloud != nil && instance.VirtualPrivateCloud.Ipv6AddressCount != nil {
+		_ = d.Set("ipv6_address_count", instance.VirtualPrivateCloud.Ipv6AddressCount)
+	}
+
 	return nil
 }
 
@@ -2359,8 +2395,12 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
+	var releaseAddress bool
+	if v, ok := d.GetOkExists("release_address"); ok {
+		releaseAddress = v.(bool)
+	}
 	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		errRet := cvmService.DeleteInstance(ctx, instanceId)
+		errRet := cvmService.DeleteInstance(ctx, instanceId, releaseAddress)
 		if errRet != nil {
 			return tccommon.RetryError(errRet)
 		}
@@ -2510,7 +2550,7 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 
 	// exist in recycle, delete again
 	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		errRet := cvmService.DeleteInstance(ctx, instanceId)
+		errRet := cvmService.DeleteInstance(ctx, instanceId, releaseAddress)
 		//when state is terminating, do not delete but check exist
 		if errRet != nil {
 			//check InvalidInstanceState.Terminating

tencentcloud/services/cvm/resource_tc_instance_test.go

@@ -75,7 +75,7 @@ func testSweepCvmInstance(region string) error {
 			continue
 		}
 
-		if err = cvmService.DeleteInstance(ctx, instanceId); err != nil {
+		if err = cvmService.DeleteInstance(ctx, instanceId, false); err != nil {
 			log.Printf("[ERROR] sweep instance %s error: %s", instanceId, err.Error())
 		}
 	}
@@ -2995,3 +2995,104 @@ resource "tencentcloud_instance" "hpc" {
   hpc_cluster_id    = tencentcloud_cvm_hpc_cluster.hpc_cluster.id
 }
 `
+
+func TestAccTencentCloudNeedFixCvmInstanceResource_IPv6AddressType(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.AccPreCheck(t)
+		},
+		Providers:    acctest.AccProviders,
+		CheckDestroy: testAccCheckCvmInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCvmInstanceResource_IPv6AddressType,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCvmInstanceExists("tencentcloud_instance.foo"),
+					resource.TestCheckResourceAttr("tencentcloud_instance.foo", "ipv6_address_type", "EIPv6"),
+				),
+			},
+		},
+	})
+}
+
+const testAccCvmInstanceResource_IPv6AddressType = `
+data "tencentcloud_instance_types" "default" {
+  filter {
+    name   = "instance-family"
+    values = ["S3"]
+  }
+  cpu_core_count = 2
+  memory_size    = 2
+}
+resource "tencentcloud_instance" "foo" {
+  instance_name                           = "tf-ci-test"
+  availability_zone                       = "ap-guangzhou-3"
+  vpc_id                                  = "vpc-mvhjjprd"
+  subnet_id                               = "subnet-2qfyfvv8"
+  lifecycle {
+    ignore_changes = [instance_type]
+  }
+  image_id          = "img-2lr9q49h"
+  instance_type     = data.tencentcloud_instance_types.default.instance_types.0.instance_type
+  system_disk_type  = "CLOUD_PREMIUM"
+  force_delete      = true
+  orderly_security_groups = ["sg-05f7wnhn"]
+  ipv6_address_type = "EIPv6"
+}
+`
+
+func TestAccTencentCloudNeedFixCvmInstanceResource_ReleaseAddress(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.AccPreCheck(t)
+			tcacctest.AccStepSetRegion(t, "ap-hongkong")
+		},
+		Providers:    acctest.AccProviders,
+		CheckDestroy: testAccCheckCvmInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCvmInstanceResource_ReleaseAddress,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCvmInstanceExists("tencentcloud_instance.foo"),
+					resource.TestCheckResourceAttr("tencentcloud_instance.foo", "ipv4_address_type", "HighQualityEIP"),
+					resource.TestCheckResourceAttr("tencentcloud_instance.foo", "ipv6_address_type", "HighQualityEIPv6"),
+					resource.TestCheckResourceAttr("tencentcloud_instance.foo", "ipv6_address_count", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_instance.foo", "release_address", "true"),
+				),
+			},
+		},
+	})
+}
+
+const testAccCvmInstanceResource_ReleaseAddress = `
+data "tencentcloud_instance_types" "default" {
+  filter {
+    name   = "instance-family"
+    values = ["S5"]
+  }
+  cpu_core_count = 2
+  memory_size    = 2
+}
+
+resource "tencentcloud_instance" "foo" {
+  instance_name     = "tf-ci-test"
+  availability_zone = "ap-hongkong-3"
+  vpc_id            = "vpc-0rlhss58"
+  subnet_id         = "subnet-73ckwxez"
+  lifecycle {
+    ignore_changes = [instance_type]
+  }
+  image_id                   = "img-l8og963d"
+  instance_type              = data.tencentcloud_instance_types.default.instance_types.0.instance_type
+  system_disk_type           = "CLOUD_PREMIUM"
+  force_delete               = true
+  internet_charge_type       = "BANDWIDTH_PACKAGE"
+  bandwidth_package_id       = "bwp-rcql8f4c"
+  ipv4_address_type          = "HighQualityEIP"
+  ipv6_address_type          = "HighQualityEIPv6"
+  ipv6_address_count         = 1
+  allocate_public_ip         = true
+  internet_max_bandwidth_out = 1
+  release_address            = true
+}
+`

tencentcloud/services/cvm/service_tencentcloud_cvm.go

@@ -475,10 +475,13 @@ func (me *CvmService) StartInstance(ctx context.Context, instanceId string) erro
 	return nil
 }
 
-func (me *CvmService) DeleteInstance(ctx context.Context, instanceId string) error {
+func (me *CvmService) DeleteInstance(ctx context.Context, instanceId string, releaseAddress bool) error {
 	logId := tccommon.GetLogId(ctx)
 	request := cvm.NewTerminateInstancesRequest()
 	request.InstanceIds = []*string{&instanceId}
+	if releaseAddress {
+		request.ReleaseAddress = helper.Bool(releaseAddress)
+	}
 
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseCvmClient().TerminateInstances(request)

website/docs/r/instance.html.markdown

@@ -320,6 +320,8 @@ The following arguments are supported:
 * `internet_charge_type` - (Optional, String) Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. If not set, internet charge type are consistent with the cvm charge type by default. This value takes NO Effect when changing and does not need to be set when `allocate_public_ip` is false.
 * `internet_max_bandwidth_out` - (Optional, Int) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bits per second). This value does not need to be set when `allocate_public_ip` is false.
 * `ipv4_address_type` - (Optional, String, ForceNew) AddressType. Default value: WanIP. For beta users of dedicated IP. the value can be: HighQualityEIP: Dedicated IP. Note that dedicated IPs are only available in partial regions. For beta users of Anti-DDoS IP, the value can be: AntiDDoSEIP: Anti-DDoS EIP. Note that Anti-DDoS IPs are only available in partial regions.
+* `ipv6_address_count` - (Optional, Int, ForceNew) Specify the number of randomly generated IPv6 addresses for the Elastic Network Interface.
+* `ipv6_address_type` - (Optional, String, ForceNew) IPv6 AddressType. Default value: WanIP. EIPv6: Elastic IPv6; HighQualityEIPv6: Premium IPv6, only China Hong Kong supports premium IPv6. To allocate IPv6 addresses to resources, please specify the Elastic IPv6 type.
 * `keep_image_login` - (Optional, Bool) Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifications may lead to the reinstallation of the instance's operating system..
 * `key_ids` - (Optional, Set: [`String`]) The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.
 * `key_name` - (Optional, String, **Deprecated**) Please use `key_ids` instead. The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.
@@ -330,6 +332,7 @@ The following arguments are supported:
 * `placement_group_id` - (Optional, String) The ID of a placement group.
 * `private_ip` - (Optional, String) The private IP to be assigned to this instance, must be in the provided subnet and available.
 * `project_id` - (Optional, Int) The project the instance belongs to, default to 0.
+* `release_address` - (Optional, Bool) Release elastic IP. Under EIP 2.0, only the first EIP under the primary network card is provided, and the EIP types are limited to HighQualityEIP, AntiDDoSEIP, EIPv6, and HighQualityEIPv6. Default behavior is not released.
 * `running_flag` - (Optional, Bool) Set instance to running or stop. Default value is true, the instance will shutdown when this flag is false.
 * `security_groups` - (Optional, Set: [`String`], **Deprecated**) It will be deprecated. Use `orderly_security_groups` instead. A list of security group IDs to associate with.
 * `spot_instance_type` - (Optional, String) Type of spot instance, only support `ONE-TIME` now. Note: it only works when instance_charge_type is set to `SPOTPAID`.