fix: tke support cluster level data source and describe (#947)

* fix: tke support cluster level data source and describe

* fix: tke - attachment testcase

* fix: tke - cluster level fix

* fix: tke - ignore empty cluster_level and auto.. field

* fix: tke testcase update add ignore cidr either

* fix: ignore tag plan diff

* fix: cluster level cidr and deprecate old container cluster

* fix: tke - testcase remove err code

Author: Kagashino

go.mod

@@ -54,7 +54,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.378
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.381
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.357
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199

go.sum

@@ -597,6 +597,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.370 h1:rzExiYu
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.370/go.mod h1:qs+mOMyRpnBtCNHBl70LMH826P1kbYDIjgX2+p5nqMg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.378 h1:gVtRJRENcLw2LxA06oS0OOOeRADStVrrpIyKjlrmkW4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.378/go.mod h1:3fugxjsjhR7P3HeVRsUCMIM2P7KnIvqnPhcsImS7zN0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.381 h1:hi3fczplLOukXZZIhPA3ouoPk0bWe3Bx06X6t0zuoCk=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.381/go.mod h1:Y8HK7RDWAdM4QvYsKyoqmn1qL8mEGNaDPJMkZP2TolM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.199 h1:UDZ59pvaqjDy2QIsMsv9hxm0BEJLmPIbHF1ms0MqaRk=

tencentcloud/data_source_tc_kubernetes_cluster_levels.go

@@ -0,0 +1,133 @@
+/*
+Provide a datasource to query TKE cluster levels.
+
+Example Usage
+
+```hcl
+data "tencentcloud_kubernetes_cluster_levels" "foo" {}
+
+output "level5" {
+	value = data.tencentcloud_kubernetes_cluster_levels.foo.list.0.alias
+}
+```
+
+
+*/
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"math/rand"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+func datasourceTencentCloudKubernetesClusterLevels() *schema.Resource {
+	return &schema.Resource{
+		Read: datasourceTencentCloudKubernetesClusterLevelsRead,
+		Schema: map[string]*schema.Schema{
+			"cluster_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Specify cluster Id, if set will only query current cluster's available levels.",
+			},
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used for save result.",
+			},
+			"list": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "List of level information.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"alias": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Alias used for pass to cluster level arguments.",
+						},
+						"crd_count": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Number of CRDs.",
+						},
+						"config_map_count": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Number of ConfigMaps.",
+						},
+						"enable": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Indicates whether the current level enabled.",
+						},
+						"name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Level name.",
+						},
+						"node_count": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Number of nodes.",
+						},
+						"other_count": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Number of others.",
+						},
+						"pod_count": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Number of pods.",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func datasourceTencentCloudKubernetesClusterLevelsRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("datasource.tencentcloud_kubernetes_cluster_levels.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	service := TkeService{meta.(*TencentCloudClient).apiV3Conn}
+
+	clusterId := d.Get("cluster_id").(string)
+	result, err := service.DescribeClusterLevelAttribute(ctx, clusterId)
+	if err != nil {
+		d.SetId("")
+		return err
+	}
+	d.SetId(fmt.Sprintf("cluster-level-%s__%d", clusterId, rand.Intn(4)))
+
+	list := make([]interface{}, 0, len(result))
+
+	for i := range result {
+		item := result[i]
+		level := map[string]interface{}{
+			"name":             item.Name,
+			"alias":            item.Alias,
+			"crd_count":        item.CRDCount,
+			"config_map_count": item.ConfigMapCount,
+			"enable":           item.Enable,
+			"node_count":       item.NodeCount,
+			"other_count":      item.OtherCount,
+			"pod_count":        item.PodCount,
+		}
+		list = append(list, level)
+	}
+
+	_ = d.Set("list", list)
+
+	if output, ok := d.GetOk("result_output_file"); ok {
+		return writeToFile(output.(string), list)
+	}
+
+	return nil
+}

tencentcloud/data_source_tc_kubernetes_cluster_levels_test.go

@@ -0,0 +1,50 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+)
+
+func TestAccTencentCloudDataSourceKubernetesClusterLevel(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccDataSourceKubernetesClusterLevelDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceKubernetesClusterLevelBasic,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.#"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.name"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.alias"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.crd_count"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.config_map_count"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.enable"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.node_count"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.other_count"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.foo", "list.0.pod_count"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_kubernetes_cluster_levels.with_cluster", "list.#"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourceKubernetesClusterLevelDestroy(s *terraform.State) error {
+	return nil
+}
+
+const testAccDataSourceKubernetesClusterLevelBasic = `
+data "tencentcloud_kubernetes_cluster_levels" "foo" {}
+
+data "tencentcloud_kubernetes_clusters" "cls" {
+  cluster_name = "` + defaultTkeClusterName + `"
+}
+
+data "tencentcloud_kubernetes_cluster_levels" "with_cluster" {
+	cluster_id = data.tencentcloud_kubernetes_clusters.cls.list.0.cluster_id
+}
+`

tencentcloud/provider.go

@@ -344,6 +344,7 @@ Tencent Kubernetes Engine(TKE)
     tencentcloud_kubernetes_clusters
     tencentcloud_eks_clusters
     tencentcloud_eks_cluster_credential
+    tencentcloud_kubernetes_cluster_levels
     tencentcloud_kubernetes_charts
 
   Resource
@@ -772,6 +773,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_security_groups":                          dataSourceTencentCloudSecurityGroups(),
 			"tencentcloud_kubernetes_clusters":                      dataSourceTencentCloudKubernetesClusters(),
 			"tencentcloud_kubernetes_charts":                        dataSourceTencentCloudKubernetesCharts(),
+			"tencentcloud_kubernetes_cluster_levels":                datasourceTencentCloudKubernetesClusterLevels(),
 			"tencentcloud_eks_clusters":                             dataSourceTencentCloudEKSClusters(),
 			"tencentcloud_eks_cluster_credential":                   datasourceTencentCloudEksClusterCredential(),
 			"tencentcloud_container_clusters":                       dataSourceTencentCloudContainerClusters(),

tencentcloud/resource_tc_container_cluster_test.go

@@ -9,7 +9,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccTencentCloudContainerCluster_basic(t *testing.T) {
+// @Deprecated It has been deprecated and replaced by tencentcloud_kubernetes_cluster.
+func testAccTencentCloudContainerCluster_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

tencentcloud/resource_tc_kubernetes_addon_attachment.go

@@ -227,6 +227,13 @@ func resourceTencentCloudTkeAddonAttachmentRead(d *schema.ResourceData, meta int
 		return err
 	}
 
+	response, _, err = service.DescribeExtensionAddon(ctx, clusterId, addonName)
+
+	if err != nil {
+		d.SetId("")
+		return err
+	}
+
 	_ = d.Set("response_body", response)
 
 	spec := addonResponseData.Spec

tencentcloud/resource_tc_kubernetes_addon_attachment_test.go

@@ -15,9 +15,9 @@ func TestAccTencentCloudTkeAddonAttachmentResource(t *testing.T) {
 			{
 				Config: testAccTkeAddonAttachment(),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("resource_tc_kubernetes_addon_attachment.cbs", "response_body"),
-					resource.TestCheckResourceAttr("resource_tc_kubernetes_addon_attachment.cbs", "name", "cbs"),
-					resource.TestCheckResourceAttr("resource_tc_kubernetes_addon_attachment.cbs", "version", "1.0.0"),
+					resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon_attachment.cos", "response_body"),
+					resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon_attachment.cos", "name", "cos"),
+					resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon_attachment.cos", "version", "1.0.0"),
 				),
 			},
 		},
@@ -26,67 +26,72 @@ func TestAccTencentCloudTkeAddonAttachmentResource(t *testing.T) {
 
 func testAccTkeAddonAttachment() string {
 	return `
-variable "availability_zone" {
-  default = "ap-guangzhou-3"
-}
-
-variable "cluster_cidr" {
-  default = "172.16.0.0/16"
-}
+//variable "availability_zone" {
+//  default = "ap-guangzhou-3"
+//}
+//
+//variable "cluster_cidr" {
+//  default = "172.16.0.0/16"
+//}
+//
+//variable "default_instance_type" {
+//  default = "S1.SMALL1"
+//}
+//
+//data "tencentcloud_images" "default" {
+//  image_type = ["PUBLIC_IMAGE"]
+//  os_name    = "centos"
+//}
+//
+//
+//data "tencentcloud_vpc_subnets" "vpc" {
+//  is_default        = true
+//  availability_zone = var.availability_zone
+//}
+//
+//resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
+//  vpc_id                  = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id
+//  cluster_cidr            = "10.31.0.0/16"
+//  cluster_max_pod_num     = 32
+//  cluster_name            = "keep"
+//  cluster_desc            = "test cluster desc"
+//  cluster_version         = "1.20.6"
+//  cluster_max_service_num = 32
+//  cluster_os			  = "tlinux2.2(tkernel3)x86_64"
+//
+//  worker_config {
+//    count                      = 1
+//    availability_zone          = var.availability_zone
+//    instance_type              = var.default_instance_type
+//    system_disk_type           = "CLOUD_SSD"
+//    system_disk_size           = 60
+//    internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+//    internet_max_bandwidth_out = 100
+//    public_ip_assigned         = true
+//    subnet_id                  = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id
+//
+//    data_disk {
+//      disk_type = "CLOUD_PREMIUM"
+//      disk_size = 50
+//    }
+//
+//    enhanced_security_service = false
+//    enhanced_monitor_service  = false
+//    user_data                 = "dGVzdA=="
+//    password                  = "ZZXXccvv1212"
+//  }
+//
+//  cluster_deploy_type = "MANAGED_CLUSTER"
+//}
 
-variable "default_instance_type" {
-  default = "S1.SMALL1"
+data "tencentcloud_kubernetes_clusters" "cls" {
+  cluster_name = "keep"
 }
 
-data "tencentcloud_images" "default" {
-  image_type = ["PUBLIC_IMAGE"]
-  os_name    = "centos"
-}
-
-
-data "tencentcloud_vpc_subnets" "vpc" {
-  is_default        = true
-  availability_zone = var.availability_zone
-}
-
-resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
-  vpc_id                  = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id
-  cluster_cidr            = "10.31.0.0/16"
-  cluster_max_pod_num     = 32
-  cluster_name            = "keep"
-  cluster_desc            = "test cluster desc"
-  cluster_version         = "1.20.6"
-  cluster_max_service_num = 32
-  cluster_os			  = "tlinux2.2(tkernel3)x86_64"
-
-  worker_config {
-    count                      = 1
-    availability_zone          = var.availability_zone
-    instance_type              = var.default_instance_type
-    system_disk_type           = "CLOUD_SSD"
-    system_disk_size           = 60
-    internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
-    internet_max_bandwidth_out = 100
-    public_ip_assigned         = true
-    subnet_id                  = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id
-
-    data_disk {
-      disk_type = "CLOUD_PREMIUM"
-      disk_size = 50
-    }
-
-    enhanced_security_service = false
-    enhanced_monitor_service  = false
-    user_data                 = "dGVzdA=="
-    password                  = "ZZXXccvv1212"
-  }
-
-  cluster_deploy_type = "MANAGED_CLUSTER"
-}
 
-resource "tencentcloud_kubernetes_addon_attachment" "cbs" {
-  cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
-  name = "cbs"
+resource "tencentcloud_kubernetes_addon_attachment" "cos" {
+  cluster_id = data.tencentcloud_kubernetes_clusters.cls.list.0.cluster_id // tencentcloud_kubernetes_cluster.managed_cluster.id
+  name = "cos"
   version = "1.0.0"
 }
 `