resource/alicloud_ecs_disk: Add idempotent parameters for Update oper…

…ation.
aliyun · Apr 28, 2024 · f0e11ed · f0e11ed
1 parent 2baab02
commit f0e11ed
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/alicloud/resource_alicloud_ecs_disk.go b/alicloud/resource_alicloud_ecs_disk.go
@@ -352,7 +352,7 @@ func resourceAlicloudEcsDiskUpdate(d *schema.ResourceData, meta interface{}) err
 		err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &runtime)
 			if err != nil {
-				if NeedRetry(err) {
+				if NeedRetry(err) || IsExpectedErrors(err, []string{"UnknownError", "LastTokenProcessing"}) {
 					wait()
 					return resource.RetryableError(err)
 				}
@@ -379,7 +379,7 @@ func resourceAlicloudEcsDiskUpdate(d *schema.ResourceData, meta interface{}) err
 		err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
 			if err != nil {
-				if NeedRetry(err) {
+				if NeedRetry(err) || IsExpectedErrors(err, []string{"UnknownError", "LastTokenProcessing"}) {
 					wait()
 					return resource.RetryableError(err)
 				}
@@ -413,7 +413,7 @@ func resourceAlicloudEcsDiskUpdate(d *schema.ResourceData, meta interface{}) err
 		wait := incrementalWait(3*time.Second, 3*time.Second)
 		err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
-			if err != nil {
+			if NeedRetry(err) || IsExpectedErrors(err, []string{"UnknownError", "LastTokenProcessing"}) {
 				if NeedRetry(err) {
 					wait()
 					return resource.RetryableError(err)
@@ -455,7 +455,7 @@ func resourceAlicloudEcsDiskUpdate(d *schema.ResourceData, meta interface{}) err
 		err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, modifyDiskChargeTypeReq, &util.RuntimeOptions{})
 			if err != nil {
-				if NeedRetry(err) || IsExpectedErrors(err, []string{"IncorrectDiskStatus"}) {
+				if NeedRetry(err) || IsExpectedErrors(err, []string{"IncorrectDiskStatus", "LastTokenProcessing"}) {
 					wait()
 					return resource.RetryableError(err)
 				}
@@ -512,7 +512,7 @@ func resourceAlicloudEcsDiskUpdate(d *schema.ResourceData, meta interface{}) err
 		err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, modifyDiskAttributeReq, &util.RuntimeOptions{})
 			if err != nil {
-				if NeedRetry(err) {
+				if NeedRetry(err) || IsExpectedErrors(err, []string{"UnknownError", "LastTokenProcessing"}) {
 					wait()
 					return resource.RetryableError(err)
 				}
@@ -564,7 +564,7 @@ func resourceAlicloudEcsDiskDelete(d *schema.ResourceData, meta interface{}) err
 	err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
 		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
 		if err != nil {
-			if IsExpectedErrors(err, []string{"IncorrectDiskStatus.Initializing"}) || NeedRetry(err) {
+			if IsExpectedErrors(err, []string{"IncorrectDiskStatus.Initializing", "LastTokenProcessing"}) || NeedRetry(err) {
 				wait()
 				return resource.RetryableError(err)
 			}