add

Author: SevenEarth

tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go

@@ -146,7 +146,7 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
 				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
 
-		if result == nil || result.Response == nil || response.Response.Names == nil {
+		if result == nil || result.Response == nil || result.Response.Names == nil {
 			return resource.NonRetryableError(fmt.Errorf("Create monitor tmpExporterIntegration failed, Response is nil."))
 		}
 
@@ -167,34 +167,11 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
 
 	d.SetId(strings.Join([]string{tmpExporterIntegrationId, instanceId, strconv.Itoa(kubeType), clusterId, kind}, tccommon.FILED_SP))
 
-	// wait
-	err = resource.Retry(8*tccommon.ReadRetryTimeout, func() *resource.RetryError {
-		results, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMonitorClient().DescribePrometheusInstanceInitStatus(initStatus)
-		if errRet != nil {
-			return tccommon.RetryError(errRet, tccommon.InternalError)
-		}
-
-		if results == nil || results.Response == nil || results.Response.Status == nil {
-			return resource.NonRetryableError(fmt.Errorf("prometheusInstanceInit status is nil, operate failed"))
-		}
-
-		status := results.Response.Status
-		if *status == "running" {
-			return nil
-		}
-
-		return resource.RetryableError(fmt.Errorf("prometheusInstanceInit status is %s", *status))
-	})
-
-	if err != nil {
-		return err
-	}
-
 	return resourceTencentCloudMonitorTmpExporterIntegrationRead(d, meta)
 }
 
 func resourceTencentCloudMonitorTmpExporterIntegrationRead(d *schema.ResourceData, meta interface{}) error {
-	defer tccommon.LogElapsed("resource.tencentcloud_monitor_tmpExporterIntegration.read")()
+	defer tccommon.LogElapsed("resource.tencentcloud_monitor_tmp_exporter_integration.read")()
 	defer tccommon.InconsistentCheck(d, meta)()
 
 	logId := tccommon.GetLogId(tccommon.ContextNil)

tencentcloud/services/tmp/resource_tc_monitor_tmp_instance.go

@@ -128,6 +128,10 @@ func resourceTencentCloudMonitorTmpInstanceCreate(d *schema.ResourceData, meta i
 				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
 
+		if result == nil || result.Response == nil {
+			return resource.NonRetryableError(fmt.Errorf("Create monitor tmpInstance failed, Response is nil."))
+		}
+
 		response = result
 		return nil
 	})
@@ -137,6 +141,10 @@ func resourceTencentCloudMonitorTmpInstanceCreate(d *schema.ResourceData, meta i
 		return err
 	}
 
+	if response.Response.InstanceId == nil {
+		return fmt.Errorf("InstanceId is nil.")
+	}
+
 	tmpInstanceId := *response.Response.InstanceId
 	service := svcmonitor.NewMonitorService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
 	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
@@ -162,6 +170,31 @@ func resourceTencentCloudMonitorTmpInstanceCreate(d *schema.ResourceData, meta i
 		return err
 	}
 
+	// wait
+	initStatus := monitor.NewDescribePrometheusInstanceInitStatusRequest()
+	initStatus.InstanceId = &tmpInstanceId
+	err = resource.Retry(8*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+		result, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMonitorClient().DescribePrometheusInstanceInitStatus(initStatus)
+		if errRet != nil {
+			return tccommon.RetryError(errRet, tccommon.InternalError)
+		}
+
+		if result == nil || result.Response == nil || result.Response.Status == nil {
+			return resource.NonRetryableError(fmt.Errorf("prometheusInstanceInit status is nil, operate failed"))
+		}
+
+		status := result.Response.Status
+		if *status == "running" {
+			return nil
+		}
+
+		return resource.RetryableError(fmt.Errorf("prometheusInstanceInit status is %s", *status))
+	})
+
+	if err != nil {
+		return err
+	}
+
 	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
 		tagService := svctag.NewTagService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
 		region := meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region