fix vpn ssl (#1022)

Author: hellertang

tencentcloud/resource_tc_vpn_ssl_client.go

@@ -24,15 +24,13 @@ package tencentcloud
 import (
 	"context"
 	"log"
-	"time"
 
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 )
 
 func resourceTencentCloudVpnSslClient() *schema.Resource {
@@ -103,12 +101,10 @@ func resourceTencentCloudVpnSslClientCreate(d *schema.ResourceData, meta interfa
 		return err
 	}
 
-	err := vpcService.DescribeTaskResult(ctx, helper.Uint64(*taskId))
+	err := vpcService.DescribeVpcTaskResult(ctx, helper.String(helper.UInt64ToStr(*taskId)))
 	if err != nil {
 		return err
 	}
-	// add protect
-	time.Sleep(3)
 
 	d.SetId(*sslClientId)
 
@@ -155,17 +151,15 @@ func resourceTencentCloudVpnSslClientDelete(d *schema.ResourceData, meta interfa
 
 	sslClientId := d.Id()
 
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		if err := service.DeleteVpnGatewaySslClient(ctx, sslClientId); err != nil {
-			if sdkErr, ok := err.(*errors.TencentCloudSDKError); ok {
-				if sdkErr.Code == VPCNotFound {
-					return nil
-				}
-			}
-			return resource.RetryableError(err)
-		}
-		return nil
-	})
+	taskId, err := service.DeleteVpnGatewaySslClient(ctx, sslClientId)
+	if err != nil {
+		return err
+	}
+
+	err = service.DescribeVpcTaskResult(ctx, helper.String(helper.UInt64ToStr(*taskId)))
+	if err != nil {
+		return err
+	}
 
 	return err
 }

tencentcloud/resource_tc_vpn_ssl_server.go

@@ -32,15 +32,13 @@ package tencentcloud
 import (
 	"context"
 	"log"
-	"time"
 
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 )
 
 func resourceTencentCloudVpnSslServer() *schema.Resource {
@@ -181,13 +179,11 @@ func resourceTencentCloudVpnSslServerCreate(d *schema.ResourceData, meta interfa
 		return err
 	}
 
-	err := vpcService.DescribeTaskResult(ctx, helper.Int64Uint64(*taskId))
+	err := vpcService.DescribeVpcTaskResult(ctx, helper.String(helper.Int64ToStr(*taskId)))
 	if err != nil {
 		return err
 	}
 
-	// add protect
-	time.Sleep(3)
 	d.SetId(*sslServerId)
 
 	return resourceTencentCloudVpnSslServerRead(d, meta)
@@ -250,17 +246,15 @@ func resourceTencentCloudVpnSslServerDelete(d *schema.ResourceData, meta interfa
 
 	serverId := d.Id()
 
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		if err := service.DeleteVpnGatewaySslServer(ctx, serverId); err != nil {
-			if sdkErr, ok := err.(*errors.TencentCloudSDKError); ok {
-				if sdkErr.Code == VPCNotFound {
-					return nil
-				}
-			}
-			return resource.RetryableError(err)
-		}
-		return nil
-	})
+	taskId, err := service.DeleteVpnGatewaySslServer(ctx, serverId)
+	if err != nil {
+		return err
+	}
 
-	return err
+	err = service.DescribeVpcTaskResult(ctx, helper.String(helper.UInt64ToStr(taskId)))
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

tencentcloud/service_tencentcloud_vpc.go

@@ -4413,6 +4413,33 @@ func (me *VpcService) DescribeVpnGatewayRoutes(ctx context.Context, vpnGatewayId
 	}
 }
 
+func (me *VpcService) DescribeVpcTaskResult(ctx context.Context, taskId *string) (err error) {
+
+	logId := getLogId(ctx)
+	request := vpc.NewDescribeVpcTaskResultRequest()
+	defer func() {
+		if err != nil {
+			log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), err.Error())
+		}
+	}()
+	request.TaskId = taskId
+	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		response, err := me.client.UseVpcClient().DescribeVpcTaskResult(request)
+		if err != nil {
+			return retryError(err)
+		}
+		if response.Response.Status != nil && *response.Response.Status == VPN_TASK_STATUS_RUNNING {
+			return resource.RetryableError(errors.New("VPN task is running"))
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	return
+}
+
 func (me *VpcService) DescribeTaskResult(ctx context.Context, taskId *uint64) (err error) {
 
 	logId := getLogId(ctx)
@@ -4520,7 +4547,7 @@ func (me *VpcService) DescribeVpnGwSslServerByFilter(ctx context.Context, filter
 	return
 }
 
-func (me *VpcService) DeleteVpnGatewaySslServer(ctx context.Context, SslServerId string) (errRet error) {
+func (me *VpcService) DeleteVpnGatewaySslServer(ctx context.Context, SslServerId string) (taskId uint64, errRet error) {
 	logId := getLogId(ctx)
 	request := vpc.NewDeleteVpnGatewaySslServerRequest()
 	defer func() {
@@ -4532,10 +4559,11 @@ func (me *VpcService) DeleteVpnGatewaySslServer(ctx context.Context, SslServerId
 
 	errRet = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
-		_, errRet = me.client.UseVpcClient().DeleteVpnGatewaySslServer(request)
+		response, errRet := me.client.UseVpcClient().DeleteVpnGatewaySslServer(request)
 		if errRet != nil {
 			return retryError(errRet, InternalError)
 		}
+		taskId = *response.Response.TaskId
 		return nil
 	})
 	return
@@ -4621,7 +4649,7 @@ func (me *VpcService) DescribeVpnGwSslClientByFilter(ctx context.Context, filter
 	return
 }
 
-func (me *VpcService) DeleteVpnGatewaySslClient(ctx context.Context, SslClientId string) (errRet error) {
+func (me *VpcService) DeleteVpnGatewaySslClient(ctx context.Context, SslClientId string) (taskId *uint64, errRet error) {
 	logId := getLogId(ctx)
 	request := vpc.NewDeleteVpnGatewaySslClientRequest()
 	defer func() {
@@ -4633,10 +4661,11 @@ func (me *VpcService) DeleteVpnGatewaySslClient(ctx context.Context, SslClientId
 
 	errRet = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
-		_, errRet = me.client.UseVpcClient().DeleteVpnGatewaySslClient(request)
+		response, errRet := me.client.UseVpcClient().DeleteVpnGatewaySslClient(request)
 		if errRet != nil {
 			return retryError(errRet, InternalError)
 		}
+		taskId = response.Response.TaskId
 		return nil
 	})
 	return