fix: sqlserver - cancel wait when update (#1349)

Author: Kagashino

tencentcloud/resource_tc_sqlserver_instance.go

@@ -365,42 +365,34 @@ func sqlServerAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData,
 	instanceId := d.Id()
 
 	var outErr, inErr error
-	//update name
-	if d.HasChange("name") {
-		name := d.Get("name").(string)
-		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			inErr = sqlserverService.ModifySqlserverInstanceName(ctx, instanceId, name)
-			if inErr != nil {
-				return retryError(inErr)
-			}
-			return nil
-		})
-		if outErr != nil {
-			return outErr
-		}
-		d.SetPartial("name")
-	}
 
 	//upgrade storage and memory size
 	if d.HasChange("memory") || d.HasChange("storage") || d.HasChange("auto_voucher") || d.HasChange("voucher_ids") {
 		memory := d.Get("memory").(int)
 		storage := d.Get("storage").(int)
 		autoVoucher := d.Get("auto_voucher").(int)
 		voucherIds := d.Get("voucher_ids").(*schema.Set).List()
+		outErr = sqlserverService.UpgradeSqlserverInstance(ctx, instanceId, memory, storage, autoVoucher, helper.InterfacesStringsPoint(voucherIds))
+
+		if outErr != nil {
+			return outErr
+		}
+
+	}
+
+	//update name
+	if d.HasChange("name") {
+		name := d.Get("name").(string)
 		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			inErr = sqlserverService.UpgradeSqlserverInstance(ctx, instanceId, memory, storage, autoVoucher, helper.InterfacesStringsPoint(voucherIds))
+			inErr = sqlserverService.ModifySqlserverInstanceName(ctx, instanceId, name)
 			if inErr != nil {
 				return retryError(inErr)
 			}
 			return nil
 		})
-
 		if outErr != nil {
 			return outErr
 		}
-
-		d.SetPartial("memory")
-		d.SetPartial("storage")
 	}
 
 	if d.HasChange("security_groups") {
@@ -436,8 +428,6 @@ func sqlServerAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData,
 				return outErr
 			}
 		}
-
-		d.SetPartial("security_groups")
 	}
 
 	if d.HasChange("tags") {
@@ -448,8 +438,6 @@ func sqlServerAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData,
 		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
 			return err
 		}
-
-		d.SetPartial("tags")
 	}
 
 	return nil

tencentcloud/service_tencentcloud_sqlserver.go

@@ -157,6 +157,7 @@ func (me *SqlserverService) UpgradeSqlserverInstance(ctx context.Context, instan
 	request.InstanceId = &instanceId
 	request.Memory = helper.IntInt64(memory)
 	request.Storage = helper.IntInt64(storage)
+	request.WaitSwitch = helper.IntInt64(0)
 	if autoVoucher != 0 {
 		request.AutoVoucher = helper.IntInt64(autoVoucher)
 	}
@@ -180,7 +181,7 @@ func (me *SqlserverService) UpgradeSqlserverInstance(ctx context.Context, instan
 	errRet = resource.Retry(10*readRetryTimeout, func() *resource.RetryError {
 		instance, has, err := me.DescribeSqlserverInstanceById(ctx, instanceId)
 		if err != nil {
-			return resource.NonRetryableError(errors.WithStack(err))
+			return retryError(err)
 		}
 		if !has {
 			return resource.NonRetryableError(fmt.Errorf("cannot find SQL Server instance %s", instanceId))