Skip to content

Commit 9264764

Browse files
authored
feat: support amp_consumer_id (#2081)
* feat: support amp_consumer_id * feat: add chagnelog * fix: modify test
1 parent f7d6aad commit 9264764

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

.changelog/2081.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datasource/tencentcloud_monitor_alarm_notices: Support `amp_consumer_id` field
3+
```

tencentcloud/data_source_tc_monitor_alarm_notices.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,11 @@ func dataSourceTencentMonitorAlarmNotices() *schema.Resource {
263263
Description: "List of alarm policy IDs bound to the alarm notification template.",
264264
Elem: &schema.Schema{Type: schema.TypeString},
265265
},
266+
"amp_consumer_id": {
267+
Type: schema.TypeString,
268+
Computed: true,
269+
Description: "AMP consumer ID.",
270+
},
266271
},
267272
},
268273
},
@@ -337,6 +342,7 @@ func dataSourceTencentMonitorAlarmNoticesRead(d *schema.ResourceData, meta inter
337342
"is_preset": noticesItem.IsPreset,
338343
"notice_language": noticesItem.NoticeLanguage,
339344
"policy_ids": noticesItem.PolicyIds,
345+
"amp_consumer_id": noticesItem.AMPConsumerId,
340346
}
341347

342348
userNoticesItems := make([]interface{}, 0, 100)

tencentcloud/data_source_tc_monitor_alarm_notices_test.go

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
77
)
88

9+
// go test -i; go test -test.run TestAccAlarmNoticesDatasourceBasic -v
910
func TestAccAlarmNoticesDatasourceBasic(t *testing.T) {
1011
t.Parallel()
1112
resource.Test(t, resource.TestCase{
@@ -16,23 +17,26 @@ func TestAccAlarmNoticesDatasourceBasic(t *testing.T) {
1617
Config: testAccDataSourceAlarmNotices(),
1718
Check: resource.ComposeTestCheckFunc(
1819
testAccCheckTencentCloudDataSourceID("data.tencentcloud_monitor_alarm_notices.notices"),
19-
//resource.TestCheckResourceAttr("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.#", "2"),
20-
resource.TestCheckResourceAttr("data.tencentcloud_monitor_alarm_notices.notices", "order", "DESC"),
21-
resource.TestCheckResourceAttr("data.tencentcloud_monitor_alarm_notices.notices", "owner_uid", "1"),
20+
resource.TestCheckResourceAttr("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.#", "1"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.amp_consumer_id"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.is_preset"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.name"),
24+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.notice_language"),
25+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.notice_type"),
26+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.policy_ids.#"),
27+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.updated_at"),
28+
resource.TestCheckResourceAttrSet("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.updated_by"),
29+
resource.TestCheckResourceAttr("data.tencentcloud_monitor_alarm_notices.notices", "alarm_notice.0.user_notices.#", "1"),
2230
),
2331
},
2432
},
2533
})
2634
}
2735

2836
func testAccDataSourceAlarmNotices() string {
29-
return `data "tencentcloud_monitor_alarm_notices" "notices" {
30-
order = "DESC"
31-
owner_uid = 1
32-
name = ""
33-
receiver_type = ""
34-
user_ids = []
35-
group_ids = []
36-
notice_ids = []
37+
return `
38+
data "tencentcloud_monitor_alarm_notices" "notices" {
39+
order = "DESC"
40+
notice_ids = ["notice-f2svbu3w"]
3741
}`
3842
}

website/docs/d/monitor_alarm_notices.html.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ The following arguments are supported:
4343
In addition to all arguments above, the following attributes are exported:
4444

4545
* `alarm_notice` - Alarm notification template list.
46+
* `amp_consumer_id` - AMP consumer ID.
4647
* `cls_notices` - A maximum of one alarm notification can be pushed to the CLS service.
4748
* `enable` - Start-stop status, can not be transmitted, default enabled. 0= Disabled, 1= enabled.
4849
* `log_set_id` - Log collection Id.

0 commit comments

Comments
 (0)