merge upstream

Author: ttomzhou

CHANGELOG.md

@@ -26,6 +26,8 @@ FEATURES:
 
 BUG FIXES:
 
+* Resource: `tencentcloud_sqlserver_instance` Fix the error of releasing associated resources when destroying sqlserver postpaid instance.
+* Resource: `tencentcloud_sqlserver_readonly_instance` Fix the bug that the instance cannot be recycled when destroying sqlserver postpaid instance.
 * Resource: `tencentcloud_clb_instance` fix force new when updating tags.
 * Resource: `tencentcloud_redis_backup_config` fix doc issues.
 * Resource: `tencentcloud_instance` fix `keep_image_login` force new issue when updating terraform version.

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.25
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.37
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -443,6 +443,8 @@ github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0K
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.25 h1:tLExcllerEwYTIx/58PA9r5v69uPfpc2yf6DLtDggTo=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.25/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.37 h1:zNJfC6+5sj/OloSq6GzmdSC9lwlZbgQ438zz3qH+v4k=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.37/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/resource_tc_sqlserver_instance.go

@@ -568,6 +568,11 @@ func resourceTencentCLoudSqlserverInstanceDelete(d *schema.ResourceData, meta in
 		return outErr
 	}
 
+	outErr = sqlserverService.RecycleDBInstance(ctx, instanceId)
+	if outErr != nil {
+		return outErr
+	}
+
 	outErr = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		_, has, inErr := sqlserverService.DescribeSqlserverInstanceById(ctx, d.Id())
 		if inErr != nil {

tencentcloud/resource_tc_sqlserver_readonly_instance.go

@@ -268,6 +268,11 @@ func resourceTencentCloudSqlserverReadonlyInstanceDelete(d *schema.ResourceData,
 		return outErr
 	}
 
+	outErr = sqlserverService.RecycleDBInstance(ctx, instanceId)
+	if outErr != nil {
+		return outErr
+	}
+
 	outErr = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		_, has, inErr := sqlserverService.DescribeSqlserverInstanceById(ctx, d.Id())
 		if inErr != nil {

tencentcloud/service_tencentcloud_sqlserver.go

@@ -1333,3 +1333,39 @@ func (me *SqlserverService) DeletePublishSubscribe(ctx context.Context, publishS
 		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 	return
 }
+
+func (me *SqlserverService) RecycleDBInstance(ctx context.Context, instanceId string) (errRet error) {
+	logId := getLogId(ctx)
+	request := sqlserver.NewRecycleDBInstanceRequest()
+	request.InstanceId = &instanceId
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, reason[%s]", logId, request.GetAction(), errRet.Error())
+		}
+	}()
+
+	var response *sqlserver.RecycleDBInstanceResponse
+	var err error
+	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		response, err = me.client.UseSqlserverClient().RecycleDBInstance(request)
+		if err != nil {
+			return retryError(err)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	if response == nil || response.Response == nil {
+		errRet = fmt.Errorf("TencentCloud SDK return nil response, %s", request.GetAction())
+		return
+	}
+
+	flowId := *response.Response.FlowId
+	err = me.WaitForTaskFinish(ctx, flowId)
+	if err != nil {
+		errRet = err
+	}
+	return
+}