fix: modify eip

Author: gitmkn

tencentcloud/services/cvm/resource_tc_eip.go

@@ -436,9 +436,8 @@ func resourceTencentCloudEipDelete(d *schema.ResourceData, meta interface{}) err
 	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
 	vpcService := svcvpc.NewVpcService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
 	eipId := d.Id()
-	cdcId := d.Get("cdc_id").(string)
 	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		errRet := vpcService.UnattachEip(ctx, eipId, cdcId)
+		errRet := vpcService.UnattachEip(ctx, eipId)
 		if errRet != nil {
 			return tccommon.RetryError(errRet, "DesOperation.MutexTaskRunning")
 		}

tencentcloud/services/cvm/resource_tc_eip_association.go

@@ -275,9 +275,8 @@ func resourceTencentCloudEipAssociationDelete(d *schema.ResourceData, meta inter
 		return err
 	}
 
-	cdcId := d.Get("cdc_id").(string)
 	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		e := vpcService.UnattachEip(ctx, association.EipId, cdcId)
+		e := vpcService.UnattachEip(ctx, association.EipId)
 		if e != nil {
 			return tccommon.RetryError(e, "DesOperation.MutexTaskRunning")
 		}

tencentcloud/services/vpc/service_tencentcloud_vpc.go

@@ -2727,12 +2727,12 @@ func (me *VpcService) DisassociateNatGatewayAddress(ctx context.Context, request
 	return
 }
 
-func (me *VpcService) UnattachEip(ctx context.Context, eipId, cdcId string) error {
+func (me *VpcService) UnattachEip(ctx context.Context, eipId string) error {
 	eipUnattachLocker.Lock()
 	defer eipUnattachLocker.Unlock()
 
 	logId := tccommon.GetLogId(ctx)
-	eip, err := me.DescribeEipById(ctx, eipId, cdcId)
+	eip, err := me.DescribeEipById(ctx, eipId)
 	if err != nil {
 		return err
 	}
@@ -2751,7 +2751,7 @@ func (me *VpcService) UnattachEip(ctx context.Context, eipId, cdcId string) erro
 		}
 
 		outErr := resource.Retry(tccommon.ReadRetryTimeout*3, func() *resource.RetryError {
-			eip, err := me.DescribeEipById(ctx, eipId, cdcId)
+			eip, err := me.DescribeEipById(ctx, eipId)
 			if err != nil {
 				return tccommon.RetryError(err)
 			}