fix(monitor): [122814398] tencentcloud_monitor_tmp_exporter_integration Offline resources

.changelog/3290.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_monitor_tmp_exporter_integration: This resource has been deprecated in Terraform TencentCloud provider version `1.81.182`. Please use `tencentcloud_monitor_tmp_exporter_integration_v2` instead.
+```
+
+```release-note:new-resource
+tencentcloud_monitor_tmp_exporter_integration_v2
+```

tencentcloud/provider.go

@@ -1517,6 +1517,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_monitor_tmp_cvm_agent":                                                    tmp.ResourceTencentCloudMonitorTmpCvmAgent(),
 			"tencentcloud_monitor_tmp_scrape_job":                                                   tmp.ResourceTencentCloudMonitorTmpScrapeJob(),
 			"tencentcloud_monitor_tmp_exporter_integration":                                         tmp.ResourceTencentCloudMonitorTmpExporterIntegration(),
+			"tencentcloud_monitor_tmp_exporter_integration_v2":                                      tmp.ResourceTencentCloudMonitorTmpExporterIntegrationV2(),
 			"tencentcloud_monitor_tmp_alert_rule":                                                   tmp.ResourceTencentCloudMonitorTmpAlertRule(),
 			"tencentcloud_monitor_tmp_recording_rule":                                               tmp.ResourceTencentCloudMonitorTmpRecordingRule(),
 			"tencentcloud_monitor_tmp_multiple_writes":                                              tmp.ResourceTencentCloudMonitorTmpMultipleWrites(),

tencentcloud/provider.md

@@ -849,6 +849,7 @@ Resource
 tencentcloud_monitor_tmp_instance
 tencentcloud_monitor_tmp_alert_rule
 tencentcloud_monitor_tmp_exporter_integration
+tencentcloud_monitor_tmp_exporter_integration_v2
 tencentcloud_monitor_tmp_cvm_agent
 tencentcloud_monitor_tmp_scrape_job
 tencentcloud_monitor_tmp_recording_rule

tencentcloud/services/monitor/service_tencentcloud_monitor.go

@@ -544,14 +544,26 @@ func (me *MonitorService) DescribeMonitorTmpExporterIntegration(ctx context.Cont
 	}()
 
 	ids := strings.Split(tmpExporterIntegrationId, tccommon.FILED_SP)
-	if ids[0] != "" {
-		request.Name = &ids[0]
+	if len(ids) == 5 {
+		if ids[0] != "" {
+			request.Name = &ids[0]
+		}
+
+		request.InstanceId = &ids[1]
+		kubeType, _ := strconv.Atoi(ids[2])
+		request.KubeType = helper.IntInt64(kubeType)
+		request.ClusterId = &ids[3]
+		request.Kind = &ids[4]
+	} else if len(ids) == 3 {
+		if ids[0] != "" {
+			request.Name = &ids[0]
+		}
+
+		request.InstanceId = &ids[1]
+		request.Kind = &ids[2]
+	} else {
+		return nil, fmt.Errorf("id is broken, id is %s", tmpExporterIntegrationId)
 	}
-	request.InstanceId = &ids[1]
-	kubeType, _ := strconv.Atoi(ids[2])
-	request.KubeType = helper.IntInt64(kubeType)
-	request.ClusterId = &ids[3]
-	request.Kind = &ids[4]
 
 	response, err := me.client.UseMonitorClient().DescribeExporterIntegrations(request)
 	if err != nil {
@@ -560,12 +572,14 @@ func (me *MonitorService) DescribeMonitorTmpExporterIntegration(ctx context.Cont
 		errRet = err
 		return
 	}
+
 	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
 		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
 	if len(response.Response.IntegrationSet) < 1 {
 		return
 	}
+
 	tmpExporterIntegration = response.Response.IntegrationSet[0]
 	return
 }
@@ -576,12 +590,26 @@ func (me *MonitorService) DeleteMonitorTmpExporterIntegrationById(ctx context.Co
 	request := monitor.NewDeleteExporterIntegrationRequest()
 	ids := strings.Split(tmpExporterIntegrationId, tccommon.FILED_SP)
 
-	request.Name = &ids[0]
-	request.InstanceId = &ids[1]
-	kubeType, _ := strconv.Atoi(ids[2])
-	request.KubeType = helper.IntInt64(kubeType)
-	request.ClusterId = &ids[3]
-	request.Kind = &ids[4]
+	if len(ids) == 5 {
+		if ids[0] != "" {
+			request.Name = &ids[0]
+		}
+
+		request.InstanceId = &ids[1]
+		kubeType, _ := strconv.Atoi(ids[2])
+		request.KubeType = helper.IntInt64(kubeType)
+		request.ClusterId = &ids[3]
+		request.Kind = &ids[4]
+	} else if len(ids) == 3 {
+		if ids[0] != "" {
+			request.Name = &ids[0]
+		}
+
+		request.InstanceId = &ids[1]
+		request.Kind = &ids[2]
+	} else {
+		return fmt.Errorf("id is broken, id is %s", tmpExporterIntegrationId)
+	}
 
 	defer func() {
 		if errRet != nil {
@@ -596,6 +624,7 @@ func (me *MonitorService) DeleteMonitorTmpExporterIntegrationById(ctx context.Co
 		errRet = err
 		return err
 	}
+
 	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
 		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 

tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go

@@ -19,10 +19,11 @@ import (
 
 func ResourceTencentCloudMonitorTmpExporterIntegration() *schema.Resource {
 	return &schema.Resource{
-		Read:   resourceTencentCloudMonitorTmpExporterIntegrationRead,
-		Create: resourceTencentCloudMonitorTmpExporterIntegrationCreate,
-		Update: resourceTencentCloudMonitorTmpExporterIntegrationUpdate,
-		Delete: resourceTencentCloudMonitorTmpExporterIntegrationDelete,
+		DeprecationMessage: "This resource has been deprecated in Terraform TencentCloud provider version 1.81.182. Please use 'tencentcloud_monitor_tmp_exporter_integration_v2' instead.",
+		Read:               resourceTencentCloudMonitorTmpExporterIntegrationRead,
+		Create:             resourceTencentCloudMonitorTmpExporterIntegrationCreate,
+		Update:             resourceTencentCloudMonitorTmpExporterIntegrationUpdate,
+		Delete:             resourceTencentCloudMonitorTmpExporterIntegrationDelete,
 		Schema: map[string]*schema.Schema{
 			"instance_id": {
 				Type:        schema.TypeString,

tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.md

@@ -1,5 +1,7 @@
 Provides a resource to create a monitor tmpExporterIntegration
 
+~> **NOTE:** This resource has been deprecated in Terraform TencentCloud provider version `1.81.182`. Please use `tencentcloud_monitor_tmp_exporter_integration_v2` instead.
+
 ~> **NOTE:** If you only want to upgrade the exporter version with same config, you can set `version` under `instanceSpec` with any value to trigger the change.
 
 Example Usage