Skip to content

Commit f578f2a

Browse files
gitmknanonymous
andauthored
Fix/monitor updata client (#1599)
* fix: migration update api * fix: update monitor_grafana_integration doc * fix: update sdk * fix: filter default template --------- Co-authored-by: anonymous <anonymous@mail.org>
1 parent 9118e11 commit f578f2a

24 files changed

+10644
-4996
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.599
3838
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
40-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.606
40+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.616
4141
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553
4242
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.572
@@ -56,7 +56,7 @@ require (
5656
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
5757
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532
5858
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.606
59-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518
59+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540
6262
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391

go.sum

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,18 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.599/go.mod
528528
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.600/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
529529
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.606 h1:3Y3xlzSikB9BfKIfrTXQpwzeW97cxetqyq1kuMaMc08=
530530
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.606/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
531+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.607 h1:wbluBSYuaUENPmdPRfhAJFzCSpigwqeqjy8tEtx/pgk=
532+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.607/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
533+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.608 h1:yLiHPyhxJDEpNRCVF5hfA3e1eV9VJMvbCqLJq1VG5/U=
534+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.608/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
535+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.609 h1:vl7nWq9lUgZ1YuNuN5/O32kz+inRVEFIjs2s2NxgoQc=
536+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.609/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
537+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.610 h1:W57v1rwhZbHAAgwqCccbLObIJoKos6G6rmq+evJ2ppo=
538+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.610/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
539+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.611 h1:lAsu5kMPUpBhIo9/7VgFUH/pMgXNCwCsntTmwu1HSKY=
540+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.611/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
541+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.616 h1:g9epN2QSSkxRVIAKAeUEDBzYRnAtvgeczXVQPoC9prU=
542+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.616/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
531543
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553 h1:Pl1kYgFhJp0QSoVFSzRsiGk+HfEAkBTQg7+O60tytNA=
532544
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553/go.mod h1:dnnqPxXYK+kax3e1MKo/PI3iWJtytm6ogWKQHJS7SGE=
533545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589 h1:LZihgirMH0vsaGScYexxwY0fTss9vHaSZs/YOQUVESg=
@@ -567,6 +579,20 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.606 h1:Fs1
567579
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.606/go.mod h1:XrotKKNeP8jLqt4I9LSoIGpLt1UPd2MnLpxFNrJrts4=
568580
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518 h1:XClo3Xa5F9pko91olHT85aZXXcRkQiOYBCMqm8+tHG8=
569581
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518/go.mod h1:WDTvvrrc90KE+90iizkoSQRsoSSQ3881eBC6NeypmTI=
582+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.606 h1:X7oA/fOra7VpPgJAHh2T9+DENx2Xc+s+tKLEW5ZyOKQ=
583+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.606/go.mod h1:nRfdR0Nc7OJIwGqX13wlrsVpU9VC7b8pp/eUPhKrnlU=
584+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.607 h1:EMw6yhFpbPKYKe+OOarj3BhZX/8VgtHJPE3lb+Aah2E=
585+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.607/go.mod h1:btYADbe5A3QefUMrZeXiGIrXUmHMrdkoy398243LY+Y=
586+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.608 h1:eAXC9r/ajeKACa/exA5od4mvATOjV2gQvNyfoleJLgk=
587+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.608/go.mod h1:fbCBYwtIW5chhsmqoXUgW1ZoRPXEEuOWo7IGrLPmGFo=
588+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.609 h1:ByDWOMzEu/qVTf2NhyHUtkUB19L3AxAxUEZ4M8MS5Xw=
589+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.609/go.mod h1:Og9WXael0uEGu6iuQpgrbDgSP5S3W1EvoxrHWTnkwfQ=
590+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.610 h1:2YuoZplaRZev7CC+otA63Z4ZiPmY9mMH630lesND3O8=
591+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.610/go.mod h1:Dj0tct8PXX3yQgpVRhxc5oj8j1AqIl4o4kE3VVhMB00=
592+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.611 h1:P+zAHToadSa6Z/V6DRmHAAicSj4KiMCcerixx3n1vYc=
593+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.611/go.mod h1:ce+NGcotxtAaRmJ/89ejAnohxcAz0wMgISRHJ3E+jAo=
594+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616 h1:+4NM1Repe514qc4H9qFuDS0IEe0TBmC5snea//YL7Kk=
595+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616/go.mod h1:n7vl5IwlMQS/XzBzj3UEkp1dvQorzuAMq6RYNgl/MjM=
570596
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584 h1:FJxYOAolkBhXjQMWoiTek9Ag0bslcKFHyrM7w2Jsxos=
571597
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584/go.mod h1:CY/hEcXbaOZBU9Qm/MMIctafi8FFJaMIGTlGUjnymW0=
572598
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540 h1:gUVuwcjt9baj+/5LFafjdR53/xSdQxfA45Vp6E65rXU=

tencentcloud/resource_tc_monitor_grafana_integration.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ resource "tencentcloud_monitor_grafana_integration" "grafanaIntegration_update"
1717
}
1818
1919
```
20-
2120
*/
2221
package tencentcloud
2322

tencentcloud/resource_tc_monitor_tmp_tke_alert_policy.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040

4141
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
4242
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
43-
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
43+
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
4444
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
4545
)
4646

@@ -292,23 +292,23 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
292292
logId := getLogId(contextNil)
293293

294294
var (
295-
request = tke.NewCreatePrometheusAlertPolicyRequest()
296-
response *tke.CreatePrometheusAlertPolicyResponse
295+
request = monitor.NewCreatePrometheusAlertPolicyRequest()
296+
response *monitor.CreatePrometheusAlertPolicyResponse
297297
)
298298

299299
if v, ok := d.GetOk("instance_id"); ok {
300300
request.InstanceId = helper.String(v.(string))
301301
}
302302

303303
if dMap, ok := helper.InterfacesHeadMap(d, "alert_rule"); ok {
304-
prometheusAlertPolicyItem := tke.PrometheusAlertPolicyItem{}
304+
prometheusAlertPolicyItem := monitor.PrometheusAlertPolicyItem{}
305305
if v, ok := dMap["name"]; ok {
306306
prometheusAlertPolicyItem.Name = helper.String(v.(string))
307307
}
308308
if v, ok := dMap["rules"]; ok {
309309
for _, item := range v.([]interface{}) {
310310
RulesMap := item.(map[string]interface{})
311-
prometheusAlertRule := tke.PrometheusAlertRule{}
311+
prometheusAlertRule := monitor.PrometheusAlertRule{}
312312
if v, ok := RulesMap["name"]; ok {
313313
prometheusAlertRule.Name = helper.String(v.(string))
314314
}
@@ -327,7 +327,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
327327
if v, ok := RulesMap["labels"]; ok {
328328
for _, item := range v.([]interface{}) {
329329
labelsMap := item.(map[string]interface{})
330-
label := tke.Label{}
330+
label := monitor.Label{}
331331
if v, ok := labelsMap["name"]; ok {
332332
label.Name = helper.String(v.(string))
333333
}
@@ -340,7 +340,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
340340
if v, ok := RulesMap["annotations"]; ok {
341341
for _, item := range v.([]interface{}) {
342342
AnnotationsMap := item.(map[string]interface{})
343-
label := tke.Label{}
343+
label := monitor.Label{}
344344
if v, ok := AnnotationsMap["name"]; ok {
345345
label.Name = helper.String(v.(string))
346346
}
@@ -363,7 +363,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
363363
prometheusAlertPolicyItem.TemplateId = helper.String(v.(string))
364364
}
365365
if NotificationMap, ok := helper.InterfaceToMap(dMap, "notification"); ok {
366-
prometheusNotificationItem := tke.PrometheusNotificationItem{}
366+
prometheusNotificationItem := monitor.PrometheusNotificationItem{}
367367
if v, ok := NotificationMap["enabled"]; ok {
368368
prometheusNotificationItem.Enabled = helper.Bool(v.(bool))
369369
}
@@ -374,7 +374,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
374374
prometheusNotificationItem.WebHook = helper.String(v.(string))
375375
}
376376
if AlertManagerMap, ok := helper.InterfaceToMap(NotificationMap, "alert_manager"); ok {
377-
prometheusAlertManagerConfig := tke.PrometheusAlertManagerConfig{}
377+
prometheusAlertManagerConfig := monitor.PrometheusAlertManagerConfig{}
378378
if v, ok := AlertManagerMap["url"]; ok {
379379
prometheusAlertManagerConfig.Url = helper.String(v.(string))
380380
}
@@ -440,7 +440,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
440440
}
441441

442442
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
443-
result, e := meta.(*TencentCloudClient).apiV3Conn.UseTkeClient().CreatePrometheusAlertPolicy(request)
443+
result, e := meta.(*TencentCloudClient).apiV3Conn.UseMonitorClient().CreatePrometheusAlertPolicy(request)
444444
if e != nil {
445445
return retryError(e)
446446
} else {
@@ -478,7 +478,7 @@ func resourceTencentCloudTkeTmpAlertPolicyRead(d *schema.ResourceData, meta inte
478478
instanceId := ids[0]
479479
tmpAlertPolicyId := ids[1]
480480

481-
service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
481+
service := MonitorService{client: meta.(*TencentCloudClient).apiV3Conn}
482482
tmpAlertPolicy, err := service.DescribeTkeTmpAlertPolicy(ctx, instanceId, tmpAlertPolicyId)
483483
if err != nil {
484484
return err
@@ -588,7 +588,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
588588

589589
logId := getLogId(contextNil)
590590

591-
request := tke.NewModifyPrometheusAlertPolicyRequest()
591+
request := monitor.NewModifyPrometheusAlertPolicyRequest()
592592

593593
ids := strings.Split(d.Id(), FILED_SP)
594594
if len(ids) != 2 {
@@ -607,14 +607,14 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
607607
return fmt.Errorf("`alert_rule` do not support change now.")
608608
}
609609
if dMap, ok := helper.InterfacesHeadMap(d, "alert_rule"); ok {
610-
prometheusAlertPolicyItem := tke.PrometheusAlertPolicyItem{}
610+
prometheusAlertPolicyItem := monitor.PrometheusAlertPolicyItem{}
611611
if v, ok := dMap["name"]; ok {
612612
prometheusAlertPolicyItem.Name = helper.String(v.(string))
613613
}
614614
if v, ok := dMap["rules"]; ok {
615615
for _, item := range v.([]interface{}) {
616616
RulesMap := item.(map[string]interface{})
617-
prometheusAlertRule := tke.PrometheusAlertRule{}
617+
prometheusAlertRule := monitor.PrometheusAlertRule{}
618618
if v, ok := RulesMap["name"]; ok {
619619
prometheusAlertRule.Name = helper.String(v.(string))
620620
}
@@ -633,7 +633,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
633633
if v, ok := RulesMap["annotations"]; ok {
634634
for _, item := range v.([]interface{}) {
635635
AnnotationsMap := item.(map[string]interface{})
636-
label := tke.Label{}
636+
label := monitor.Label{}
637637
if v, ok := AnnotationsMap["name"]; ok {
638638
label.Name = helper.String(v.(string))
639639
}
@@ -656,7 +656,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
656656
prometheusAlertPolicyItem.TemplateId = helper.String(v.(string))
657657
}
658658
if NotificationMap, ok := helper.InterfaceToMap(dMap, "notification"); ok {
659-
prometheusNotificationItem := tke.PrometheusNotificationItem{}
659+
prometheusNotificationItem := monitor.PrometheusNotificationItem{}
660660
if v, ok := NotificationMap["enabled"]; ok {
661661
prometheusNotificationItem.Enabled = helper.Bool(v.(bool))
662662
}
@@ -667,7 +667,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
667667
prometheusNotificationItem.WebHook = helper.String(v.(string))
668668
}
669669
if AlertManagerMap, ok := helper.InterfaceToMap(NotificationMap, "alert_manager"); ok {
670-
prometheusAlertManagerConfig := tke.PrometheusAlertManagerConfig{}
670+
prometheusAlertManagerConfig := monitor.PrometheusAlertManagerConfig{}
671671
if v, ok := AlertManagerMap["url"]; ok {
672672
prometheusAlertManagerConfig.Url = helper.String(v.(string))
673673
}
@@ -733,7 +733,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
733733
}
734734

735735
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
736-
result, e := meta.(*TencentCloudClient).apiV3Conn.UseTkeClient().ModifyPrometheusAlertPolicy(request)
736+
result, e := meta.(*TencentCloudClient).apiV3Conn.UseMonitorClient().ModifyPrometheusAlertPolicy(request)
737737
if e != nil {
738738
return retryError(e)
739739
} else {
@@ -757,7 +757,7 @@ func resourceTencentCloudTkeTmpAlertPolicyDelete(d *schema.ResourceData, meta in
757757
logId := getLogId(contextNil)
758758
ctx := context.WithValue(context.TODO(), logIdKey, logId)
759759

760-
service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
760+
service := MonitorService{client: meta.(*TencentCloudClient).apiV3Conn}
761761
ids := strings.Split(d.Id(), FILED_SP)
762762
if len(ids) != 2 {
763763
return fmt.Errorf("id is broken, id is %s", d.Id())

tencentcloud/resource_tc_monitor_tmp_tke_alert_policy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestAccTencentCloudMonitorTmpTkeAlertPolicy_basic(t *testing.T) {
9494
func testAccCheckTmpTkeAlertPolicyDestroy(s *terraform.State) error {
9595
logId := getLogId(contextNil)
9696
ctx := context.WithValue(context.TODO(), logIdKey, logId)
97-
service := TkeService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
97+
service := MonitorService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
9898
for _, rs := range s.RootModule().Resources {
9999
if rs.Type != "tencentcloud_monitor_tmp_tke_alert_policy" {
100100
continue
@@ -139,7 +139,7 @@ func testAccCheckTmpTkeAlertPolicyExists(r string) resource.TestCheckFunc {
139139
instanceId := items[0]
140140
tmpAlertPolicyId := items[1]
141141

142-
service := TkeService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
142+
service := MonitorService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
143143
tmpAlertPolicy, err := service.DescribeTkeTmpAlertPolicy(ctx, instanceId, tmpAlertPolicyId)
144144
if tmpAlertPolicy == nil {
145145
return fmt.Errorf("alert policy %s is not found", rs.Primary.ID)

0 commit comments

Comments
 (0)