Skip to content

fix alarm policy import error when has event condition #792

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 21, 2021
Merged

fix alarm policy import error when has event condition #792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 22 additions & 25 deletions tencentcloud/resource_tc_monitor_alarm_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,15 +614,17 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
"unit": rule.Unit,
"rule_type": rule.RuleType,
}
if *rule.Filter.Type != "" || *rule.Filter.Dimensions != "" {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": rule.Filter.Type,
"dimensions": rule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)
if len(filter) > 0 {
m["filter"] = filter
if rule.Filter != nil {
if *rule.Filter.Type != "" || *rule.Filter.Dimensions != "" {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": rule.Filter.Type,
"dimensions": rule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)
if len(filter) > 0 {
m["filter"] = filter
}
}
}

Expand All @@ -637,12 +639,6 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac

eventConditions := make([]map[string]interface{}, 0, len(policy.EventCondition.Rules))
for _, eventRule := range policy.EventCondition.Rules {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": eventRule.Filter.Type,
"dimensions": eventRule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)

m := make(map[string]interface{}, 5)
m["metric_name"] = eventRule.MetricName
Expand All @@ -656,16 +652,17 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
m["description"] = eventRule.Description
m["unit"] = eventRule.Unit
m["rule_type"] = eventRule.RuleType

if *eventRule.Filter.Type != "" || *eventRule.Filter.Dimensions != "" {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": eventRule.Filter.Type,
"dimensions": eventRule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)
if len(filter) > 0 {
m["filter"] = filter
if eventRule.Filter != nil {
if *eventRule.Filter.Type != "" || *eventRule.Filter.Dimensions != "" {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": eventRule.Filter.Type,
"dimensions": eventRule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)
if len(filter) > 0 {
m["filter"] = filter
}
}
}
eventConditions = append(eventConditions, m)
Expand Down