fix conflict version issue

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 1.39.0 (Unreleased)
+
+BUG FIXES:
+
+* Resource: `tencentcloud_mysql_instance` fix auto-forcenew on `charge_type` and `pay_type` when upgrading terraform version. ([#459](https://github.com/terraform-providers/terraform-provider-tencentcloud/pull/459)).
+
 ## 1.38.1 (June 30, 2020)
 
 BUG FIXES:

tencentcloud/resource_tc_cam_policy.go

@@ -202,13 +202,6 @@ func resourceTencentCloudCamPolicyRead(d *schema.ResourceData, meta interface{})
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := camService.DescribePolicyById(ctx, policyId)
 		if e != nil {
-			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
-				errCode := ee.GetCode()
-				//check if read empty
-				if strings.Contains(errCode, "ResourceNotFound") {
-					return nil
-				}
-			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_cam_role.go

@@ -209,13 +209,6 @@ func resourceTencentCloudCamRoleRead(d *schema.ResourceData, meta interface{}) e
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := camService.DescribeRoleById(ctx, roleId)
 		if e != nil {
-			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
-				errCode := ee.GetCode()
-				//check if read empty
-				if strings.Contains(errCode, "ResourceNotFound") {
-					return nil
-				}
-			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_cam_saml_provider.go

@@ -167,13 +167,6 @@ func resourceTencentCloudCamSAMLProviderRead(d *schema.ResourceData, meta interf
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := camService.DescribeSAMLProviderById(ctx, samlProviderId)
 		if e != nil {
-			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
-				errCode := ee.GetCode()
-				//check if read empty
-				if strings.Contains(errCode, "ResourceNotFound") {
-					return nil
-				}
-			}
 			return retryError(e)
 		}
 		instance = result

tencentcloud/resource_tc_cam_user.go

@@ -264,13 +264,6 @@ func resourceTencentCloudCamUserRead(d *schema.ResourceData, meta interface{}) e
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := camService.DescribeUserById(ctx, userId)
 		if e != nil {
-			if ee, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
-				errCode := ee.GetCode()
-				//check if read empty
-				if strings.Contains(errCode, "ResourceNotFound") {
-					return nil
-				}
-			}
 			return retryError(e)
 		}
 		instance = result