Skip to content

Commit 051f12d

Browse files
committed
fix(monitor): [122656438] modify read return
1 parent dc3ef10 commit 051f12d

11 files changed

+23
-14
lines changed

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_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: 2 additions & 1 deletion
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))

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_cluster_agent.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,8 @@ func resourceTencentCloudMonitorTmpTkeClusterAgentRead(d *schema.ResourceData, m
328328

329329
if clusterAgent == nil {
330330
d.SetId("")
331-
return fmt.Errorf("resource `global_notification` %s does not exist", instanceId)
331+
log.Printf("[WARN]%s resource `cluster_agent` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
332+
return nil
332333
}
333334

334335
var agents []map[string]interface{}

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package tmp
22

33
import (
44
"context"
5-
"fmt"
65
"log"
76
"strings"
87

@@ -141,7 +140,8 @@ func resourceTencentCloudTkeTmpConfigRead(d *schema.ResourceData, meta interface
141140

142141
if params == nil {
143142
d.SetId("")
144-
return fmt.Errorf("resource `prometheus_config` %s does not exist", configId)
143+
log.Printf("[WARN]%s resource `prometheus_config` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
144+
return nil
145145
}
146146

147147
if e := d.Set("config", params.Config); e != nil {

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_global_notification.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package tmp
22

33
import (
44
"context"
5-
"fmt"
5+
"log"
66

77
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
88
svcmonitor "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/monitor"
@@ -176,7 +176,8 @@ func resourceTencentCloudMonitorTmpTkeGlobalNotificationRead(d *schema.ResourceD
176176

177177
if globalNotification == nil {
178178
d.SetId("")
179-
return fmt.Errorf("resource `global_notification` %s does not exist", instanceId)
179+
log.Printf("[WARN]%s resource `global_notification` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
180+
return nil
180181
}
181182

182183
if *globalNotification.Enabled {

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package tmp
22

33
import (
44
"context"
5-
"fmt"
65
"log"
76

87
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
@@ -332,7 +331,8 @@ func resourceTencentCloudMonitorTmpTkeTemplateRead(d *schema.ResourceData, meta
332331

333332
if template == nil {
334333
d.SetId("")
335-
return fmt.Errorf("resource `template` %s does not exist", templateId)
334+
log.Printf("[WARN]%s resource `template` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
335+
return nil
336336
}
337337

338338
templates := make([]map[string]interface{}, 0)

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_template_attachment.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ func resourceTencentCloudMonitorTmpTkeTemplateAttachmentRead(d *schema.ResourceD
186186

187187
if targets == nil || len(targets) < 1 {
188188
d.SetId("")
189-
return fmt.Errorf("resource `targets` %s does not exist", templateId)
189+
log.Printf("[WARN]%s resource `targets` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
190+
return nil
190191
}
191192

192193
tempTargets := make([]map[string]interface{}, 0)

0 commit comments

Comments
 (0)