Feat/modify tmp resource (#1181)

* optimize tmp instance

* update tmp

Author: hellertang

go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.438
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.443
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
@@ -46,7 +46,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.438
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.443
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.199

go.sum

@@ -496,6 +496,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.430 h1:mGlG
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.430/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.438 h1:tz7YTepMgtehsPI7nTXEZ6W9eOaXR0rvLMtqwHDzhZ8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.438/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.443 h1:5kS48/GyzW49t4eB8dkNAoDGMeVLEadfTrB1Wpr07qw=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.443/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385 h1:8bwloRxRwSADSK48KxaUeO9JHmmgniNGJbA7Or/HUEk=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385/go.mod h1:PMxA0L4o8Fbx/6+ju1cAMAU7x2bV4C6e/LTqVe745yM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359 h1:cNKqelPgUxrJkLY0Azd2QHr/UMYOPPnmqs88clt2akk=
@@ -527,6 +529,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.430 h1:cnB
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.430/go.mod h1:Iw2Q3oExnpSR7pGnC/2nKfUaUS2GAniG1HKSfWU5Pgg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.438 h1:zf+NkKb0fgurjgCdpApnLjip7bxU7fxejI8HW5pTHl8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.438/go.mod h1:VgHc7QaLfYqdurDBb+HwXaDRuFbpsnZIKkjSPl748JA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.443 h1:5uPNOJb4uC9oZuXzSv0GtQOGGBEWA9JA1Yhoyh+9mfk=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.443/go.mod h1:QGyCdlNx2tu94GMlJDQAwz5eVFa2Gfq3JD0WZ65QqGE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391 h1:1yZh5MrlFqawVGhLdd38hi5HoaKc4LgB+8cEgLT2Qo4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391/go.mod h1:BZSQiBjNQ+6/gL1fFXBr/0BOuPTdHmSYoIg4/AkmZB4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290 h1:osYZxh9ApEc8UpvIMwjAUfdl7ytRcWUpcnnqLIpiJ/U=

tencentcloud/provider.go

@@ -426,9 +426,12 @@ Monitor
 	tencentcloud_monitor_alarm_policy
 	tencentcloud_monitor_tmp_instance
 	tencentcloud_monitor_tmp_cvm_agent
+	tencentcloud_monitor_tmp_scrape_job
+	tencentcloud_monitor_tmp_exporter_integration
 	tencentcloud_monitor_tmp_alert_rule
     tencentcloud_monitor_tmp_recording_rule
 	tencentcloud_monitor_tmp_tke_template
+	tencentcloud_monitor_tmp_tke_alert_policy
 
 PostgreSQL
   Data Source
@@ -1073,9 +1076,12 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_monitor_alarm_policy":                    resourceTencentCloudMonitorAlarmPolicy(),
 			"tencentcloud_monitor_tmp_instance":                    resourceTencentCloudMonitorTmpInstance(),
 			"tencentcloud_monitor_tmp_cvm_agent":                   resourceTencentCloudMonitorTmpCvmAgent(),
+			"tencentcloud_monitor_tmp_scrape_job":                  resourceTencentCloudMonitorTmpScrapeJob(),
+			"tencentcloud_monitor_tmp_exporter_integration":        resourceTencentCloudMonitorTmpExporterIntegration(),
 			"tencentcloud_monitor_tmp_alert_rule":                  resourceTencentCloudMonitorTmpAlertRule(),
 			"tencentcloud_monitor_tmp_recording_rule":              resourceTencentCloudMonitorTmpRecordingRule(),
 			"tencentcloud_monitor_tmp_tke_template":                resourceTencentCloudMonitorTmpTkeTemplate(),
+			"tencentcloud_monitor_tmp_tke_alert_policy":            resourceTencentCloudMonitorTmpTkeAlertPolicy(),
 			"tencentcloud_mongodb_standby_instance":                resourceTencentCloudMongodbStandbyInstance(),
 			"tencentcloud_elasticsearch_instance":                  resourceTencentCloudElasticsearchInstance(),
 			"tencentcloud_postgresql_instance":                     resourceTencentCloudPostgresqlInstance(),

tencentcloud/resource_tc_cls_index.go

@@ -95,6 +95,7 @@ func resourceTencentCloudClsIndex() *schema.Resource {
 				Type:        schema.TypeList,
 				MaxItems:    1,
 				Optional:    true,
+				Computed:    true,
 				Description: "Index rule.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -438,38 +439,54 @@ func resourceTencentCloudClsIndexRead(d *schema.ResourceData, meta interface{})
 		ruleMap := map[string]interface{}{}
 
 		if res.Rule.FullText != nil {
-			fullTextMap := map[string]interface{}{
-				"case_sensitive": res.Rule.FullText.CaseSensitive,
-				"tokenizer":      res.Rule.FullText.Tokenizer,
-				"contain_z_h":    res.Rule.FullText.ContainZH,
+			FullTextMap := map[string]interface{}{}
+			if res.Rule.FullText.CaseSensitive != nil {
+				FullTextMap["case_sensitive"] = res.Rule.FullText.CaseSensitive
+			}
+			if res.Rule.FullText.Tokenizer != nil {
+				FullTextMap["tokenizer"] = res.Rule.FullText.Tokenizer
+			}
+			if res.Rule.FullText.ContainZH != nil {
+				FullTextMap["contain_z_h"] = res.Rule.FullText.ContainZH
 			}
-			ruleMap["full_text"] = []interface{}{fullTextMap}
+
+			ruleMap["full_text"] = []interface{}{FullTextMap}
 		}
 
 		if res.Rule.KeyValue != nil {
-			ruleKeyValueMap := map[string]interface{}{
-				"case_sensitive": res.Rule.KeyValue.CaseSensitive,
+			RuleKeyValueMap := map[string]interface{}{}
+			if res.Rule.KeyValue.CaseSensitive != nil {
+				RuleKeyValueMap["case_sensitive"] = res.Rule.KeyValue.CaseSensitive
 			}
+
 			if res.Rule.KeyValue.KeyValues != nil {
 				keyValuesList := []interface{}{}
 				for _, keyValueInfo := range res.Rule.KeyValue.KeyValues {
-					keyValueInfoMap := map[string]interface{}{
-						"key": keyValueInfo.Key,
+					keyValueInfoMap := map[string]interface{}{}
+					if keyValueInfo.Key != nil {
+						keyValueInfoMap["key"] = keyValueInfo.Key
 					}
 					if keyValueInfo.Value != nil {
-						valueInfoMap := map[string]interface{}{
-							"type":        keyValueInfo.Value.Type,
-							"tokenizer":   keyValueInfo.Value.Tokenizer,
-							"sql_flag":    keyValueInfo.Value.SqlFlag,
-							"contain_z_h": keyValueInfo.Value.ContainZH,
+						valueInfoMap := map[string]interface{}{}
+						if keyValueInfo.Value.Type != nil {
+							valueInfoMap["type"] = keyValueInfo.Value.Type
+						}
+						if keyValueInfo.Value.Tokenizer != nil {
+							valueInfoMap["tokenizer"] = keyValueInfo.Value.Tokenizer
+						}
+						if keyValueInfo.Value.SqlFlag != nil {
+							valueInfoMap["sql_flag"] = keyValueInfo.Value.SqlFlag
+						}
+						if keyValueInfo.Value.ContainZH != nil {
+							valueInfoMap["contain_z_h"] = keyValueInfo.Value.ContainZH
 						}
 						keyValueInfoMap["value"] = []interface{}{valueInfoMap}
 					}
 					keyValuesList = append(keyValuesList, keyValueInfoMap)
 				}
-				ruleKeyValueMap["key_values"] = keyValuesList
+				RuleKeyValueMap["key_values"] = keyValuesList
 			}
-			ruleMap["key_value"] = []interface{}{ruleKeyValueMap}
+			ruleMap["key_value"] = []interface{}{RuleKeyValueMap}
 		}
 
 		if res.Rule.Tag != nil {
@@ -529,7 +546,7 @@ func resourceTencentCloudClsIndexUpdate(d *schema.ResourceData, meta interface{}
 
 	request.TopicId = &id
 
-	if d.HasChange("rule") || d.HasChange("status") || d.HasChange("include_internal_fields") || d.HasChange("metadata_flag") {
+	if d.HasChange("rule") {
 		if dMap, ok := helper.InterfacesHeadMap(d, "rule"); ok {
 			ruleInfo := cls.RuleInfo{}
 			if fullTextMap, ok := helper.InterfaceToMap(dMap, "full_text"); ok {
@@ -618,34 +635,38 @@ func resourceTencentCloudClsIndexUpdate(d *schema.ResourceData, meta interface{}
 			}
 			request.Rule = &ruleInfo
 		}
+	}
 
+	if d.HasChange("status") {
 		if v, ok := d.GetOk("status"); ok {
 			request.Status = helper.Bool(v.(bool))
 		}
-
+	}
+	if d.HasChange("include_internal_fields") {
 		if v, ok := d.GetOk("include_internal_fields"); ok {
 			request.IncludeInternalFields = helper.Bool(v.(bool))
 		}
-
+	}
+	if d.HasChange("metadata_flag") {
 		if v, ok := d.GetOk("metadata_flag"); ok {
 			request.MetadataFlag = helper.IntUint64(v.(int))
 		}
-
-		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			result, e := meta.(*TencentCloudClient).apiV3Conn.UseClsClient().ModifyIndex(request)
-			if e != nil {
-				return retryError(e)
-			} else {
-				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-					logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
-			}
-			return nil
-		})
-
-		if err != nil {
-			return err
+	}
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseClsClient().ModifyIndex(request)
+		if e != nil {
+			return retryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
+		return nil
+	})
+
+	if err != nil {
+		return err
 	}
+
 	return resourceTencentCloudClsIndexRead(d, meta)
 }
 

tencentcloud/resource_tc_monitor_tmp_cvm_agent.go

@@ -5,16 +5,16 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_monitor_tmp_cvm_agent" "tmpCvmAgent" {
-  instance_id = "prom-c89b3b3u"
-  name        = "test"
+  instance_id = "prom-dko9d0nu"
+  name = "agent"
 }
 
 ```
 Import
 
 monitor tmpCvmAgent can be imported using the id, e.g.
 ```
-$ terraform import tencentcloud_monitor_tmp_cvm_agent.tmpCvmAgent instanceId#agentName
+$ terraform import tencentcloud_monitor_tmp_cvm_agent.tmpCvmAgent tmpCvmAgent_id
 ```
 */
 package tencentcloud
@@ -35,7 +35,7 @@ func resourceTencentCloudMonitorTmpCvmAgent() *schema.Resource {
 	return &schema.Resource{
 		Read:   resourceTencentCloudMonitorTmpCvmAgentRead,
 		Create: resourceTencentCloudMonitorTmpCvmAgentCreate,
-		Update: resourceTencentCloudMonitorTmpCvmAgentUpdate,
+		//Update: resourceTencentCloudMonitorTmpCvmAgentUpdate,
 		Delete: resourceTencentCloudMonitorTmpCvmAgentDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
@@ -44,11 +44,14 @@ func resourceTencentCloudMonitorTmpCvmAgent() *schema.Resource {
 			"instance_id": {
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 				Description: "Instance id.",
 			},
+
 			"name": {
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 				Description: "Agent name.",
 			},
 		},
@@ -62,20 +65,19 @@ func resourceTencentCloudMonitorTmpCvmAgentCreate(d *schema.ResourceData, meta i
 	logId := getLogId(contextNil)
 
 	var (
-		request = monitor.NewCreatePrometheusAgentRequest()
-		//response *monitor.CreatePrometheusAgentResponse
+		request  = monitor.NewCreatePrometheusAgentRequest()
+		response *monitor.CreatePrometheusAgentResponse
 	)
 
 	var instanceId string
-	var agentName string
 
 	if v, ok := d.GetOk("instance_id"); ok {
 		instanceId = v.(string)
 		request.InstanceId = helper.String(instanceId)
 	}
+
 	if v, ok := d.GetOk("name"); ok {
-		agentName = v.(string)
-		request.Name = helper.String(agentName)
+		request.Name = helper.String(v.(string))
 	}
 
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -86,7 +88,7 @@ func resourceTencentCloudMonitorTmpCvmAgentCreate(d *schema.ResourceData, meta i
 			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
 				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
-		//response = result
+		response = result
 		return nil
 	})
 
@@ -95,13 +97,14 @@ func resourceTencentCloudMonitorTmpCvmAgentCreate(d *schema.ResourceData, meta i
 		return err
 	}
 
-	d.SetId(strings.Join([]string{instanceId, agentName}, FILED_SP))
+	tmpCvmAgentId := *response.Response.AgentId
 
+	d.SetId(strings.Join([]string{instanceId, tmpCvmAgentId}, FILED_SP))
 	return resourceTencentCloudMonitorTmpCvmAgentRead(d, meta)
 }
 
 func resourceTencentCloudMonitorTmpCvmAgentRead(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_monitor_tmp_cvm_agent.read")()
+	defer logElapsed("resource.tencentcloud_monitor_tmpCvmAgent.read")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
@@ -114,20 +117,21 @@ func resourceTencentCloudMonitorTmpCvmAgentRead(d *schema.ResourceData, meta int
 		return fmt.Errorf("id is broken, id is %s", d.Id())
 	}
 
-	tmpCvmAgent, err := service.DescribeMonitorTmpCvmAgentById(ctx, ids[0], ids[1])
+	tmpCvmAgent, err := service.DescribeMonitorTmpCvmAgent(ctx, ids[0], ids[1])
 
 	if err != nil {
 		return err
 	}
 
 	if tmpCvmAgent == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `tencentcloud_monitor_tmp_cvm_agent` does not exist")
+		return fmt.Errorf("resource `tmpCvmAgent` %s does not exist", ids[1])
 	}
 
 	if tmpCvmAgent.InstanceId != nil {
 		_ = d.Set("instance_id", tmpCvmAgent.InstanceId)
 	}
+
 	if tmpCvmAgent.Name != nil {
 		_ = d.Set("name", tmpCvmAgent.Name)
 	}
@@ -146,5 +150,5 @@ func resourceTencentCloudMonitorTmpCvmAgentDelete(d *schema.ResourceData, meta i
 	defer logElapsed("resource.tencentcloud_monitor_tmp_cvm_agent.delete")()
 	defer inconsistentCheck(d, meta)()
 
-	return fmt.Errorf("resource `tencentcloud_monitor_tmp_cvm_agent` does not support delete")
+	return nil
 }