Skip to content

Commit

Permalink
resource/alicloud_resource_manager_control_policy_attachment: : Added…
Browse files Browse the repository at this point in the history 
… retry strategy for error code ConcurrentCallNotSupported
  • Loading branch information
@MrWolong @ChenHanZhang
MrWolong authored and ChenHanZhang committed Dec 26, 2024
1 parent aa9768e commit 6056a03
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 79 deletions.
2 changes: 1 addition & 1 deletion alicloud/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,7 @@ func Provider() terraform.ResourceProvider {
"alicloud_rds_parameter_group": resourceAlicloudRdsParameterGroup(),
"alicloud_ecs_launch_template": resourceAliCloudEcsLaunchTemplate(),
"alicloud_resource_manager_control_policy": resourceAlicloudResourceManagerControlPolicy(),
"alicloud_resource_manager_control_policy_attachment": resourceAlicloudResourceManagerControlPolicyAttachment(),
"alicloud_resource_manager_control_policy_attachment": resourceAliCloudResourceManagerControlPolicyAttachment(),
"alicloud_rds_account": resourceAlicloudRdsAccount(),
"alicloud_rds_db_node": resourceAlicloudRdsDBNode(),
"alicloud_rds_db_instance_endpoint": resourceAlicloudRdsDBInstanceEndpoint(),
Expand Down
69 changes: 45 additions & 24 deletions alicloud/resource_alicloud_resource_manager_control_policy_attachment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func resourceAlicloudResourceManagerControlPolicyAttachment() *schema.Resource {
func resourceAliCloudResourceManagerControlPolicyAttachment() *schema.Resource {
return &schema.Resource{
Create: resourceAlicloudResourceManagerControlPolicyAttachmentCreate,
Read: resourceAlicloudResourceManagerControlPolicyAttachmentRead,
Delete: resourceAlicloudResourceManagerControlPolicyAttachmentDelete,
Create: resourceAliCloudResourceManagerControlPolicyAttachmentCreate,
Read: resourceAliCloudResourceManagerControlPolicyAttachmentRead,
Delete: resourceAliCloudResourceManagerControlPolicyAttachmentDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(5 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
},
Schema: map[string]*schema.Schema{
"policy_id": {
Type: schema.TypeString,
Expand All @@ -34,7 +38,7 @@ func resourceAlicloudResourceManagerControlPolicyAttachment() *schema.Resource {
}
}

func resourceAlicloudResourceManagerControlPolicyAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAliCloudResourceManagerControlPolicyAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
var response map[string]interface{}
action := "AttachControlPolicy"
Expand All @@ -43,84 +47,101 @@ func resourceAlicloudResourceManagerControlPolicyAttachmentCreate(d *schema.Reso
if err != nil {
return WrapError(err)
}

request["PolicyId"] = d.Get("policy_id")
request["TargetId"] = d.Get("target_id")
wait := incrementalWait(3*time.Second, 3*time.Second)

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-31"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-31"), StringPointer("AK"), nil, request, &runtime)
if err != nil {
if NeedRetry(err) {
if IsExpectedErrors(err, []string{"ConcurrentCallNotSupported"}) || NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)

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

d.SetId(fmt.Sprint(request["PolicyId"], ":", request["TargetId"]))
d.SetId(fmt.Sprintf("%v:%v", request["PolicyId"], request["TargetId"]))

return resourceAlicloudResourceManagerControlPolicyAttachmentRead(d, meta)
return resourceAliCloudResourceManagerControlPolicyAttachmentRead(d, meta)
}
func resourceAlicloudResourceManagerControlPolicyAttachmentRead(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudResourceManagerControlPolicyAttachmentRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
resourcemanagerService := ResourcemanagerService{client}
_, err := resourcemanagerService.DescribeResourceManagerControlPolicyAttachment(d.Id())

object, err := resourcemanagerService.DescribeResourceManagerControlPolicyAttachment(d.Id())
if err != nil {
if NotFoundError(err) {
if !d.IsNewResource() && NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_resource_manager_control_policy_attachment resourcemanagerService.DescribeResourceManagerControlPolicyAttachment Failed!!! %s", err)
d.SetId("")
return nil
}
return WrapError(err)
}

parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}
d.Set("policy_id", parts[0])

d.Set("policy_id", object["PolicyId"])
d.Set("target_id", parts[1])

return nil
}
func resourceAlicloudResourceManagerControlPolicyAttachmentDelete(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudResourceManagerControlPolicyAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}
action := "DetachControlPolicy"
var response map[string]interface{}
conn, err := client.NewResourcemanagerClient()
if err != nil {
return WrapError(err)
}

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

request := map[string]interface{}{
"PolicyId": parts[0],
"TargetId": parts[1],
}

wait := incrementalWait(3*time.Second, 3*time.Second)
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-31"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
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)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)

if err != nil {
if IsExpectedErrors(err, []string{"EntityNotExists.Target"}) {
if IsExpectedErrors(err, []string{"EntityNotExists.Target"}) || NotFoundError(err) {
return nil
}
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}

return nil
}
53 changes: 25 additions & 28 deletions alicloud/resource_alicloud_resource_manager_control_policy_attachment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,30 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
)

func TestAccAlicloudResourceManagerControlPolicyAttachment_basic(t *testing.T) {
func TestAccAliCloudResourceManagerControlPolicyAttachment_basic0(t *testing.T) {
var v map[string]interface{}
resourceId := "alicloud_resource_manager_control_policy_attachment.default"
ra := resourceAttrInit(resourceId, AlicloudResourceManagerControlPolicyAttachmentMap0)
ra := resourceAttrInit(resourceId, AliCloudResourceManagerControlPolicyAttachmentMap0)
rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} {
return &ResourcemanagerService{testAccProvider.Meta().(*connectivity.AliyunClient)}
}, "DescribeResourceManagerControlPolicyAttachment")
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("tf-testacc%srcontrolpolicy%d", defaultRegionToTest, rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudResourceManagerControlPolicyAttachmentBasicDependence0)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudResourceManagerControlPolicyAttachmentBasicDependence0)
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheckEnterpriseAccountEnabled(t)
testAccPreCheck(t)
},

IDRefreshName: resourceId,
Providers: testAccProviders,
CheckDestroy: rac.checkResourceDestroy(),
Steps: []resource.TestStep{
{
Config: testAccConfig(map[string]interface{}{
"policy_id": "${alicloud_resource_manager_control_policy.example.id}",
"target_id": "${alicloud_resource_manager_folder.example.id}",
"policy_id": "${alicloud_resource_manager_control_policy.default.id}",
"target_id": "${alicloud_resource_manager_folder.default.id}",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
Expand All @@ -63,29 +61,28 @@ func TestAccAlicloudResourceManagerControlPolicyAttachment_basic(t *testing.T) {
})
}

var AlicloudResourceManagerControlPolicyAttachmentMap0 = map[string]string{}
var AliCloudResourceManagerControlPolicyAttachmentMap0 = map[string]string{}

func AlicloudResourceManagerControlPolicyAttachmentBasicDependence0(name string) string {
func AliCloudResourceManagerControlPolicyAttachmentBasicDependence0(name string) string {
return fmt.Sprintf(`
variable "name" {
default = "%s"
}
resource "alicloud_resource_manager_folder" "example" {
folder_name = "tf-testAcc870912"
}
variable "name" {
default = "%s"
}
resource "alicloud_resource_manager_control_policy" "example" {
control_policy_name = var.name
description = var.name
effect_scope = "RAM"
policy_document = "{\"Version\":\"1\",\"Statement\":[{\"Effect\":\"Deny\",\"Action\":[\"ram:UpdateRole\",\"ram:DeleteRole\",\"ram:AttachPolicyToRole\",\"ram:DetachPolicyFromRole\"],\"Resource\":\"acs:ram:*:*:role/ResourceDirectoryAccountAccessRole\"}]}"
}
resource "alicloud_resource_manager_folder" "default" {
folder_name = var.name
}
resource "alicloud_resource_manager_control_policy" "default" {
control_policy_name = var.name
description = var.name
effect_scope = "RAM"
policy_document = "{\"Version\":\"1\",\"Statement\":[{\"Effect\":\"Deny\",\"Action\":[\"ram:UpdateRole\",\"ram:DeleteRole\",\"ram:AttachPolicyToRole\",\"ram:DetachPolicyFromRole\"],\"Resource\":\"acs:ram:*:*:role/ResourceDirectoryAccountAccessRole\"}]}"
}
`, name)
}

func TestUnitAlicloudResourceManagerControlPolicyAttachment(t *testing.T) {
func TestUnitAliCloudResourceManagerControlPolicyAttachment(t *testing.T) {
p := Provider().(*schema.Provider).ResourcesMap
dInit, _ := schema.InternalMap(p["alicloud_resource_manager_control_policy_attachment"].Schema).Data(nil, nil)
dExisted, _ := schema.InternalMap(p["alicloud_resource_manager_control_policy_attachment"].Schema).Data(nil, nil)
Expand Down Expand Up @@ -150,7 +147,7 @@ func TestUnitAlicloudResourceManagerControlPolicyAttachment(t *testing.T) {
StatusCode: tea.Int(400),
}
})
err = resourceAlicloudResourceManagerControlPolicyAttachmentCreate(dInit, rawClient)
err = resourceAliCloudResourceManagerControlPolicyAttachmentCreate(dInit, rawClient)
patches.Reset()
assert.NotNil(t, err)
ReadMockResponseDiff := map[string]interface{}{
Expand All @@ -175,7 +172,7 @@ func TestUnitAlicloudResourceManagerControlPolicyAttachment(t *testing.T) {
}
return ReadMockResponse, nil
})
err := resourceAlicloudResourceManagerControlPolicyAttachmentCreate(dInit, rawClient)
err := resourceAliCloudResourceManagerControlPolicyAttachmentCreate(dInit, rawClient)
patches.Reset()
switch errorCode {
case "NonRetryableError":
Expand Down Expand Up @@ -220,7 +217,7 @@ func TestUnitAlicloudResourceManagerControlPolicyAttachment(t *testing.T) {
}
return ReadMockResponse, nil
})
err := resourceAlicloudResourceManagerControlPolicyAttachmentRead(dExisted, rawClient)
err := resourceAliCloudResourceManagerControlPolicyAttachmentRead(dExisted, rawClient)
patches.Reset()
switch errorCode {
case "NonRetryableError":
Expand All @@ -239,7 +236,7 @@ func TestUnitAlicloudResourceManagerControlPolicyAttachment(t *testing.T) {
StatusCode: tea.Int(400),
}
})
err = resourceAlicloudResourceManagerControlPolicyAttachmentDelete(dExisted, rawClient)
err = resourceAliCloudResourceManagerControlPolicyAttachmentDelete(dExisted, rawClient)
patches.Reset()
assert.NotNil(t, err)
attributesDiff = map[string]interface{}{}
Expand Down Expand Up @@ -267,7 +264,7 @@ func TestUnitAlicloudResourceManagerControlPolicyAttachment(t *testing.T) {
}
return ReadMockResponse, nil
})
err := resourceAlicloudResourceManagerControlPolicyAttachmentDelete(dExisted, rawClient)
err := resourceAliCloudResourceManagerControlPolicyAttachmentDelete(dExisted, rawClient)
patches.Reset()
switch errorCode {
case "NonRetryableError":
Expand Down
49 changes: 33 additions & 16 deletions alicloud/service_alicloud_resourcemanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,49 +508,66 @@ func (s *ResourcemanagerService) DescribeResourceManagerControlPolicy(id string)

func (s *ResourcemanagerService) DescribeResourceManagerControlPolicyAttachment(id string) (object map[string]interface{}, err error) {
var response map[string]interface{}
action := "ListControlPolicyAttachmentsForTarget"

conn, err := s.client.NewResourcemanagerClient()
if err != nil {
return nil, WrapError(err)
}
action := "ListControlPolicyAttachmentsForTarget"

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

request := map[string]interface{}{
"RegionId": s.client.RegionId,
"TargetId": parts[1],
}

idExist := false
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, 5*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 {
if IsExpectedErrors(err, []string{"EntityNotExists.Target"}) {
err = WrapErrorf(Error(GetNotFoundMessage("ResourceManagerControlPolicyAttachment", id)), NotFoundMsg, ProviderERROR)
return object, err
return object, WrapErrorf(Error(GetNotFoundMessage("ResourceManager:ControlPolicyAttachment", id)), NotFoundWithResponse, response)
}
err = WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR)
return object, err
return object, WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR)
}
addDebug(action, response, request)
v, err := jsonpath.Get("$.ControlPolicyAttachments.ControlPolicyAttachment", response)

resp, err := jsonpath.Get("$.ControlPolicyAttachments.ControlPolicyAttachment", response)
if err != nil {
return object, WrapErrorf(err, FailedGetAttributeMsg, id, "$.ControlPolicyAttachments.ControlPolicyAttachment", response)
}
if len(v.([]interface{})) < 1 {
return object, WrapErrorf(Error(GetNotFoundMessage("ResourceManager", id)), NotFoundWithResponse, response)

if v, ok := resp.([]interface{}); !ok || len(v) < 1 {
return object, WrapErrorf(Error(GetNotFoundMessage("ResourceManager:ControlPolicyAttachment", id)), NotFoundWithResponse, response)
}
for _, v := range v.([]interface{}) {
if v.(map[string]interface{})["PolicyId"].(string) == parts[0] {

for _, v := range resp.([]interface{}) {
if fmt.Sprint(v.(map[string]interface{})["PolicyId"]) == parts[0] {
idExist = true
return v.(map[string]interface{}), nil
}
}

if !idExist {
return object, WrapErrorf(Error(GetNotFoundMessage("ResourceManager", id)), NotFoundWithResponse, response)
return object, WrapErrorf(Error(GetNotFoundMessage("ResourceManager:ControlPolicyAttachment", id)), NotFoundWithResponse, response)
}

return object, nil
}

Expand Down
Loading

0 comments on commit 6056a03

Please sign in to comment.