Merge branch 'master' into fix/teo-l7_acc_rule-modify

Author: gitmkn

.changelog/3248.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+tencentcloud_teo_zones
+```

.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.
+```

.changelog/3250.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_cvm_launch_template_version: fix some problems
+```

.changelog/3254.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_cvm_launch_template: fix some problems
+```

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.81.177(March 27 , 2025)
+
+FEATURES:
+
+* **New Resource:** `tencentcloud_address_extra_template` ([#3246](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3246))
+* **New Resource:** `tencentcloud_cdwpg_dbconfig` ([#3239](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3239))
+* **New Resource:** `tencentcloud_teo_security_ip_group` ([#3243](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3243))
+* **New Resource:** `tencentcloud_teo_security_policy_config` ([#3237](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3237))
+
+ENHANCEMENTS:
+
+* resource/tencentcloud_cdwpg_instance: `count` update is supported ([#3239](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3239))
+* resource/tencentcloud_clickhouse_instance: update demo ([#3242](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3242))
+* resource/tencentcloud_cynosdb_cluster: support `cynos_version` fileds. ([#3240](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3240))
+* resource/tencentcloud_redis_instance: support `wan_address` fileds. ([#3241](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/3241))
+
 ## 1.81.176(March 24 , 2025)
 
 ENHANCEMENTS:

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/provider.go

@@ -842,6 +842,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_dayu_eip":                                     dayuv2.DataSourceTencentCloudDayuEip(),
 			"tencentcloud_teo_zone_available_plans":                     teo.DataSourceTencentCloudTeoZoneAvailablePlans(),
 			"tencentcloud_teo_rule_engine_settings":                     teo.DataSourceTencentCloudTeoRuleEngineSettings(),
+			"tencentcloud_teo_zones":                                    teo.DataSourceTencentCloudTeoZones(),
 			"tencentcloud_sts_caller_identity":                          sts.DataSourceTencentCloudStsCallerIdentity(),
 			"tencentcloud_dcdb_instances":                               dcdb.DataSourceTencentCloudDcdbInstances(),
 			"tencentcloud_dcdb_accounts":                                dcdb.DataSourceTencentCloudDcdbAccounts(),

tencentcloud/provider.md

@@ -1473,6 +1473,7 @@ TencentCloud EdgeOne(TEO)
 Data Source
 tencentcloud_teo_zone_available_plans
 tencentcloud_teo_rule_engine_settings
+tencentcloud_teo_zones
 
 Resource
 tencentcloud_teo_zone

tencentcloud/services/cvm/resource_tc_cvm_launch_template.go

@@ -99,7 +99,7 @@ func ResourceTencentCloudCvmLaunchTemplate() *schema.Resource {
 						},
 						"disk_id": {
 							Type:        schema.TypeString,
-							Optional:    true,
+							Computed:    true,
 							Description: "System disk ID.",
 						},
 						"disk_size": {
@@ -135,7 +135,7 @@ func ResourceTencentCloudCvmLaunchTemplate() *schema.Resource {
 						},
 						"disk_id": {
 							Type:        schema.TypeString,
-							Optional:    true,
+							Computed:    true,
 							Description: "Data disk ID.",
 						},
 						"delete_with_instance": {
@@ -665,9 +665,6 @@ func resourceTencentCloudCvmLaunchTemplateCreate(d *schema.ResourceData, meta in
 		if v, ok := dMap["disk_type"]; ok {
 			systemDisk.DiskType = helper.String(v.(string))
 		}
-		if v, ok := dMap["disk_id"]; ok {
-			systemDisk.DiskId = helper.String(v.(string))
-		}
 		if v, ok := dMap["disk_size"]; ok {
 			systemDisk.DiskSize = helper.IntInt64(v.(int))
 		}
@@ -687,9 +684,6 @@ func resourceTencentCloudCvmLaunchTemplateCreate(d *schema.ResourceData, meta in
 			if v, ok := dMap["disk_type"]; ok {
 				dataDisk.DiskType = helper.String(v.(string))
 			}
-			if v, ok := dMap["disk_id"]; ok {
-				dataDisk.DiskId = helper.String(v.(string))
-			}
 			if v, ok := dMap["delete_with_instance"]; ok {
 				dataDisk.DeleteWithInstance = helper.Bool(v.(bool))
 			}
@@ -763,8 +757,8 @@ func resourceTencentCloudCvmLaunchTemplateCreate(d *schema.ResourceData, meta in
 
 	if dMap, ok := helper.InterfacesHeadMap(d, "login_settings"); ok {
 		loginSettings := cvm.LoginSettings{}
-		if v, ok := dMap["password"]; ok {
-			loginSettings.Password = helper.String(v.(string))
+		if v, ok := dMap["password"].(string); ok && v != "" {
+			loginSettings.Password = helper.String(v)
 		}
 		if v, ok := dMap["key_ids"]; ok {
 			keyIdsSet := v.(*schema.Set).List()
@@ -773,8 +767,8 @@ func resourceTencentCloudCvmLaunchTemplateCreate(d *schema.ResourceData, meta in
 				loginSettings.KeyIds = append(loginSettings.KeyIds, &keyIds)
 			}
 		}
-		if v, ok := dMap["keep_image_login"]; ok {
-			loginSettings.KeepImageLogin = helper.String(v.(string))
+		if v, ok := dMap["keep_image_login"].(string); ok && v != "" {
+			loginSettings.KeepImageLogin = helper.String(v)
 		}
 		request.LoginSettings = &loginSettings
 	}

tencentcloud/services/cvm/resource_tc_cvm_launch_template_version.go

@@ -127,7 +127,6 @@ func ResourceTencentCloudCvmLaunchTemplateVersion() *schema.Resource {
 						},
 						"disk_id": {
 							Type:        schema.TypeString,
-							Optional:    true,
 							Computed:    true,
 							ForceNew:    true,
 							Description: "System disk ID. System disks whose type is LOCAL_BASIC or LOCAL_SSD do not have an ID and do not support this parameter. It is only used as a response parameter for APIs such as DescribeInstances, and cannot be used as a request parameter for APIs such as RunInstances.",
@@ -173,7 +172,6 @@ func ResourceTencentCloudCvmLaunchTemplateVersion() *schema.Resource {
 						},
 						"disk_id": {
 							Type:        schema.TypeString,
-							Optional:    true,
 							Computed:    true,
 							ForceNew:    true,
 							Description: "System disk ID. System disks whose type is LOCAL_BASIC or LOCAL_SSD do not have an ID and do not support this parameter. It is only used as a response parameter for APIs such as DescribeInstances, and cannot be used as a request parameter for APIs such as RunInstances.",
@@ -469,7 +467,7 @@ func ResourceTencentCloudCvmLaunchTemplateVersion() *schema.Resource {
 				ForceNew:    true,
 				Type:        schema.TypeList,
 				MaxItems:    1,
-				Description: "Scheduled tasks.",
+				Description: "Scheduled tasks. You can use this parameter to specify scheduled tasks for the instance. Only scheduled termination is supported.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"timer_action": {
@@ -781,9 +779,6 @@ func resourceTencentCloudCvmLaunchTemplateVersionCreate(d *schema.ResourceData,
 		if v, ok := dMap["disk_type"]; ok {
 			systemDisk.DiskType = helper.String(v.(string))
 		}
-		if v, ok := dMap["disk_id"]; ok {
-			systemDisk.DiskId = helper.String(v.(string))
-		}
 		if v, ok := dMap["disk_size"]; ok {
 			systemDisk.DiskSize = helper.IntInt64(v.(int))
 		}
@@ -803,9 +798,6 @@ func resourceTencentCloudCvmLaunchTemplateVersionCreate(d *schema.ResourceData,
 			if v, ok := dMap["disk_type"]; ok {
 				dataDisk.DiskType = helper.String(v.(string))
 			}
-			if v, ok := dMap["disk_id"]; ok {
-				dataDisk.DiskId = helper.String(v.(string))
-			}
 			if v, ok := dMap["delete_with_instance"]; ok {
 				dataDisk.DeleteWithInstance = helper.Bool(v.(bool))
 			}
@@ -854,17 +846,17 @@ func resourceTencentCloudCvmLaunchTemplateVersionCreate(d *schema.ResourceData,
 
 	if dMap, ok := helper.InterfacesHeadMap(d, "internet_accessible"); ok {
 		internetAccessible := cvm.InternetAccessible{}
-		if v, ok := dMap["internet_charge_type"]; ok {
-			internetAccessible.InternetChargeType = helper.String(v.(string))
+		if v, ok := dMap["internet_charge_type"].(string); ok && v != "" {
+			internetAccessible.InternetChargeType = helper.String(v)
 		}
 		if v, ok := dMap["internet_max_bandwidth_out"]; ok {
 			internetAccessible.InternetMaxBandwidthOut = helper.IntInt64(v.(int))
 		}
 		if v, ok := dMap["public_ip_assigned"]; ok {
 			internetAccessible.PublicIpAssigned = helper.Bool(v.(bool))
 		}
-		if v, ok := dMap["bandwidth_package_id"]; ok {
-			internetAccessible.BandwidthPackageId = helper.String(v.(string))
+		if v, ok := dMap["bandwidth_package_id"].(string); ok && v != "" {
+			internetAccessible.BandwidthPackageId = helper.String(v)
 		}
 		request.InternetAccessible = &internetAccessible
 	}
@@ -879,8 +871,8 @@ func resourceTencentCloudCvmLaunchTemplateVersionCreate(d *schema.ResourceData,
 
 	if dMap, ok := helper.InterfacesHeadMap(d, "login_settings"); ok {
 		loginSettings := cvm.LoginSettings{}
-		if v, ok := dMap["password"]; ok {
-			loginSettings.Password = helper.String(v.(string))
+		if v, ok := dMap["password"].(string); ok && v != "" {
+			loginSettings.Password = helper.String(v)
 		}
 		if v, ok := dMap["key_ids"]; ok {
 			keyIdsSet := v.(*schema.Set).List()
@@ -889,8 +881,8 @@ func resourceTencentCloudCvmLaunchTemplateVersionCreate(d *schema.ResourceData,
 				loginSettings.KeyIds = append(loginSettings.KeyIds, &keyIds)
 			}
 		}
-		if v, ok := dMap["keep_image_login"]; ok {
-			loginSettings.KeepImageLogin = helper.String(v.(string))
+		if v, ok := dMap["keep_image_login"].(string); ok && v != "" {
+			loginSettings.KeepImageLogin = helper.String(v)
 		}
 		request.LoginSettings = &loginSettings
 	}

tencentcloud/services/pls/resource_tc_vpc_enable_end_point_connect.go

@@ -65,7 +65,8 @@ func resourceTencentCloudVpcEnableEndPointConnectCreate(d *schema.ResourceData,
 		endPointIdSet := v.(*schema.Set).List()
 		for i := range endPointIdSet {
 			endPointId = endPointIdSet[i].(string)
-			request.EndPointId = append(request.EndPointId, &endPointId)
+			endpoint := endPointIdSet[i].(string)
+			request.EndPointId = append(request.EndPointId, &endpoint)
 		}
 	}