Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/alicloud_cms_dynamic_tag_group: update CreateDynamicTagGroup to async #6831

Merged
merged 1 commit into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
}
}
Loading