Merge pull request #502 from Sesede/master

update inconsistent state when deleted on console

Author: likexian

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 BUG FIXES:
 * Resource: `tencentcloud_vpn_connection` fix `security_group_policy` update issue when apply repeatedly.
+* Resource: `tencentcloud_vpn_connection` fix inconsistent state when deleted on console.
 
 ## 1.41.1 (August 27, 2020)
 

tencentcloud/resource_tc_vpn_connection.go

@@ -54,6 +54,7 @@ import (
 	"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"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
@@ -528,6 +529,10 @@ func resourceTencentCloudVpnConnectionRead(d *schema.ResourceData, meta interfac
 		if e != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
 				logId, request.GetAction(), request.ToJsonString(), e.Error())
+			ee, ok := e.(*sdkErrors.TencentCloudSDKError)
+			if ok && ee.Code == VPCNotFound {
+				return nil
+			}
 			return retryError(e)
 		}
 
@@ -538,7 +543,7 @@ func resourceTencentCloudVpnConnectionRead(d *schema.ResourceData, meta interfac
 		log.Printf("[CRITAL]%s read VPN connection failed, reason:%s\n", logId, err.Error())
 		return err
 	}
-	if len(response.Response.VpnConnectionSet) < 1 {
+	if response == nil || response.Response == nil || len(response.Response.VpnConnectionSet) < 1 {
 		d.SetId("")
 		return nil
 	}

tencentcloud/resource_tc_vpn_customer_gateway.go

@@ -177,7 +177,7 @@ func resourceTencentCloudVpnCustomerGatewayRead(d *schema.ResourceData, meta int
 		log.Printf("[CRITAL]%s read VPN customer gateway failed, reason:%s\n", logId, err.Error())
 		return err
 	}
-	if len(response.Response.CustomerGatewaySet) < 1 {
+	if response == nil || response.Response == nil || len(response.Response.CustomerGatewaySet) < 1 {
 		d.SetId("")
 		return nil
 	}

tencentcloud/service_tencentcloud_vpc.go

@@ -3248,7 +3248,7 @@ func (me *VpcService) DescribeVpngwById(ctx context.Context, vpngwId string) (ha
 		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%v]", logId, request.GetAction(), request.ToJsonString(), err)
 		return
 	}
-	if len(response.Response.VpnGatewaySet) < 1 {
+	if response == nil || response.Response == nil || len(response.Response.VpnGatewaySet) < 1 {
 		has = false
 		return
 	}