Skip to content

Commit

Permalink
data-source/alicloud_resource_manager_folders: Added retry strategy; …
Browse files Browse the repository at this point in the history 
…Improved alicloud_resource_manager_folders testcase and document
  • Loading branch information
@MrWolong @ChenHanZhang
MrWolong authored and ChenHanZhang committed Oct 24, 2024
1 parent 186701b commit eee970a
Show file tree
Hide file tree
Showing 4 changed files with 262 additions and 116 deletions.
110 changes: 70 additions & 40 deletions alicloud/data_source_alicloud_resource_manager_folders.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package alicloud

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"regexp"
"time"

"github.com/PaesslerAG/jsonpath"
util "github.com/alibabacloud-go/tea-utils/service"
Expand All @@ -11,27 +13,22 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
)

func dataSourceAlicloudResourceManagerFolders() *schema.Resource {
func dataSourceAliCloudResourceManagerFolders() *schema.Resource {
return &schema.Resource{
Read: dataSourceAlicloudResourceManagerFoldersRead,
Read: dataSourceAliCloudResourceManagerFoldersRead,
Schema: map[string]*schema.Schema{
"ids": {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"name_regex": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.ValidateRegexp,
ForceNew: true,
},
"names": {
Type: schema.TypeList,
Elem: &schema.Schema{Type: schema.TypeString},
Computed: true,
ValidateFunc: validation.ValidateRegexp,
},
"parent_folder_id": {
Type: schema.TypeString,
Expand All @@ -43,10 +40,20 @@ func dataSourceAlicloudResourceManagerFolders() *schema.Resource {
Optional: true,
ForceNew: true,
},
"enable_details": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
"output_file": {
Type: schema.TypeString,
Optional: true,
},
"names": {
Type: schema.TypeList,
Elem: &schema.Schema{Type: schema.TypeString},
Computed: true,
},
"folders": {
Type: schema.TypeList,
Computed: true,
Expand All @@ -71,38 +78,27 @@ func dataSourceAlicloudResourceManagerFolders() *schema.Resource {
},
},
},
"enable_details": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
}

func dataSourceAlicloudResourceManagerFoldersRead(d *schema.ResourceData, meta interface{}) error {
func dataSourceAliCloudResourceManagerFoldersRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)

action := "ListFoldersForParent"
request := make(map[string]interface{})
request["PageSize"] = PageSizeLarge
request["PageNumber"] = 1

if v, ok := d.GetOk("parent_folder_id"); ok {
request["ParentFolderId"] = v
}

if v, ok := d.GetOk("query_keyword"); ok {
request["QueryKeyword"] = v
}
request["PageSize"] = PageSizeLarge
request["PageNumber"] = 1
var objects []map[string]interface{}
var folderNameRegex *regexp.Regexp
if v, ok := d.GetOk("name_regex"); ok {
r, err := regexp.Compile(v.(string))
if err != nil {
return WrapError(err)
}
folderNameRegex = r
}

var objects []map[string]interface{}
idsMap := make(map[string]string)
if v, ok := d.GetOk("ids"); ok {
for _, vv := range v.([]interface{}) {
Expand All @@ -112,44 +108,73 @@ func dataSourceAlicloudResourceManagerFoldersRead(d *schema.ResourceData, meta i
idsMap[vv.(string)] = vv.(string)
}
}

var folderNameRegex *regexp.Regexp
if v, ok := d.GetOk("name_regex"); ok {
r, err := regexp.Compile(v.(string))
if err != nil {
return WrapError(err)
}
folderNameRegex = r
}

var response map[string]interface{}
conn, err := client.NewResourcemanagerClient()
if err != nil {
return WrapError(err)
}

for {
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-31"), StringPointer("AK"), nil, request, &runtime)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-31"), StringPointer("AK"), nil, request, &runtime)
if err != nil {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
return nil
})
addDebug(action, response, request)

if err != nil {
return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_resource_manager_folders", action, AlibabaCloudSdkGoERROR)
}
addDebug(action, response, request)

resp, err := jsonpath.Get("$.Folders.Folder", response)
if err != nil {
return WrapErrorf(err, FailedGetAttributeMsg, action, "$.Folders.Folder", response)
}

result, _ := resp.([]interface{})
for _, v := range result {
item := v.(map[string]interface{})
if folderNameRegex != nil {
if !folderNameRegex.MatchString(fmt.Sprint(item["FolderName"])) {
if len(idsMap) > 0 {
if _, ok := idsMap[fmt.Sprint(item["FolderId"])]; !ok {
continue
}
}
if len(idsMap) > 0 {
if _, ok := idsMap[fmt.Sprint(item["FolderId"])]; !ok {

if folderNameRegex != nil {
if !folderNameRegex.MatchString(fmt.Sprint(item["FolderName"])) {
continue
}
}

objects = append(objects, item)
}
if len(result) < PageSizeLarge {

if len(result) < request["PageSize"].(int) {
break
}

request["PageNumber"] = request["PageNumber"].(int) + 1
}

ids := make([]string, 0)
names := make([]interface{}, 0)
s := make([]map[string]interface{}, 0)
Expand All @@ -159,26 +184,30 @@ func dataSourceAlicloudResourceManagerFoldersRead(d *schema.ResourceData, meta i
"folder_id": fmt.Sprint(object["FolderId"]),
"folder_name": object["FolderName"],
}

ids = append(ids, fmt.Sprint(mapping["id"]))
names = append(names, object["FolderName"])

if detailedEnabled := d.Get("enable_details"); !detailedEnabled.(bool) {
ids = append(ids, fmt.Sprint(object["FolderId"]))
names = append(names, object["FolderName"])
s = append(s, mapping)
continue
}

resourcemanagerService := ResourcemanagerService{client}
id := fmt.Sprint(object["FolderId"])
getResp, err := resourcemanagerService.DescribeResourceManagerFolder(id)
resourceManagerService := ResourcemanagerService{client}

resourceManagerFolderDetail, err := resourceManagerService.DescribeResourceManagerFolder(id)
if err != nil {
return WrapError(err)
}
mapping["parent_folder_id"] = getResp["ParentFolderId"]
ids = append(ids, fmt.Sprint(object["FolderId"]))
names = append(names, object["FolderName"])

mapping["parent_folder_id"] = resourceManagerFolderDetail["ParentFolderId"]

s = append(s, mapping)
}

d.SetId(dataResourceIdHash(ids))

if err := d.Set("ids", ids); err != nil {
return WrapError(err)
}
Expand All @@ -190,6 +219,7 @@ func dataSourceAlicloudResourceManagerFoldersRead(d *schema.ResourceData, meta i
if err := d.Set("folders", s); err != nil {
return WrapError(err)
}

if output, ok := d.GetOk("output_file"); ok && output.(string) != "" {
writeToFile(output.(string), s)
}
Expand Down
Loading

0 comments on commit eee970a

Please sign in to comment.