refactor(tke): [115058279]iacg generates versions, scale_worker

.changelog/2581.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_tse_cngw_network_access_control
+```

.changelog/2582.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_vod_adaptive_dynamic_streaming_template: add param `segment_type` 
+```
+
+```release-note:enhancement
+resource/tencentcloud_vod_procedure_template: update param `adaptive_dynamic_streaming_task_list` and `review_audio_video_task`
+```

.changelog/2583.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+datasource/tencentcloud_mariadb_db_instances: Support `vip`, `vport`, `internet_domain`, `internet_ip`, `internet_port` field
+```

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.81.87 (April 7, 2024)
+
+FEATURES:
+
+* **New Resource:** `tencentcloud_tse_cngw_network_access_control` ([#2581](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2581))
+
+ENHANCEMENTS:
+
+* datasource/tencentcloud_mariadb_db_instances: Support `vip`, `vport`, `internet_domain`, `internet_ip`, `internet_port` field ([#2583](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2583))
+* resource/tencentcloud_kubernetes_cluster: Field `cluster_subnet_id` supports ForceNew ([#2578](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2578))
+* resource/tencentcloud_vod_adaptive_dynamic_streaming_template: add param `segment_type` ([#2582](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2582))
+* resource/tencentcloud_vod_procedure_template: update param `adaptive_dynamic_streaming_task_list` and `review_audio_video_task` ([#2582](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2582))
+
 ## 1.81.86 (March 28, 2024)
 
 FEATURES:

tencentcloud/acctest/basic.go

@@ -940,8 +940,8 @@ const (
 	DefaultMariadbVpcId           = "vpc-k1t8ickr"
 	DefaultMariadbSecurityGroupId = "sg-7kpsbxdb"
 
-	DefaultMariadbInstanceSubnetId = "subnet-4w4twlf4"
-	DefaultMariadbInstanceVpcId    = "vpc-9m66acml"
+	DefaultMariadbInstanceSubnetId = "subnet-8fpt571a"
+	DefaultMariadbInstanceVpcId    = "vpc-axrsmmrv"
 )
 
 // End of MARIADB

tencentcloud/common/context.go

@@ -0,0 +1,39 @@
+package common
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+type ctxResourceDataKey struct{}
+type ctxProviderMetaKey struct{}
+
+// NewResourceLifeCycleHandleFuncContext 创建一个资源生命周期处理方法上下文
+func NewResourceLifeCycleHandleFuncContext(
+	parent context.Context,
+	logID string,
+	d *schema.ResourceData,
+	meta interface{},
+) context.Context {
+	ctx := context.WithValue(parent, LogIdKey, logID)
+	ctx = context.WithValue(ctx, ctxResourceDataKey{}, d)
+	ctx = context.WithValue(ctx, ctxProviderMetaKey{}, meta)
+	return ctx
+}
+
+// ResourceDataFromContext 从上下文获取资源数据
+func ResourceDataFromContext(ctx context.Context) *schema.ResourceData {
+	if d, ok := ctx.Value(ctxResourceDataKey{}).(*schema.ResourceData); ok {
+		return d
+	}
+	return nil
+}
+
+// ProviderMetaFromContext 从上下文获取 provider meta
+func ProviderMetaFromContext(ctx context.Context) interface{} {
+	if meta, ok := ctx.Value(ctxProviderMetaKey{}).(ProviderMeta); ok {
+		return meta
+	}
+	return nil
+}

tencentcloud/provider.go

@@ -1117,7 +1117,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_kubernetes_addon_attachment":                         tke.ResourceTencentCloudTkeAddonAttachment(),
 			"tencentcloud_kubernetes_auth_attachment":                          tke.ResourceTencentCloudTKEAuthAttachment(),
 			"tencentcloud_kubernetes_as_scaling_group":                         tke.ResourceTencentCloudKubernetesAsScalingGroup(),
-			"tencentcloud_kubernetes_scale_worker":                             tke.ResourceTencentCloudTkeScaleWorker(),
+			"tencentcloud_kubernetes_scale_worker":                             tke.ResourceTencentCloudKubernetesScaleWorker(),
 			"tencentcloud_kubernetes_cluster_attachment":                       tke.ResourceTencentCloudTkeClusterAttachment(),
 			"tencentcloud_kubernetes_node_pool":                                tke.ResourceTencentCloudKubernetesNodePool(),
 			"tencentcloud_kubernetes_serverless_node_pool":                     tke.ResourceTencentCloudTkeServerLessNodePool(),
@@ -1850,6 +1850,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_tse_waf_protection":                                  tse.ResourceTencentCloudTseWafProtection(),
 			"tencentcloud_tse_waf_domains":                                     tse.ResourceTencentCloudTseWafDomains(),
 			"tencentcloud_tse_cngw_network":                                    tse.ResourceTencentCloudTseCngwNetwork(),
+			"tencentcloud_tse_cngw_network_access_control":                     tse.ResourceTencentCloudTseCngwNetworkAccessControl(),
 			"tencentcloud_tse_cngw_strategy":                                   tse.ResourceTencentCloudTseCngwStrategy(),
 			"tencentcloud_tse_cngw_strategy_bind_group":                        tse.ResourceTencentCloudTseCngwStrategyBindGroup(),
 			"tencentcloud_clickhouse_instance":                                 cdwch.ResourceTencentCloudClickhouseInstance(),

tencentcloud/provider.md

@@ -1117,7 +1117,6 @@ Video on Demand(VOD)
     tencentcloud_vod_procedure_template
     tencentcloud_vod_snapshot_by_time_offset_template
     tencentcloud_vod_image_sprite_template
-    tencentcloud_vod_super_player_config
     tencentcloud_vod_sub_application
     tencentcloud_vod_sample_snapshot_template
     tencentcloud_vod_transcode_template
@@ -1930,6 +1929,7 @@ Tencent Cloud Service Engine(TSE)
     tencentcloud_tse_cngw_network
     tencentcloud_tse_cngw_strategy
     tencentcloud_tse_cngw_strategy_bind_group
+    tencentcloud_tse_cngw_network_access_control
 
 ClickHouse(CDWCH)
   Data Source

tencentcloud/services/mariadb/data_source_tc_mariadb_db_instances.go

@@ -110,6 +110,31 @@ func DataSourceTencentCloudMariadbDbInstances() *schema.Resource {
 							Computed:    true,
 							Description: "db version id.",
 						},
+						"vip": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Intranet IP address.",
+						},
+						"vport": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Intranet port.",
+						},
+						"internet_domain": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Public network access domain name.",
+						},
+						"internet_ip": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Public IP address.",
+						},
+						"internet_port": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Public network port.",
+						},
 						"resource_tags": {
 							Type:        schema.TypeList,
 							Computed:    true,
@@ -231,6 +256,21 @@ func dataSourceTencentCloudMariadbDbInstancesRead(d *schema.ResourceData, meta i
 			if instance.DbVersionId != nil {
 				instanceMap["db_version_id"] = instance.DbVersionId
 			}
+			if instance.Vip != nil {
+				instanceMap["vip"] = instance.Vip
+			}
+			if instance.Vport != nil {
+				instanceMap["vport"] = instance.Vport
+			}
+			if instance.WanDomain != nil {
+				instanceMap["internet_domain"] = instance.WanDomain
+			}
+			if instance.WanVip != nil {
+				instanceMap["internet_ip"] = instance.WanVip
+			}
+			if instance.WanPort != nil {
+				instanceMap["internet_port"] = instance.WanPort
+			}
 			if instance.ResourceTags != nil {
 				resourceTagsList := []interface{}{}
 				for _, resourceTags := range instance.ResourceTags {

tencentcloud/services/mariadb/data_source_tc_mariadb_db_instances_test.go

@@ -20,14 +20,29 @@ func TestAccTencentCloudMariadbDbInstancesDataSource(t *testing.T) {
 				Config: testAccDataSourceMariadbDbInstances,
 				Check: resource.ComposeTestCheckFunc(
 					tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_mariadb_db_instances.db_instances"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.#"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.instance_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.instance_name"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.project_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.region"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.zone"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.memory"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.storage"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.vpc_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.subnet_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.db_version_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.vip"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mariadb_db_instances.db_instances", "instances.0.vport"),
 				),
 			},
 		},
 	})
 }
 
-const testAccDataSourceMariadbDbInstances = `
+const testAccDataSourceMariadbDbInstances = testAccMariadbInstance + `
 
-data "tencentcloud_mariadb_db_instances" "db_instances" {}
+data "tencentcloud_mariadb_db_instances" "db_instances" {
+	depends_on = [ tencentcloud_mariadb_instance.instance ]
+}
 
 `

tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions.go

@@ -77,82 +77,67 @@ func dataSourceTencentCloudKubernetesAvailableClusterVersionsRead(d *schema.Reso
 	defer tccommon.InconsistentCheck(d, meta)()
 
 	logId := tccommon.GetLogId(tccommon.ContextNil)
+	ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
 
-	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
-
-	var (
-		versions []*string
-		clusters []*tke.ClusterVersion
-		id       *string
-		ids      []string
-	)
+	service := TkeService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
 
 	paramMap := make(map[string]interface{})
 	if v, ok := d.GetOk("cluster_id"); ok {
-		id = helper.String(v.(string))
-		paramMap["cluster_id"] = id
+		paramMap["ClusterId"] = helper.String(v.(string))
 	}
 
 	if v, ok := d.GetOk("cluster_ids"); ok {
+		clusterIdsList := []*string{}
 		clusterIdsSet := v.(*schema.Set).List()
-		ids = helper.InterfacesStrings(clusterIdsSet)
-		paramMap["cluster_ids"] = helper.InterfacesStringsPoint(clusterIdsSet)
+		for i := range clusterIdsSet {
+			clusterIds := clusterIdsSet[i].(string)
+			clusterIdsList = append(clusterIdsList, helper.String(clusterIds))
+		}
+		paramMap["ClusterIds"] = clusterIdsList
 	}
 
-	service := TkeService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
-
+	var respData *tke.DescribeAvailableClusterVersionResponseParams
 	err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
 		result, e := service.DescribeKubernetesAvailableClusterVersionsByFilter(ctx, paramMap)
 		if e != nil {
 			return tccommon.RetryError(e)
 		}
-		if result != nil {
-			versions = result.Versions
-			clusters = result.Clusters
-		}
+		respData = result
 		return nil
 	})
 	if err != nil {
 		return err
 	}
 
-	if versions != nil {
-		_ = d.Set("versions", versions)
+	if respData.Versions != nil {
+		_ = d.Set("versions", respData.Versions)
 	}
 
-	tmpList := make([]map[string]interface{}, 0, len(clusters))
-
-	if clusters != nil {
-		for _, clusterVersion := range clusters {
-			clusterVersionMap := map[string]interface{}{}
+	clustersList := make([]map[string]interface{}, 0, len(respData.Clusters))
+	if respData.Clusters != nil {
+		for _, clusters := range respData.Clusters {
+			clustersMap := map[string]interface{}{}
 
-			if clusterVersion.ClusterId != nil {
-				clusterVersionMap["cluster_id"] = clusterVersion.ClusterId
+			if clusters.ClusterId != nil {
+				clustersMap["cluster_id"] = clusters.ClusterId
 			}
 
-			if clusterVersion.Versions != nil {
-				clusterVersionMap["versions"] = clusterVersion.Versions
+			if clusters.Versions != nil {
+				clustersMap["versions"] = clusters.Versions
 			}
 
-			tmpList = append(tmpList, clusterVersionMap)
+			clustersList = append(clustersList, clustersMap)
 		}
 
-		_ = d.Set("clusters", tmpList)
+		_ = d.Set("clusters", clustersList)
 	}
 
-	var clusterIds []string
-	if id != nil {
-		clusterIds = []string{*id}
-	} else {
-		clusterIds = ids
-	}
-
-	d.SetId(helper.DataResourceIdsHash(clusterIds))
 	output, ok := d.GetOk("result_output_file")
 	if ok && output.(string) != "" {
-		if e := tccommon.WriteToFile(output.(string), tmpList); e != nil {
+		if e := tccommon.WriteToFile(output.(string), dataSourceTencentCloudKubernetesAvailableClusterVersionsReadOutputContent(ctx)); e != nil {
 			return e
 		}
 	}
+
 	return nil
 }

tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions_extension.go

@@ -0,0 +1,41 @@
+package tke
+
+import (
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
+	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func dataSourceTencentCloudKubernetesAvailableClusterVersionsReadPostRequest0(ctx context.Context, req *tke.DescribeAvailableClusterVersionRequest, resp *tke.DescribeAvailableClusterVersionResponse) error {
+	d := tccommon.ResourceDataFromContext(ctx)
+
+	var (
+		clusterIds []string
+		id         *string
+		ids        []string
+	)
+
+	if v, ok := d.GetOk("cluster_id"); ok {
+		id = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("cluster_ids"); ok {
+		clusterIdsSet := v.(*schema.Set).List()
+		ids = helper.InterfacesStrings(clusterIdsSet)
+	}
+
+	if id != nil {
+		clusterIds = []string{*id}
+	} else {
+		clusterIds = ids
+	}
+
+	d.SetId(helper.DataResourceIdsHash(clusterIds))
+	return nil
+}
+
+func dataSourceTencentCloudKubernetesAvailableClusterVersionsReadOutputContent(ctx context.Context) interface{} {
+	return "clustersList"
+}