fix(monitor): [122656438] modify read return (#3249)

* fix(monitor): [122656438] modify read return

* feat: add changelog

* fix: moidfy test

* fix: moidfy test

Author: gitmkn

.changelog/3249.txt

@@ -0,0 +1,43 @@
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_alert_rule: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmpCvmAgent: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_exporter_integration: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_tmp_monitor_recording_rule: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmpScrapeJob: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_tke_tmp_alert_policy: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_tke_cluster_agent: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_tke_tmp_config: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_tke_global_notification: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_tke_template: Modify the query to be empty without error.
+```
+
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_tke_template_attachment: Modify the query to be empty without error.
+```

tencentcloud/acctest/basic.go

@@ -214,14 +214,14 @@ variable "international_subnet_id" {
 // Tke Exclusive Network Environment
 const (
 	TkeExclusiveVpcName   = "keep_tke_exclusive_vpc"
-	DefaultTkeClusterId   = "cls-r8gqwjw6"
+	DefaultTkeClusterId   = "cls-2weetaxi"
 	DefaultTkeClusterName = "keep-tke-cluster"
 	DefaultTkeClusterType = "tke"
-	DefaultPrometheusId   = "prom-1lspn8sw"
+	DefaultPrometheusId   = "prom-9ywsz034"
 	DefaultTemplateId     = "temp-gqunlvo1"
-	ClusterPrometheusId   = "prom-g261hacc"
-	TkeClusterIdAgent     = "cls-9ae9qo9k"
-	TkeClusterTypeAgent   = "eks"
+	ClusterPrometheusId   = "prom-9ywsz034"
+	TkeClusterIdAgent     = "cls-2weetaxi"
+	TkeClusterTypeAgent   = "tke"
 	DefaultAgentId        = "agent-q3zy8gt8"
 )
 

tencentcloud/services/tmp/resource_tc_monitor_tmp_alert_group_test.go

@@ -112,7 +112,7 @@ resource "tencentcloud_monitor_tmp_alert_group" "tmp_alert_group" {
     "notice-om017kc2",
   ]
   group_name      = "tf-test"
-  instance_id     = tencentcloud_monitor_tmp_instance.basic.id
+  instance_id     = tencentcloud_monitor_tmp_instance.example.id
   repeat_interval = "5m"
 
   custom_receiver {
@@ -145,7 +145,7 @@ resource "tencentcloud_monitor_tmp_alert_group" "tmp_alert_group" {
     "notice-om017kc2",
   ]
   group_name      = "tf-test-up"
-  instance_id     = tencentcloud_monitor_tmp_instance.basic.id
+  instance_id     = tencentcloud_monitor_tmp_instance.example.id
   repeat_interval = "1h"
 
   custom_receiver {

tencentcloud/services/tmp/resource_tc_monitor_tmp_alert_rule.go

@@ -227,7 +227,8 @@ func resourceTencentCloudMonitorTmpAlertRuleRead(d *schema.ResourceData, meta in
 
 	if tmpAlertRule == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `tmpAlertRule` %s does not exist", ids[1])
+		log.Printf("[WARN]%s resource `tmpAlertRule` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	_ = d.Set("instance_id", ids[0])

tencentcloud/services/tmp/resource_tc_monitor_tmp_alert_rule_test.go

@@ -125,7 +125,7 @@ func testAccCheckAlertRuleExists(r string) resource.TestCheckFunc {
 
 const testAlertRule_basic = testInstance_basic + `
 resource "tencentcloud_monitor_tmp_alert_rule" "basic" {
-  instance_id	= tencentcloud_monitor_tmp_instance.basic.id
+  instance_id	= tencentcloud_monitor_tmp_instance.example.id
   rule_name		= "test-rule_name"
   receivers 	= ["notice-tj75hgqj"]
   expr			= "increase(mysql_global_status_slow_queries[1m]) > 0"
@@ -143,7 +143,7 @@ resource "tencentcloud_monitor_tmp_alert_rule" "basic" {
 
 const testAlertRule_update = testInstance_basic + `
 resource "tencentcloud_monitor_tmp_alert_rule" "basic" {
-  instance_id	= tencentcloud_monitor_tmp_instance.basic.id
+  instance_id	= tencentcloud_monitor_tmp_instance.example.id
   rule_name		= "test-rule_name_update"
   receivers 	= ["notice-tj75hgqj"]
   expr			= "increase(mysql_global_status_slow_queries[1m]) > 1"

tencentcloud/services/tmp/resource_tc_monitor_tmp_cvm_agent.go

@@ -116,7 +116,8 @@ func resourceTencentCloudMonitorTmpCvmAgentRead(d *schema.ResourceData, meta int
 
 	if tmpCvmAgent == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `tmpCvmAgent` %s does not exist", ids[1])
+		log.Printf("[WARN]%s resource `tmpCvmAgent` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	if tmpCvmAgent.InstanceId != nil {

tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go

@@ -189,7 +189,8 @@ func resourceTencentCloudMonitorTmpExporterIntegrationRead(d *schema.ResourceDat
 
 	if tmpExporterIntegration == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `tmpExporterIntegration` %s does not exist", tmpExporterIntegrationId)
+		log.Printf("[WARN]%s resource `tmpExporterIntegration` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	if tmpExporterIntegration.Kind != nil {

tencentcloud/services/tmp/resource_tc_monitor_tmp_recording_rule.go

@@ -122,7 +122,8 @@ func resourceTencentCloudMonitorTmpRecordingRuleRead(d *schema.ResourceData, met
 
 	if recordingRule == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `recordingRule` %s does not exist", ids[1])
+		log.Printf("[WARN]%s resource `recordingRule` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	_ = d.Set("instance_id", ids[0])

tencentcloud/services/tmp/resource_tc_monitor_tmp_scrape_job.go

@@ -118,7 +118,8 @@ func resourceTencentCloudMonitorTmpScrapeJobRead(d *schema.ResourceData, meta in
 
 	if tmpScrapeJob == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `tmpScrapeJob` %s does not exist", tmpScrapeJobId)
+		log.Printf("[WARN]%s resource `tmpScrapeJob` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	_ = d.Set("instance_id", strings.Split(tmpScrapeJobId, tccommon.FILED_SP)[1])

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_alert_policy.go

@@ -458,7 +458,8 @@ func resourceTencentCloudTkeTmpAlertPolicyRead(d *schema.ResourceData, meta inte
 	log.Printf("[DEBUG] tmpAlertPolicy[%v]\n", tmpAlertPolicy)
 	if tmpAlertPolicy == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `AlertPolicy` %s does not exist", tmpAlertPolicyId)
+		log.Printf("[WARN]%s resource `AlertPolicy` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	rules := make([]map[string]interface{}, 0, len(tmpAlertPolicy.Rules))
@@ -490,13 +491,15 @@ func resourceTencentCloudTkeTmpAlertPolicyRead(d *schema.ResourceData, meta inte
 	}
 
 	notify := tmpAlertPolicy.Notification
-	alertManager := map[string]interface{}{
-		"url":          notify.AlertManager.Url,
-		"cluster_type": notify.AlertManager.ClusterType,
-		"cluster_id":   notify.AlertManager.ClusterId,
-	}
 	var alertManagers []map[string]interface{}
-	alertManagers = append(alertManagers, alertManager)
+	if notify.AlertManager != nil {
+		alertManager := map[string]interface{}{
+			"url":          notify.AlertManager.Url,
+			"cluster_type": notify.AlertManager.ClusterType,
+			"cluster_id":   notify.AlertManager.ClusterId,
+		}
+		alertManagers = append(alertManagers, alertManager)
+	}
 
 	var notifyWay []string
 	if len(notify.NotifyWay) > 0 {

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_cluster_agent.go

@@ -328,7 +328,8 @@ func resourceTencentCloudMonitorTmpTkeClusterAgentRead(d *schema.ResourceData, m
 
 	if clusterAgent == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `global_notification` %s does not exist", instanceId)
+		log.Printf("[WARN]%s resource `cluster_agent` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	var agents []map[string]interface{}

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_config.go

@@ -2,7 +2,6 @@ package tmp
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"strings"
 
@@ -141,7 +140,8 @@ func resourceTencentCloudTkeTmpConfigRead(d *schema.ResourceData, meta interface
 
 	if params == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `prometheus_config` %s does not exist", configId)
+		log.Printf("[WARN]%s resource `prometheus_config` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	if e := d.Set("config", params.Config); e != nil {

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_global_notification.go

@@ -2,7 +2,7 @@ package tmp
 
 import (
 	"context"
-	"fmt"
+	"log"
 
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
 	svcmonitor "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/monitor"
@@ -176,7 +176,8 @@ func resourceTencentCloudMonitorTmpTkeGlobalNotificationRead(d *schema.ResourceD
 
 	if globalNotification == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `global_notification` %s does not exist", instanceId)
+		log.Printf("[WARN]%s resource `global_notification` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	if *globalNotification.Enabled {

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_template.go

@@ -2,7 +2,6 @@ package tmp
 
 import (
 	"context"
-	"fmt"
 	"log"
 
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
@@ -332,7 +331,8 @@ func resourceTencentCloudMonitorTmpTkeTemplateRead(d *schema.ResourceData, meta
 
 	if template == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `template` %s does not exist", templateId)
+		log.Printf("[WARN]%s resource `template` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	templates := make([]map[string]interface{}, 0)

tencentcloud/services/tmp/resource_tc_monitor_tmp_tke_template_attachment.go

@@ -186,7 +186,8 @@ func resourceTencentCloudMonitorTmpTkeTemplateAttachmentRead(d *schema.ResourceD
 
 	if targets == nil || len(targets) < 1 {
 		d.SetId("")
-		return fmt.Errorf("resource `targets` %s does not exist", templateId)
+		log.Printf("[WARN]%s resource `targets` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
 	}
 
 	tempTargets := make([]map[string]interface{}, 0)