resource/alicloud_ecs_disk_attachment: add retry for DisksDetachingOn…

…EcsExceeded in DetachDisk
aliyun · Apr 19, 2024 · ba55527 · ba55527
1 parent 6c98abf
commit ba55527
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/alicloud/resource_alicloud_ecs_disk_attachment.go b/alicloud/resource_alicloud_ecs_disk_attachment.go
@@ -100,7 +100,7 @@ func resourceAlicloudEcsDiskAttachmentCreate(d *schema.ResourceData, meta interf
 	err = resource.Retry(d.Timeout(schema.TimeoutCreate), 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, DiskInvalidOperation) {
+			if NeedRetry(err) || IsExpectedErrors(err, []string{"IncorrectDiskStatus", "IncorrectInstanceStatus", "OperationConflict", "InternalError", "InvalidOperation.Conflict", "IncorrectDiskStatus.Initializing"}) {
 				wait()
 				return resource.RetryableError(err)
 			}
@@ -203,7 +203,7 @@ func resourceAlicloudEcsDiskAttachmentDelete(d *schema.ResourceData, meta interf
 	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 NeedRetry(err) || IsExpectedErrors(err, DiskInvalidOperation) {
+			if NeedRetry(err) || IsExpectedErrors(err, []string{"DisksDetachingOnEcsExceeded","IncorrectDiskStatus", "IncorrectInstanceStatus", "OperationConflict", "InternalError", "InvalidOperation.Conflict", "IncorrectDiskStatus.Initializing"}) {
 				wait()
 				return resource.RetryableError(err)
 			}

diff --git a/alicloud/resource_alicloud_ecs_disk_attachment_test.go b/alicloud/resource_alicloud_ecs_disk_attachment_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccAlicloudECSDiskAttachmentBasic(t *testing.T) {
+func TestAccAliCloudECSDiskAttachmentBasic(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk_attachment.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsDiskAttachmentMap)
@@ -39,7 +39,7 @@ func TestAccAlicloudECSDiskAttachmentBasic(t *testing.T) {
 	})
 }
 
-func TestAccAlicloudECSDiskAttachmentMulti(t *testing.T) {
+func TestAccAliCloudECSDiskAttachmentMulti(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk_attachment.default.1"
 	ra := resourceAttrInit(resourceId, AlicloudEcsDiskAttachmentMap)
@@ -68,7 +68,7 @@ func TestAccAlicloudECSDiskAttachmentMulti(t *testing.T) {
 	})
 }
 
-func TestAccAlicloudECSDiskAttachmentBasic1(t *testing.T) {
+func TestAccAliCloudECSDiskAttachmentBasic1(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk_attachment.default.1"
 	ra := resourceAttrInit(resourceId, AlicloudEcsDiskAttachmentMap)