add

Author: SevenEarth

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 {
@@ -576,12 +588,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 {

tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go

@@ -89,7 +89,7 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
 		request.Content = helper.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("kube_type"); ok {
+	if v, ok := d.GetOkExists("kube_type"); ok {
 		kubeType = v.(int)
 		request.KubeType = helper.IntInt64(kubeType)
 	}
@@ -99,6 +99,10 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
 		request.ClusterId = helper.String(clusterId)
 	}
 
+	if kubeType == 0 && clusterId == "" {
+		return fmt.Errorf("`kube_type` and `cluster_id` can only be set simultaneously or not set at all")
+	}
+
 	initStatus := monitor.NewDescribePrometheusInstanceInitStatusRequest()
 	initStatus.InstanceId = request.InstanceId
 	err := resource.Retry(8*tccommon.ReadRetryTimeout, func() *resource.RetryError {
@@ -165,7 +169,11 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
 
 	tmpExporterIntegrationId := *response.Response.Names[0]
 
-	d.SetId(strings.Join([]string{tmpExporterIntegrationId, instanceId, strconv.Itoa(kubeType), clusterId, kind}, tccommon.FILED_SP))
+	if kubeType != 0 && clusterId != "" {
+		d.SetId(strings.Join([]string{tmpExporterIntegrationId, instanceId, strconv.Itoa(kubeType), clusterId, kind}, tccommon.FILED_SP))
+	} else {
+		d.SetId(strings.Join([]string{tmpExporterIntegrationId, instanceId, kind}, tccommon.FILED_SP))
+	}
 
 	return resourceTencentCloudMonitorTmpExporterIntegrationRead(d, meta)
 }
@@ -231,7 +239,7 @@ func resourceTencentCloudMonitorTmpExporterIntegrationUpdate(d *schema.ResourceD
 		request.Content = helper.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("kube_type"); ok {
+	if v, ok := d.GetOkExists("kube_type"); ok {
 		request.KubeType = helper.IntInt64(v.(int))
 	}