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

* add

* add

* add

* add

* Update resource_tc_kubernetes_scale_worker.go

* add

* add

* add

Author: SevenEarth

tencentcloud/provider.go

@@ -1118,7 +1118,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_kubernetes_addon_attachment":                         tke.ResourceTencentCloudKubernetesAddonAttachment(),
 			"tencentcloud_kubernetes_auth_attachment":                          tke.ResourceTencentCloudKubernetesAuthAttachment(),
 			"tencentcloud_kubernetes_as_scaling_group":                         tke.ResourceTencentCloudKubernetesAsScalingGroup(),
-			"tencentcloud_kubernetes_scale_worker":                             tke.ResourceTencentCloudTkeScaleWorker(),
+			"tencentcloud_kubernetes_scale_worker":                             tke.ResourceTencentCloudKubernetesScaleWorker(),
 			"tencentcloud_kubernetes_cluster_attachment":                       tke.ResourceTencentCloudKubernetesClusterAttachment(),
 			"tencentcloud_kubernetes_node_pool":                                tke.ResourceTencentCloudKubernetesNodePool(),
 			"tencentcloud_kubernetes_backup_storage_location":                  tke.ResourceTencentCloudKubernetesBackupStorageLocation(),

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,42 @@
+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"
+}

tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions_test.go

@@ -1,14 +1,14 @@
 package tke_test
 
 import (
-	"fmt"
 	"testing"
 
 	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
+// go test -i; go test -test.run TestAccTencentCloudKubernetesAvailableClusterVersionsDataSource_basic -v
 func TestAccTencentCloudKubernetesAvailableClusterVersionsDataSource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -18,41 +18,33 @@ func TestAccTencentCloudKubernetesAvailableClusterVersionsDataSource_basic(t *te
 		Providers: tcacctest.AccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: fmt.Sprintf(testAccKubernetesAvailableClusterVersionsDataSource_basic, tcacctest.DefaultTkeClusterId),
+				Config: testAccKubernetesAvailableClusterVersionsDataSource_basic,
 				Check: resource.ComposeTestCheckFunc(
 					tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_kubernetes_available_cluster_versions.id"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_available_cluster_versions.id", "versions.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_available_cluster_versions.id", "clusters.#"),
 				),
 			},
 			{
-				Config: fmt.Sprintf(testAccKubernetesAvailableClusterVersionsDataSource_multiple, tcacctest.DefaultTkeClusterId),
+				Config: testAccKubernetesAvailableClusterVersionsDataSource_multiple,
 				Check: resource.ComposeTestCheckFunc(
 					tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_kubernetes_available_cluster_versions.ids"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_available_cluster_versions.ids", "clusters.#"),
-					resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_available_cluster_versions.ids", "clusters.0.cluster_id", tcacctest.DefaultTkeClusterId),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_available_cluster_versions.ids", "clusters.0.cluster_id"),
 				),
 			},
 		},
 	})
 }
 
-const testAccKubernetesAvailableClusterVersionsDataSource_basic = `
-
+const testAccKubernetesAvailableClusterVersionsDataSource_basic = testAccTkeCluster + `
 data "tencentcloud_kubernetes_available_cluster_versions" "id" {
-  cluster_id = "%s"
-}
-
-output "versions"{
-  value = data.tencentcloud_kubernetes_available_cluster_versions.id.versions
+  cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
 }
-
 `
 
-const testAccKubernetesAvailableClusterVersionsDataSource_multiple = `
-
+const testAccKubernetesAvailableClusterVersionsDataSource_multiple = testAccTkeCluster + `
 data "tencentcloud_kubernetes_available_cluster_versions" "ids" {
-  cluster_ids = ["%s"]
+  cluster_ids = [tencentcloud_kubernetes_cluster.managed_cluster.id]
 }
-
 `

tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+	"strings"
+
 	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"
-	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment_extension.go

@@ -2,6 +2,7 @@ package tke
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"

tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go

@@ -508,14 +508,13 @@ variable "default_img_id" {
 }
 
 //DefaultSecurityGroupData
-resource "tencentcloud_security_group" "example" {
-  name        = "tf_tke_sg_test"
-  description = "sg test"
+data "tencentcloud_security_groups" "example" {
+  name = "keep-tke"
 }
 
 locals {
-  sg_id  = tencentcloud_security_group.example.id
-  sg_id2 = tencentcloud_security_group.example.id
+  sg_id  = data.tencentcloud_security_groups.example.security_groups.0.security_group_id
+  sg_id2 = data.tencentcloud_security_groups.example.security_groups.0.security_group_id
 }
 `