fix: continue read when cvm returns launch failed (#1077)

* fix: continue read when cvm returns launch failed

* fix: cvm use tag service to read instance tag

* fix: cvm - make cvm errors non retryable

Author: Kagashino

tencentcloud/commom_test.go

@@ -115,13 +115,15 @@ func TestIsExpectError(t *testing.T) {
 
 	err := sdkErrors.NewTencentCloudSDKError("ClientError.NetworkError", "", "")
 
+	// Expected
 	expectedFull := []string{"ClientError.NetworkError"}
 	expectedShort := []string{"ClientError"}
-	unExpectedMatchHead := []string{"ClientError.HttpStatusCodeError"}
-	unExpectedShort := []string{"SystemError"}
-
 	assert.Equalf(t, isExpectError(err, expectedFull), true, "")
 	assert.Equalf(t, isExpectError(err, expectedShort), true, "")
+
+	// Unexpected
+	unExpectedMatchHead := []string{"ClientError.HttpStatusCodeError"}
+	unExpectedShort := []string{"SystemError"}
 	assert.Equalf(t, isExpectError(err, unExpectedMatchHead), false, "")
 	assert.Equalf(t, isExpectError(err, unExpectedShort), false, "")
 }

tencentcloud/extension_cvm.go

@@ -49,7 +49,9 @@ const (
 	CVM_IMAGE_LOGIN     = "TRUE"
 	CVM_IMAGE_LOGIN_NOT = "FALSE"
 
-	CVM_ZONE_NOT_SUPPORT_ERROR    = "InvalidParameterValue.ZoneNotSupported"
+	// @Deprecated use cvm.INVALIDPARAMETERVALUE_ZONENOTSUPPORTED
+	CVM_ZONE_NOT_SUPPORT_ERROR = "InvalidParameterValue.ZoneNotSupported"
+	// @Deprecated use cvm.RESOURCEINSUFFICIENT_CLOUDDISKSOLDOUT instead
 	CVM_CLOUD_DISK_SOLD_OUT_ERROR = "ResourceInsufficient.CloudDiskSoldOut"
 
 	CVM_STOP_MODE_KEEP_CHARGING = "KEEP_CHARGING"
@@ -60,6 +62,13 @@ const (
 	UNDERLINE                   = "_"
 )
 
+// Only client error can cvm retry, others will directly returns
+var CVM_RETRYABLE_ERROR = []string{
+	// client
+	"ClientError.NetworkError",
+	"ClientError.HttpStatusCodeError",
+}
+
 var CVM_CHARGE_TYPE = []string{
 	CVM_CHARGE_TYPE_PREPAID,
 	CVM_CHARGE_TYPE_POSTPAID,

tencentcloud/resource_tc_instance.go

@@ -703,17 +703,18 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 	}
 
 	instanceId := ""
+
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check("create")
 		response, err := meta.(*TencentCloudClient).apiV3Conn.UseCvmClient().RunInstances(request)
 		if err != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
 				logId, request.GetAction(), request.ToJsonString(), err.Error())
 			e, ok := err.(*sdkErrors.TencentCloudSDKError)
-			if ok && e.Code == CVM_CLOUD_DISK_SOLD_OUT_ERROR {
-				return resource.NonRetryableError(e)
+			if ok && IsContains(CVM_RETRYABLE_ERROR, e.Code) {
+				return resource.RetryableError(fmt.Errorf("cvm create error: %s, retrying", e.Error()))
 			}
-			return retryError(err)
+			return resource.NonRetryableError(err)
 		}
 		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
 			logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
@@ -852,7 +853,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	if instance == nil || *instance.InstanceState == CVM_STATUS_LAUNCH_FAILED {
+	if instance == nil {
 		d.SetId("")
 		return nil
 	}
@@ -909,9 +910,14 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 		_ = d.Set("allocate_public_ip", len(instance.PublicIpAddresses) > 0)
 	}
 
+	tagService := TagService{client}
+
+	tags, err := tagService.DescribeResourceTags(ctx, "cvm", "instance", client.Region, d.Id())
+	if err != nil {
+		return err
+	}
 	// as attachment add tencentcloud:autoscaling:auto-scaling-group-id tag automatically
 	// we should remove this tag, otherwise it will cause terraform state change
-	tags := flattenCvmTagsMapping(instance.Tags)
 	delete(tags, "tencentcloud:autoscaling:auto-scaling-group-id")
 	_ = d.Set("tags", tags)