Skip to content

Fix/monitor updata client #1599

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 6 commits into from
Mar 17, 2023
Merged

Fix/monitor updata client #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8e0e56
fix: migration update api
Mar 8, 2023
132fa6c
fix: update monitor_grafana_integration doc
Mar 13, 2023
d5a3fb5
fix: update sdk
Mar 14, 2023
211fb74
fix: merge master
Mar 14, 2023
0a39da0
fix: filter default template
Mar 16, 2023
d2bb372
fix: merge master
Mar 16, 2023
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.599
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.606
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.616
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.572
Expand All @@ -56,7 +56,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.606
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391
Expand Down
26 changes: 26 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,18 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.599/go.mod
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.600/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.606 h1:3Y3xlzSikB9BfKIfrTXQpwzeW97cxetqyq1kuMaMc08=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.606/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.607 h1:wbluBSYuaUENPmdPRfhAJFzCSpigwqeqjy8tEtx/pgk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.607/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.608 h1:yLiHPyhxJDEpNRCVF5hfA3e1eV9VJMvbCqLJq1VG5/U=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.608/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.609 h1:vl7nWq9lUgZ1YuNuN5/O32kz+inRVEFIjs2s2NxgoQc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.609/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.610 h1:W57v1rwhZbHAAgwqCccbLObIJoKos6G6rmq+evJ2ppo=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.610/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.611 h1:lAsu5kMPUpBhIo9/7VgFUH/pMgXNCwCsntTmwu1HSKY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.611/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.616 h1:g9epN2QSSkxRVIAKAeUEDBzYRnAtvgeczXVQPoC9prU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.616/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553 h1:Pl1kYgFhJp0QSoVFSzRsiGk+HfEAkBTQg7+O60tytNA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553/go.mod h1:dnnqPxXYK+kax3e1MKo/PI3iWJtytm6ogWKQHJS7SGE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589 h1:LZihgirMH0vsaGScYexxwY0fTss9vHaSZs/YOQUVESg=
Expand Down Expand Up @@ -567,6 +579,20 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.606 h1:Fs1
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.606/go.mod h1:XrotKKNeP8jLqt4I9LSoIGpLt1UPd2MnLpxFNrJrts4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518 h1:XClo3Xa5F9pko91olHT85aZXXcRkQiOYBCMqm8+tHG8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518/go.mod h1:WDTvvrrc90KE+90iizkoSQRsoSSQ3881eBC6NeypmTI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.606 h1:X7oA/fOra7VpPgJAHh2T9+DENx2Xc+s+tKLEW5ZyOKQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.606/go.mod h1:nRfdR0Nc7OJIwGqX13wlrsVpU9VC7b8pp/eUPhKrnlU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.607 h1:EMw6yhFpbPKYKe+OOarj3BhZX/8VgtHJPE3lb+Aah2E=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.607/go.mod h1:btYADbe5A3QefUMrZeXiGIrXUmHMrdkoy398243LY+Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.608 h1:eAXC9r/ajeKACa/exA5od4mvATOjV2gQvNyfoleJLgk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.608/go.mod h1:fbCBYwtIW5chhsmqoXUgW1ZoRPXEEuOWo7IGrLPmGFo=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.609 h1:ByDWOMzEu/qVTf2NhyHUtkUB19L3AxAxUEZ4M8MS5Xw=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.609/go.mod h1:Og9WXael0uEGu6iuQpgrbDgSP5S3W1EvoxrHWTnkwfQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.610 h1:2YuoZplaRZev7CC+otA63Z4ZiPmY9mMH630lesND3O8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.610/go.mod h1:Dj0tct8PXX3yQgpVRhxc5oj8j1AqIl4o4kE3VVhMB00=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.611 h1:P+zAHToadSa6Z/V6DRmHAAicSj4KiMCcerixx3n1vYc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.611/go.mod h1:ce+NGcotxtAaRmJ/89ejAnohxcAz0wMgISRHJ3E+jAo=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616 h1:+4NM1Repe514qc4H9qFuDS0IEe0TBmC5snea//YL7Kk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616/go.mod h1:n7vl5IwlMQS/XzBzj3UEkp1dvQorzuAMq6RYNgl/MjM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584 h1:FJxYOAolkBhXjQMWoiTek9Ag0bslcKFHyrM7w2Jsxos=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584/go.mod h1:CY/hEcXbaOZBU9Qm/MMIctafi8FFJaMIGTlGUjnymW0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540 h1:gUVuwcjt9baj+/5LFafjdR53/xSdQxfA45Vp6E65rXU=
Expand Down
1 change: 0 additions & 1 deletion tencentcloud/resource_tc_monitor_grafana_integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ resource "tencentcloud_monitor_grafana_integration" "grafanaIntegration_update"
}

```

*/
package tencentcloud

Expand Down
38 changes: 19 additions & 19 deletions tencentcloud/resource_tc_monitor_tmp_tke_alert_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
)

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

var (
request = tke.NewCreatePrometheusAlertPolicyRequest()
response *tke.CreatePrometheusAlertPolicyResponse
request = monitor.NewCreatePrometheusAlertPolicyRequest()
response *monitor.CreatePrometheusAlertPolicyResponse
)

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

if dMap, ok := helper.InterfacesHeadMap(d, "alert_rule"); ok {
prometheusAlertPolicyItem := tke.PrometheusAlertPolicyItem{}
prometheusAlertPolicyItem := monitor.PrometheusAlertPolicyItem{}
if v, ok := dMap["name"]; ok {
prometheusAlertPolicyItem.Name = helper.String(v.(string))
}
if v, ok := dMap["rules"]; ok {
for _, item := range v.([]interface{}) {
RulesMap := item.(map[string]interface{})
prometheusAlertRule := tke.PrometheusAlertRule{}
prometheusAlertRule := monitor.PrometheusAlertRule{}
if v, ok := RulesMap["name"]; ok {
prometheusAlertRule.Name = helper.String(v.(string))
}
Expand All @@ -327,7 +327,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
if v, ok := RulesMap["labels"]; ok {
for _, item := range v.([]interface{}) {
labelsMap := item.(map[string]interface{})
label := tke.Label{}
label := monitor.Label{}
if v, ok := labelsMap["name"]; ok {
label.Name = helper.String(v.(string))
}
Expand All @@ -340,7 +340,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
if v, ok := RulesMap["annotations"]; ok {
for _, item := range v.([]interface{}) {
AnnotationsMap := item.(map[string]interface{})
label := tke.Label{}
label := monitor.Label{}
if v, ok := AnnotationsMap["name"]; ok {
label.Name = helper.String(v.(string))
}
Expand All @@ -363,7 +363,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
prometheusAlertPolicyItem.TemplateId = helper.String(v.(string))
}
if NotificationMap, ok := helper.InterfaceToMap(dMap, "notification"); ok {
prometheusNotificationItem := tke.PrometheusNotificationItem{}
prometheusNotificationItem := monitor.PrometheusNotificationItem{}
if v, ok := NotificationMap["enabled"]; ok {
prometheusNotificationItem.Enabled = helper.Bool(v.(bool))
}
Expand All @@ -374,7 +374,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
prometheusNotificationItem.WebHook = helper.String(v.(string))
}
if AlertManagerMap, ok := helper.InterfaceToMap(NotificationMap, "alert_manager"); ok {
prometheusAlertManagerConfig := tke.PrometheusAlertManagerConfig{}
prometheusAlertManagerConfig := monitor.PrometheusAlertManagerConfig{}
if v, ok := AlertManagerMap["url"]; ok {
prometheusAlertManagerConfig.Url = helper.String(v.(string))
}
Expand Down Expand Up @@ -440,7 +440,7 @@ func resourceTencentCloudTkeTmpAlertPolicyCreate(d *schema.ResourceData, meta in
}

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

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

logId := getLogId(contextNil)

request := tke.NewModifyPrometheusAlertPolicyRequest()
request := monitor.NewModifyPrometheusAlertPolicyRequest()

ids := strings.Split(d.Id(), FILED_SP)
if len(ids) != 2 {
Expand All @@ -607,14 +607,14 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
return fmt.Errorf("`alert_rule` do not support change now.")
}
if dMap, ok := helper.InterfacesHeadMap(d, "alert_rule"); ok {
prometheusAlertPolicyItem := tke.PrometheusAlertPolicyItem{}
prometheusAlertPolicyItem := monitor.PrometheusAlertPolicyItem{}
if v, ok := dMap["name"]; ok {
prometheusAlertPolicyItem.Name = helper.String(v.(string))
}
if v, ok := dMap["rules"]; ok {
for _, item := range v.([]interface{}) {
RulesMap := item.(map[string]interface{})
prometheusAlertRule := tke.PrometheusAlertRule{}
prometheusAlertRule := monitor.PrometheusAlertRule{}
if v, ok := RulesMap["name"]; ok {
prometheusAlertRule.Name = helper.String(v.(string))
}
Expand All @@ -633,7 +633,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
if v, ok := RulesMap["annotations"]; ok {
for _, item := range v.([]interface{}) {
AnnotationsMap := item.(map[string]interface{})
label := tke.Label{}
label := monitor.Label{}
if v, ok := AnnotationsMap["name"]; ok {
label.Name = helper.String(v.(string))
}
Expand All @@ -656,7 +656,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
prometheusAlertPolicyItem.TemplateId = helper.String(v.(string))
}
if NotificationMap, ok := helper.InterfaceToMap(dMap, "notification"); ok {
prometheusNotificationItem := tke.PrometheusNotificationItem{}
prometheusNotificationItem := monitor.PrometheusNotificationItem{}
if v, ok := NotificationMap["enabled"]; ok {
prometheusNotificationItem.Enabled = helper.Bool(v.(bool))
}
Expand All @@ -667,7 +667,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
prometheusNotificationItem.WebHook = helper.String(v.(string))
}
if AlertManagerMap, ok := helper.InterfaceToMap(NotificationMap, "alert_manager"); ok {
prometheusAlertManagerConfig := tke.PrometheusAlertManagerConfig{}
prometheusAlertManagerConfig := monitor.PrometheusAlertManagerConfig{}
if v, ok := AlertManagerMap["url"]; ok {
prometheusAlertManagerConfig.Url = helper.String(v.(string))
}
Expand Down Expand Up @@ -733,7 +733,7 @@ func resourceTencentCloudTkeTmpAlertPolicyUpdate(d *schema.ResourceData, meta in
}

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

service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
service := MonitorService{client: meta.(*TencentCloudClient).apiV3Conn}
ids := strings.Split(d.Id(), FILED_SP)
if len(ids) != 2 {
return fmt.Errorf("id is broken, id is %s", d.Id())
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_monitor_tmp_tke_alert_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestAccTencentCloudMonitorTmpTkeAlertPolicy_basic(t *testing.T) {
func testAccCheckTmpTkeAlertPolicyDestroy(s *terraform.State) error {
logId := getLogId(contextNil)
ctx := context.WithValue(context.TODO(), logIdKey, logId)
service := TkeService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
service := MonitorService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
for _, rs := range s.RootModule().Resources {
if rs.Type != "tencentcloud_monitor_tmp_tke_alert_policy" {
continue
Expand Down Expand Up @@ -139,7 +139,7 @@ func testAccCheckTmpTkeAlertPolicyExists(r string) resource.TestCheckFunc {
instanceId := items[0]
tmpAlertPolicyId := items[1]

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