Skip to content

Commit 06af583

Browse files
author
hellertang
authored
fix tencentcloud_monitor_alarm_policy bug and modify docs (#780)
1 parent d71ccf1 commit 06af583

File tree

5 files changed

+41
-20
lines changed

5 files changed

+41
-20
lines changed

tencentcloud/resource_tc_ckafka_instance.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
Use this resource to create ckafka instance.
33
4+
~> **NOTE:** It only support create profession ckafka instance.
5+
46
Example Usage
57
68
```hcl
@@ -10,7 +12,12 @@ resource "tencentcloud_ckafka_instance" "foo" {
1012
period = 1
1113
vpc_id = "vpc-boi1ah65"
1214
subnet_id = "subnet-7ros461e"
13-
msg_retention_time = 1440
15+
msg_retention_time = 1300
16+
renew_flag = 0
17+
kafka_version = "1.1.1"
18+
disk_size = 500
19+
disk_type = "CLOUD_BASIC"
20+
1421
1522
config {
1623
auto_create_topic_enable = true

tencentcloud/resource_tc_clb_customized_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Example Usage
55
66
```hcl
77
resource "tencentcloud_clb_customized_config" "foo" {
8-
config_content = "client_max_body_size 224M;"
8+
config_content = "client_max_body_size 224M;\r\nclient_body_timeout 60s;"
99
config_name = "helloWorld"
1010
load_balancer_ids = [
1111
"${tencentcloud_clb_instance.internal_clb.id}",

tencentcloud/resource_tc_monitor_alarm_policy.go

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -433,14 +433,16 @@ func resourceTencentMonitorAlarmPolicyCreate(d *schema.ResourceData, meta interf
433433
if m["is_power_notice"] != nil {
434434
alarmPolicyRule.IsPowerNotice = helper.IntInt64(m["is_power_notice"].(int))
435435
}
436-
if m["filter"] != nil {
437-
filters := m["filter"].([]interface{})
438-
filter := filters[0].(map[string]interface{})
439-
alarmPolicyFilter := monitor.AlarmPolicyFilter{
440-
Type: helper.String(filter["type"].(string)),
441-
Dimensions: helper.String(filter["dimensions"].(string)),
436+
if v, ok := m["filter"]; ok {
437+
filters := v.([]interface{})
438+
if len(filters) > 0 {
439+
filter := filters[0].(map[string]interface{})
440+
alarmPolicyFilter := monitor.AlarmPolicyFilter{
441+
Type: helper.String(filter["type"].(string)),
442+
Dimensions: helper.String(filter["dimensions"].(string)),
443+
}
444+
alarmPolicyRule.Filter = &alarmPolicyFilter
442445
}
443-
alarmPolicyRule.Filter = &alarmPolicyFilter
444446
}
445447

446448
if m["description"] != nil {
@@ -486,12 +488,14 @@ func resourceTencentMonitorAlarmPolicyCreate(d *schema.ResourceData, meta interf
486488
}
487489
if m["filter"] != nil {
488490
filters := m["filter"].([]interface{})
489-
filter := filters[0].(map[string]interface{})
490-
alarmPolicyFilter := monitor.AlarmPolicyFilter{
491-
Type: helper.String(filter["type"].(string)),
492-
Dimensions: helper.String(filter["dimensions"].(string)),
491+
if len(filters) > 0 {
492+
filter := filters[0].(map[string]interface{})
493+
alarmPolicyFilter := monitor.AlarmPolicyFilter{
494+
Type: helper.String(filter["type"].(string)),
495+
Dimensions: helper.String(filter["dimensions"].(string)),
496+
}
497+
alarmPolicyRule.Filter = &alarmPolicyFilter
493498
}
494-
alarmPolicyRule.Filter = &alarmPolicyFilter
495499
}
496500
if m["description"] != nil {
497501
alarmPolicyRule.Description = helper.String(m["description"].(string))
@@ -610,14 +614,16 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
610614
"unit": rule.Unit,
611615
"rule_type": rule.RuleType,
612616
}
613-
if rule.Filter != nil {
617+
if *rule.Filter.Type != "" || *rule.Filter.Dimensions != "" {
614618
var filter = make([]interface{}, 0, 10)
615619
alarmPolicyFilter := map[string]interface{}{
616620
"type": rule.Filter.Type,
617621
"dimensions": rule.Filter.Dimensions,
618622
}
619623
filter = append(filter, alarmPolicyFilter)
620-
m["filter"] = filter
624+
if len(filter) > 0 {
625+
m["filter"] = filter
626+
}
621627
}
622628

623629
rules = append(rules, m)
@@ -651,14 +657,16 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
651657
m["unit"] = eventRule.Unit
652658
m["rule_type"] = eventRule.RuleType
653659

654-
if eventRule.Filter != nil {
660+
if *eventRule.Filter.Type != "" || *eventRule.Filter.Dimensions != "" {
655661
var filter = make([]interface{}, 0, 10)
656662
alarmPolicyFilter := map[string]interface{}{
657663
"type": eventRule.Filter.Type,
658664
"dimensions": eventRule.Filter.Dimensions,
659665
}
660666
filter = append(filter, alarmPolicyFilter)
661-
m["filter"] = filter
667+
if len(filter) > 0 {
668+
m["filter"] = filter
669+
}
662670
}
663671
eventConditions = append(eventConditions, m)
664672
}

website/docs/r/ckafka_instance.html.markdown

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ description: |-
1111

1212
Use this resource to create ckafka instance.
1313

14+
~> **NOTE:** It only support create profession ckafka instance.
15+
1416
## Example Usage
1517

1618
```hcl
@@ -20,7 +22,11 @@ resource "tencentcloud_ckafka_instance" "foo" {
2022
period = 1
2123
vpc_id = "vpc-boi1ah65"
2224
subnet_id = "subnet-7ros461e"
23-
msg_retention_time = 1440
25+
msg_retention_time = 1300
26+
renew_flag = 0
27+
kafka_version = "1.1.1"
28+
disk_size = 500
29+
disk_type = "CLOUD_BASIC"
2430
2531
config {
2632
auto_create_topic_enable = true

website/docs/r/clb_customized_config.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Provides a resource to create a CLB customized config.
1515

1616
```hcl
1717
resource "tencentcloud_clb_customized_config" "foo" {
18-
config_content = "client_max_body_size 224M;"
18+
config_content = "client_max_body_size 224M;\r\nclient_body_timeout 60s;"
1919
config_name = "helloWorld"
2020
load_balancer_ids = [
2121
"${tencentcloud_clb_instance.internal_clb.id}",

0 commit comments

Comments
 (0)