Skip to content

Commit 7cb1ad5

Browse files
gitmkngitmkn
authored
fix(monitor): [122656438] modify read return (#3249)
* fix(monitor): [122656438] modify read return * feat: add changelog * fix: moidfy test * fix: moidfy test
1 parent ec1cba8 commit 7cb1ad5

15 files changed

+83
-29
lines changed

‎.changelog/3249.txt‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_monitor_tmp_alert_rule: Modify the query to be empty without error.
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_monitor_tmpCvmAgent: Modify the query to be empty without error.
7+
```
8+
9+
```release-note:enhancement
10+
resource/tencentcloud_monitor_tmp_exporter_integration: Modify the query to be empty without error.
11+
```
12+
13+
```release-note:enhancement
14+
resource/tencentcloud_tmp_monitor_recording_rule: Modify the query to be empty without error.
15+
```
16+
17+
```release-note:enhancement
18+
resource/tencentcloud_monitor_tmpScrapeJob: Modify the query to be empty without error.
19+
```
20+
21+
```release-note:enhancement
22+
resource/tencentcloud_tke_tmp_alert_policy: Modify the query to be empty without error.
23+
```
24+
25+
```release-note:enhancement
26+
resource/tencentcloud_monitor_tmp_tke_cluster_agent: Modify the query to be empty without error.
27+
```
28+
29+
```release-note:enhancement
30+
resource/tencentcloud_tke_tmp_config: Modify the query to be empty without error.
31+
```
32+
33+
```release-note:enhancement
34+
resource/tencentcloud_monitor_tmp_tke_global_notification: Modify the query to be empty without error.
35+
```
36+
37+
```release-note:enhancement
38+
resource/tencentcloud_monitor_tmp_tke_template: Modify the query to be empty without error.
39+
```
40+
41+
```release-note:enhancement
42+
resource/tencentcloud_monitor_tmp_tke_template_attachment: Modify the query to be empty without error.
43+
```

‎tencentcloud/acctest/basic.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,14 @@ variable "international_subnet_id" {
214214
// Tke Exclusive Network Environment
215215
const (
216216
TkeExclusiveVpcName = "keep_tke_exclusive_vpc"
217-
DefaultTkeClusterId = "cls-r8gqwjw6"
217+
DefaultTkeClusterId = "cls-2weetaxi"
218218
DefaultTkeClusterName = "keep-tke-cluster"
219219
DefaultTkeClusterType = "tke"
220-
DefaultPrometheusId = "prom-1lspn8sw"
220+
DefaultPrometheusId = "prom-9ywsz034"
221221
DefaultTemplateId = "temp-gqunlvo1"
222-
ClusterPrometheusId = "prom-g261hacc"
223-
TkeClusterIdAgent = "cls-9ae9qo9k"
224-
TkeClusterTypeAgent = "eks"
222+
ClusterPrometheusId = "prom-9ywsz034"
223+
TkeClusterIdAgent = "cls-2weetaxi"
224+
TkeClusterTypeAgent = "tke"
225225
DefaultAgentId = "agent-q3zy8gt8"
226226
)
227227

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_alert_group_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ resource "tencentcloud_monitor_tmp_alert_group" "tmp_alert_group" {
112112
"notice-om017kc2",
113113
]
114114
group_name = "tf-test"
115-
instance_id = tencentcloud_monitor_tmp_instance.basic.id
115+
instance_id = tencentcloud_monitor_tmp_instance.example.id
116116
repeat_interval = "5m"
117117
118118
custom_receiver {
@@ -145,7 +145,7 @@ resource "tencentcloud_monitor_tmp_alert_group" "tmp_alert_group" {
145145
"notice-om017kc2",
146146
]
147147
group_name = "tf-test-up"
148-
instance_id = tencentcloud_monitor_tmp_instance.basic.id
148+
instance_id = tencentcloud_monitor_tmp_instance.example.id
149149
repeat_interval = "1h"
150150
151151
custom_receiver {

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_alert_rule.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ func resourceTencentCloudMonitorTmpAlertRuleRead(d *schema.ResourceData, meta in
227227

228228
if tmpAlertRule == nil {
229229
d.SetId("")
230-
return fmt.Errorf("resource `tmpAlertRule` %s does not exist", ids[1])
230+
log.Printf("[WARN]%s resource `tmpAlertRule` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
231+
return nil
231232
}
232233

233234
_ = d.Set("instance_id", ids[0])

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_alert_rule_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func testAccCheckAlertRuleExists(r string) resource.TestCheckFunc {
125125

126126
const testAlertRule_basic = testInstance_basic + `
127127
resource "tencentcloud_monitor_tmp_alert_rule" "basic" {
128-
instance_id = tencentcloud_monitor_tmp_instance.basic.id
128+
instance_id = tencentcloud_monitor_tmp_instance.example.id
129129
rule_name = "test-rule_name"
130130
receivers = ["notice-tj75hgqj"]
131131
expr = "increase(mysql_global_status_slow_queries[1m]) > 0"
@@ -143,7 +143,7 @@ resource "tencentcloud_monitor_tmp_alert_rule" "basic" {
143143

144144
const testAlertRule_update = testInstance_basic + `
145145
resource "tencentcloud_monitor_tmp_alert_rule" "basic" {
146-
instance_id = tencentcloud_monitor_tmp_instance.basic.id
146+
instance_id = tencentcloud_monitor_tmp_instance.example.id
147147
rule_name = "test-rule_name_update"
148148
receivers = ["notice-tj75hgqj"]
149149
expr = "increase(mysql_global_status_slow_queries[1m]) > 1"

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_cvm_agent.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ func resourceTencentCloudMonitorTmpCvmAgentRead(d *schema.ResourceData, meta int
116116

117117
if tmpCvmAgent == nil {
118118
d.SetId("")
119-
return fmt.Errorf("resource `tmpCvmAgent` %s does not exist", ids[1])
119+
log.Printf("[WARN]%s resource `tmpCvmAgent` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
120+
return nil
120121
}
121122

122123
if tmpCvmAgent.InstanceId != nil {

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ func resourceTencentCloudMonitorTmpExporterIntegrationRead(d *schema.ResourceDat
189189

190190
if tmpExporterIntegration == nil {
191191
d.SetId("")
192-
return fmt.Errorf("resource `tmpExporterIntegration` %s does not exist", tmpExporterIntegrationId)
192+
log.Printf("[WARN]%s resource `tmpExporterIntegration` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
193+
return nil
193194
}
194195

195196
if tmpExporterIntegration.Kind != nil {

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_recording_rule.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ func resourceTencentCloudMonitorTmpRecordingRuleRead(d *schema.ResourceData, met
122122

123123
if recordingRule == nil {
124124
d.SetId("")
125-
return fmt.Errorf("resource `recordingRule` %s does not exist", ids[1])
125+
log.Printf("[WARN]%s resource `recordingRule` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
126+
return nil
126127
}
127128

128129
_ = d.Set("instance_id", ids[0])

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_scrape_job.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ func resourceTencentCloudMonitorTmpScrapeJobRead(d *schema.ResourceData, meta in
118118

119119
if tmpScrapeJob == nil {
120120
d.SetId("")
121-
return fmt.Errorf("resource `tmpScrapeJob` %s does not exist", tmpScrapeJobId)
121+
log.Printf("[WARN]%s resource `tmpScrapeJob` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
122+
return nil
122123
}
123124

124125
_ = d.Set("instance_id", strings.Split(tmpScrapeJobId, tccommon.FILED_SP)[1])

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_alert_policy.go‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@ func resourceTencentCloudTkeTmpAlertPolicyRead(d *schema.ResourceData, meta inte
458458
log.Printf("[DEBUG] tmpAlertPolicy[%v]\n", tmpAlertPolicy)
459459
if tmpAlertPolicy == nil {
460460
d.SetId("")
461-
return fmt.Errorf("resource `AlertPolicy` %s does not exist", tmpAlertPolicyId)
461+
log.Printf("[WARN]%s resource `AlertPolicy` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
462+
return nil
462463
}
463464

464465
rules := make([]map[string]interface{}, 0, len(tmpAlertPolicy.Rules))
@@ -490,13 +491,15 @@ func resourceTencentCloudTkeTmpAlertPolicyRead(d *schema.ResourceData, meta inte
490491
}
491492

492493
notify := tmpAlertPolicy.Notification
493-
alertManager := map[string]interface{}{
494-
"url": notify.AlertManager.Url,
495-
"cluster_type": notify.AlertManager.ClusterType,
496-
"cluster_id": notify.AlertManager.ClusterId,
497-
}
498494
var alertManagers []map[string]interface{}
499-
alertManagers = append(alertManagers, alertManager)
495+
if notify.AlertManager != nil {
496+
alertManager := map[string]interface{}{
497+
"url": notify.AlertManager.Url,
498+
"cluster_type": notify.AlertManager.ClusterType,
499+
"cluster_id": notify.AlertManager.ClusterId,
500+
}
501+
alertManagers = append(alertManagers, alertManager)
502+
}
500503

501504
var notifyWay []string
502505
if len(notify.NotifyWay) > 0 {

0 commit comments

Comments
 (0)