Skip to content

Commit

Permalink
resource/alicloud_dbfs_instance_attachment: Improved alicloud_dbfs_in…
Browse files Browse the repository at this point in the history 
…stance_attachment testcase
  • Loading branch information
@MrWolong
MrWolong committed Nov 7, 2024
1 parent 6616c1a commit fafa7e9
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 141 deletions.
2 changes: 1 addition & 1 deletion alicloud/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,7 @@ func Provider() terraform.ResourceProvider {
"alicloud_ecs_storage_capacity_unit": resourceAlicloudEcsStorageCapacityUnit(),
"alicloud_nas_recycle_bin": resourceAlicloudNasRecycleBin(),
"alicloud_dbfs_snapshot": resourceAliCloudDbfsSnapshot(),
"alicloud_dbfs_instance_attachment": resourceAlicloudDbfsInstanceAttachment(),
"alicloud_dbfs_instance_attachment": resourceAliCloudDbfsInstanceAttachment(),
"alicloud_dts_migration_job": resourceAlicloudDtsMigrationJob(),
"alicloud_dts_migration_instance": resourceAlicloudDtsMigrationInstance(),
"alicloud_mse_gateway": resourceAlicloudMseGateway(),
Expand Down
77 changes: 42 additions & 35 deletions alicloud/resource_alicloud_dbfs_instance_attachment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func resourceAlicloudDbfsInstanceAttachment() *schema.Resource {
func resourceAliCloudDbfsInstanceAttachment() *schema.Resource {
return &schema.Resource{
Create: resourceAlicloudDbfsInstanceAttachmentCreate,
Read: resourceAlicloudDbfsInstanceAttachmentRead,
Delete: resourceAlicloudDbfsInstanceAttachmentDelete,
Create: resourceAliCloudDbfsInstanceAttachmentCreate,
Read: resourceAliCloudDbfsInstanceAttachmentRead,
Delete: resourceAliCloudDbfsInstanceAttachmentDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Expand All @@ -24,6 +24,11 @@ func resourceAlicloudDbfsInstanceAttachment() *schema.Resource {
Delete: schema.DefaultTimeout(5 * time.Minute),
},
Schema: map[string]*schema.Schema{
"instance_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"ecs_id": {
Type: schema.TypeString,
Required: true,
Expand All @@ -33,31 +38,28 @@ func resourceAlicloudDbfsInstanceAttachment() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"instance_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
},
}
}

func resourceAlicloudDbfsInstanceAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAliCloudDbfsInstanceAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
dbfsService := DbfsService{client}
var response map[string]interface{}
action := "AttachDbfs"
request := make(map[string]interface{})
conn, err := client.NewDbfsClient()
if err != nil {
return WrapError(err)
}
request["ECSInstanceId"] = d.Get("ecs_id")

request["FsId"] = d.Get("instance_id")
request["ECSInstanceId"] = d.Get("ecs_id")

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutCreate)), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-04-18"), StringPointer("AK"), nil, request, &runtime)
if err != nil {
if NeedRetry(err) {
Expand All @@ -69,71 +71,73 @@ func resourceAlicloudDbfsInstanceAttachmentCreate(d *schema.ResourceData, meta i
return nil
})
addDebug(action, response, request)

if err != nil {
return WrapErrorf(err, DefaultErrorMsg, "alicloud_dbfs_instance_attachment", action, AlibabaCloudSdkGoERROR)
}

d.SetId(fmt.Sprint(request["FsId"], ":", request["ECSInstanceId"]))
dbfsService := DbfsService{client}
d.SetId(fmt.Sprintf("%v:%v", request["FsId"], request["ECSInstanceId"]))

stateConf := BuildStateConf([]string{}, []string{"attached"}, d.Timeout(schema.TimeoutCreate), 5*time.Second, dbfsService.DbfsInstanceStateRefreshFunc(fmt.Sprint(request["FsId"]), []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}

return resourceAlicloudDbfsInstanceAttachmentRead(d, meta)
return resourceAliCloudDbfsInstanceAttachmentRead(d, meta)
}
func resourceAlicloudDbfsInstanceAttachmentRead(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudDbfsInstanceAttachmentRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
dbfsService := DbfsService{client}
parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}

object, err := dbfsService.DescribeDbfsInstanceAttachment(d.Id())
if err != nil {
if NotFoundError(err) {
if !d.IsNewResource() && NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_dbfs_instance_attachment dbfsService.DescribeDbfsInstanceAttachment Failed!!! %s", err)
d.SetId("")
return nil
}
return WrapError(err)
}
d.Set("status", object["Status"])
d.Set("instance_id", object["FsId"])
if ecsListList, ok := object["EcsList"]; ok && ecsListList != nil {
for _, ecsListListItem := range ecsListList.([]interface{}) {
if ecsListListItemMap, ok := ecsListListItem.(map[string]interface{}); ok {
if ok && ecsListListItemMap["EcsId"] == parts[1] {
d.Set("ecs_id", ecsListListItemMap["EcsId"])
break
}
}
}

parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}

d.Set("instance_id", object["FsId"])
d.Set("ecs_id", parts[1])
d.Set("status", object["Status"])

return nil
}

func resourceAlicloudDbfsInstanceAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
func resourceAliCloudDbfsInstanceAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
dbfsService := DbfsService{client}
action := "DetachDbfs"
var response map[string]interface{}

conn, err := client.NewDbfsClient()
if err != nil {
return WrapError(err)
}

parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}

request := map[string]interface{}{
"FsId": parts[0],
"ECSInstanceId": parts[1],
}

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-04-18"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutDelete)), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-04-18"), StringPointer("AK"), nil, request, &runtime)
if err != nil {
if NeedRetry(err) {
wait()
Expand All @@ -144,12 +148,15 @@ func resourceAlicloudDbfsInstanceAttachmentDelete(d *schema.ResourceData, meta i
return nil
})
addDebug(action, response, request)

if err != nil {
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}

stateConf := BuildStateConf([]string{}, []string{"unattached"}, d.Timeout(schema.TimeoutDelete), 5*time.Second, dbfsService.DbfsInstanceStateRefreshFunc(parts[0], []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}

return nil
}
Loading

0 comments on commit fafa7e9

Please sign in to comment.