Skip to content

Commit

Permalink
update CreateDynamicTagGroup to async
Browse files Browse the repository at this point in the history
  • Loading branch information
shanye997 authored and ChenHanZhang committed Jan 9, 2024
1 parent 1748dff commit fe24bfb
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
6 changes: 6 additions & 0 deletions alicloud/resource_alicloud_cms_dynamic_tag_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ func resourceAlicloudCmsDynamicTagGroupCreate(d *schema.ResourceData, meta inter

d.SetId(fmt.Sprint(response["Id"]))

cmsService := CmsService{client}
stateConf := BuildStateConf([]string{}, []string{"FINISH"}, d.Timeout(schema.TimeoutCreate), 5*time.Second, cmsService.CmsDynamicTagGroupStateRefreshFunc(d.Id(), []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}

return resourceAlicloudCmsDynamicTagGroupRead(d, meta)
}

Expand Down
4 changes: 2 additions & 2 deletions alicloud/resource_alicloud_cms_dynamic_tag_group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func testSweepCmsDynamicTagGroup(region string) error {
return nil
}

func TestAccAlicloudCmsDynamicTagGroup_basic0(t *testing.T) {
func TestAccAliCloudCmsDynamicTagGroup_basic0(t *testing.T) {
var v map[string]interface{}
checkoutSupportedRegions(t, true, connectivity.CmsDynamicTagGroupSupportRegions)
resourceId := "alicloud_cms_dynamic_tag_group.default"
Expand Down Expand Up @@ -164,7 +164,7 @@ var AlicloudCloudMonitorServiceDynamicTagGroupMap0 = map[string]string{
"contact_group_list.#": CHECKSET,
"tag_key": CHECKSET,
"match_express_filter_relation": CHECKSET,
"template_id_list.#": CHECKSET,
// "template_id_list.#": CHECKSET,
}

func AlicloudCloudMonitorServiceDynamicTagGroupBasicDependence0(name string) string {
Expand Down
20 changes: 20 additions & 0 deletions alicloud/service_alicloud_cms.go
Original file line number Diff line number Diff line change
Expand Up @@ -1010,3 +1010,23 @@ func (s *CmsService) CmsMetricRuleBlackListStateRefreshFunc(d *schema.ResourceDa
return object, fmt.Sprint(object[""]), nil
}
}

func (s *CmsService) CmsDynamicTagGroupStateRefreshFunc(id string, failStates []string) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
object, err := s.DescribeCmsDynamicTagGroup(id)
if err != nil {
if NotFoundError(err) {
// Set this to nil as if we didn't find anything.
return nil, "", nil
}
return nil, "", WrapError(err)
}

for _, failState := range failStates {
if fmt.Sprint(object["Status"]) == failState {
return object, fmt.Sprint(object["Status"]), WrapError(Error(FailedToReachTargetStatus, fmt.Sprint(object["Status"])))
}
}
return object, fmt.Sprint(object["Status"]), nil
}
}

0 comments on commit fe24bfb

Please sign in to comment.