partial test cases fix

tencentcloud/basic_test.go

@@ -18,7 +18,7 @@ const (
 	defaultVpcCidrLess = "172.16.0.0/18"
 
 	defaultAZone          = "ap-guangzhou-3"
-	defaultSubnetId       = "subnet-rdng6k36"
+	defaultSubnetId       = "subnet-enm92y0m"
 	defaultSubnetCidr     = "172.16.0.0/20"
 	defaultSubnetCidrLess = "172.16.0.0/22"
 
@@ -34,6 +34,11 @@ const (
 	defaultDayuNet    = "net-0000007e"
 
 	defaultGaapProxyId = "link-9ck3lzq7"
+
+	defaultSecurityGroup  = "sg-275zwjwh"
+	defaultSecurityGroup2 = "sg-4xsjqjrj"
+
+	defaultProjectId = "1250480"
 )
 
 /*
@@ -108,7 +113,7 @@ const instanceCommonTestCase = defaultInstanceVariable + `
 resource "tencentcloud_instance" "default" {
   instance_name              = var.instance_name
   availability_zone          = data.tencentcloud_availability_zones.default.zones.0.name
-  image_id                   = data.tencentcloud_images.default.images.0.image_id
+  image_id                   = data.tencentcloud_images.default.images.1.image_id
   instance_type              = data.tencentcloud_instance_types.default.instance_types.0.instance_type
   system_disk_type           = "CLOUD_PREMIUM"
   system_disk_size           = 50

tencentcloud/data_source_tc_eks_clusters_test.go

@@ -1,12 +1,8 @@
 package tencentcloud
 
 import (
-	"context"
-	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
@@ -21,9 +17,8 @@ func TestAccTencentCloudEksClustersDataSource(t *testing.T) {
 			{
 				Config: testAccEksClusterDataSource,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckEksClusterExists("tencentcloud_eks_clusters.foo"),
+					testAccCheckTencentCloudDataSourceID("data.tencentcloud_eks_clusters.foo"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_eks_clusters.foo", "cluster_id"),
-					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "cluster_name", "tf-eks-test"),
 					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.#", "1"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_eks_clusters.foo", "list.0.cluster_id"),
 					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.cluster_name", "tf-eks-test"),
@@ -38,74 +33,33 @@ func TestAccTencentCloudEksClustersDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.cluster_desc", "test eks cluster created by terraform"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_eks_clusters.foo", "list.0.service_subnet_id"),
 					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.enable_vpc_core_dns", "true"),
-					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.need_delete_cbs", "false"),
-					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.tags.0.test", "tf"),
+					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.need_delete_cbs", "true"),
+					resource.TestCheckResourceAttr("data.tencentcloud_eks_clusters.foo", "list.0.tags.test", "tf"),
 				),
 			},
 		},
 	})
 }
 
-func testAccCheckEksClusterExists(n string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		logId := getLogId(contextNil)
-		ctx := context.WithValue(context.TODO(), logIdKey, logId)
-
-		rs, ok := s.RootModule().Resources[n]
-		var (
-			has bool
-			err error
-		)
-		if !ok {
-			return fmt.Errorf("EKS cluster %s is not found", n)
-		}
-
-		id := rs.Primary.ID
-		if id == "" {
-			return fmt.Errorf("EKS cluster id is not set")
-		}
-		eksService := EksService{
-			client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
-		}
-		_, has, err = eksService.DescribeEksCluster(ctx, id)
-		if err != nil {
-			err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-				_, has, err = eksService.DescribeEksCluster(ctx, id)
-				if err != nil {
-					return retryError(err)
-				}
-				return nil
-			})
-		}
-		if err != nil {
-			return err
-		}
-		if !has {
-			return fmt.Errorf("EKS cluster is not found")
-		}
-		return nil
-	}
-}
-
 const testAccEksClusterDataSource = defaultVpcVariable + `
 resource "tencentcloud_eks_cluster" "foo" {
- cluster_name = "tf-eks-test"
- k8s_version = "1.18.4"
- vpc_id = var.vpc_id
- subnet_ids = [
-   var.subnet_id,
- ]
- dns_servers {
-   domain = "example2.org"
-   servers = ["10.0.0.1:80", "10.0.0.1:81"]
- }
- cluster_desc = "test eks cluster created by terraform"
- service_subnet_id = var.subnet_id
- enable_vpc_core_dns = true
- need_delete_cbs = true
- tags = {
-   test = "tf"
- }
+  cluster_name = "tf-eks-test"
+  k8s_version = "1.18.4"
+  vpc_id = var.vpc_id
+  subnet_ids = [
+    var.subnet_id,
+  ]
+  dns_servers {
+    domain = "example2.org"
+    servers = ["10.0.0.1:80", "10.0.0.1:81"]
+  }
+  cluster_desc = "test eks cluster created by terraform"
+  service_subnet_id = var.subnet_id
+  enable_vpc_core_dns = true
+  need_delete_cbs = true
+  tags = {
+    test = "tf"
+  }
 }
 
 data "tencentcloud_eks_clusters" "foo" {

tencentcloud/data_source_tc_elasticsearch_instances.go

@@ -265,7 +265,7 @@ func dataSourceTencentCloudElasticsearchInstancesRead(d *schema.ResourceData, me
 				}
 				infos = append(infos, info)
 			}
-			mapping["multi_zone_info"] = infos
+			mapping["multi_zone_infos"] = infos
 		}
 		if instance.NodeInfoList != nil && len(instance.NodeInfoList) > 0 {
 			infos := make([]map[string]interface{}, 0, len(instance.NodeInfoList))

tencentcloud/resource_tc_cdh_instance_test.go

@@ -108,7 +108,7 @@ resource "tencentcloud_cdh_instance" "foo" {
   charge_type = "PREPAID"
   prepaid_period = 1
   host_name = "unit-test-modify"
-  project_id = 1154137
+  project_id = ` + defaultProjectId + `
   prepaid_renew_flag = "DISABLE_NOTIFY_AND_MANUAL_RENEW"
 }
 `

tencentcloud/resource_tc_cynosdb_cluster_test.go

@@ -21,8 +21,8 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCynosdbClusterExists("tencentcloud_cynosdb_cluster.foo"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "available_zone", "ap-guangzhou-4"),
-					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "vpc_id", "vpc-h70b6b49"),
-					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "subnet_id", "subnet-q6fhy1mi"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "vpc_id", "vpc-c5giv773"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "subnet_id", "subnet-3hcc9h8e"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "db_type", "MYSQL"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "db_version", "5.7"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "storage_limit", "1000"),
@@ -75,13 +75,31 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"password", "force_delete", "storage_limit"},
 			},
+		},
+	})
+}
+
+/*
+func TestAccTencentCloudCynosdbClusterResourcePrePaid(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCynosdbClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				ResourceName:            "tencentcloud_cynosdb_cluster.foo",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"password", "force_delete", "storage_limit"},
+			},
 			{
 				Config: testAccCynosdbClusterPrepaid,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCynosdbClusterExists("tencentcloud_cynosdb_cluster.bar"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "available_zone", "ap-guangzhou-4"),
-					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "vpc_id", "vpc-h70b6b49"),
-					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "subnet_id", "subnet-q6fhy1mi"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "vpc_id", "vpc-c5giv773"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "subnet_id", "subnet-3hcc9h8e"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "db_type", "MYSQL"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "db_version", "5.7"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.bar", "storage_limit", "1000"),
@@ -120,6 +138,7 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 		},
 	})
 }
+*/
 
 func testAccCheckCynosdbClusterDestroy(s *terraform.State) error {
 	logId := getLogId(contextNil)
@@ -177,11 +196,11 @@ variable "availability_zone" {
 }
 
 variable "my_vpc" {
-  default = "` + defaultVpcId + `"
+  default = "vpc-c5giv773"
 }
 
 variable "my_subnet" {
-  default = "subnet-q6fhy1mi"
+  default = "subnet-3hcc9h8e"
 }
 `
 
@@ -217,10 +236,10 @@ resource "tencentcloud_cynosdb_cluster" "foo" {
   force_delete = true
 
   rw_group_sg = [
-    "sg-nltpbqg1",
+    "` + defaultSecurityGroup + `",
   ]
   ro_group_sg = [
-    "sg-nltpbqg1",
+    "` + defaultSecurityGroup + `",
   ]
 }
 `
@@ -256,10 +275,10 @@ resource "tencentcloud_cynosdb_cluster" "foo" {
   force_delete = true
 
   rw_group_sg = [
-    "sg-cf1u18wb",
+    "` + defaultSecurityGroup2 + `",
   ]
   ro_group_sg = [
-    "sg-cf1u18wb",
+    "` + defaultSecurityGroup2 + `",
   ]
 }
 `
@@ -296,10 +315,10 @@ resource "tencentcloud_cynosdb_cluster" "bar" {
   force_delete = true
 
   rw_group_sg = [
-    "sg-nltpbqg1",
+    "` + defaultSecurityGroup + `",
   ]
   ro_group_sg = [
-    "sg-nltpbqg1",
+    "` + defaultSecurityGroup + `",
   ]
 
   charge_type = "PREPAID"

tencentcloud/resource_tc_eks_cluster.go

@@ -183,6 +183,7 @@ func resourceTencentcloudEKSClusterRead(d *schema.ResourceData, meta interface{}
 	_ = d.Set("tags", cluster.Tags)
 	_ = d.Set("subnet_ids", cluster.SubnetIds)
 	_ = d.Set("need_delete_cbs", cluster.NeedDeleteCbs)
+	_ = d.Set("enable_vpc_core_dns", cluster.EnableVpcCoreDNS)
 
 	return nil
 }

tencentcloud/resource_tc_eks_cluster_test.go

@@ -20,42 +20,41 @@ func TestAccTencentCloudEKSCluster_basic(t *testing.T) {
 			{
 				Config: testAccEksCluster,
 				Check: resource.ComposeTestCheckFunc(
-					testAccTencentCloudEKSClusterExists("resource_eks_cluster.foo"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "cluster_name", "tf-ci-test"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "k8s_version", "1.12.8"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "cluster_desc", "test eks cluster created by terraform"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.#", "1"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.domain", "example2.org"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.servers.#", "2"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.servers.0", "10.0.0.1:80"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.servers.1", "10.0.0.1:81"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "enable_vpc_core_dns", "true"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "need_delete_cbs", "true"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "tags.hello", "world"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "subnet_ids.#", "1"),
-					resource.TestCheckResourceAttrSet("resource_eks_cluster.foo", "subnet_ids.0"),
-					resource.TestCheckResourceAttrSet("resource_eks_cluster.foo", "vpc_id"),
-					resource.TestCheckResourceAttrSet("resource_eks_cluster.foo", "service_subnet_id"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "cluster_name", "tf-eks-test"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "k8s_version", "1.18.4"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "cluster_desc", "test eks cluster created by terraform"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.#", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.domain", "example2.org"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.#", "2"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.0", "10.0.0.1:80"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.1", "10.0.0.1:81"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "enable_vpc_core_dns", "true"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "need_delete_cbs", "true"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "tags.test", "tf"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "subnet_ids.#", "1"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "subnet_ids.0"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "vpc_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "service_subnet_id"),
 				),
 			},
 			{
 				Config: testAccEksClusterUpdate,
 				Check: resource.ComposeTestCheckFunc(
-					testAccTencentCloudEKSClusterExists("resource_eks_cluster.foo"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "cluster_name", "tf-ci-test"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "k8s_version", "1.12.8"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "cluster_desc", "test eks cluster updated by terraform"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.domain", "example1.org"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.servers.#", "2"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.servers.0", "10.0.0.1:82"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "dns_servers.0.servers.1", "10.0.0.1:83"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "enable_vpc_core_dns", "false"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "need_delete_cbs", "false"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "tags.hello", "world"),
-					resource.TestCheckResourceAttr("resource_eks_cluster.foo", "subnet_ids.#", "1"),
-					resource.TestCheckResourceAttrSet("resource_eks_cluster.foo", "subnet_ids.0"),
-					resource.TestCheckResourceAttrSet("resource_eks_cluster.foo", "vpc_id"),
-					resource.TestCheckResourceAttrSet("resource_eks_cluster.foo", "service_subnet_id"),
+					testAccTencentCloudEKSClusterExists("tencentcloud_eks_cluster.foo"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "cluster_name", "tf-eks-test2"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "k8s_version", "1.18.4"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "cluster_desc", "test eks cluster updated by terraform"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.domain", "example1.org"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.#", "2"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.0", "10.0.0.1:82"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.1", "10.0.0.1:83"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "enable_vpc_core_dns", "false"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "need_delete_cbs", "false"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "tags.test", "tf"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "subnet_ids.#", "1"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "subnet_ids.0"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "vpc_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "service_subnet_id"),
 				),
 			},
 			{
@@ -74,7 +73,7 @@ func testAccTencentCloudEKSClusterExists(n string) resource.TestCheckFunc {
 
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {
-			return fmt.Errorf("eks cluster %s is not found", n)
+			return fmt.Errorf("resource: eks_cluster %s is not found", n)
 		}
 		if rs.Primary.ID == "" {
 			return fmt.Errorf("eks cluster id is not set")
@@ -168,7 +167,7 @@ resource "tencentcloud_eks_cluster" "foo" {
 
 const testAccEksClusterUpdate = defaultVpcVariable + `
 resource "tencentcloud_eks_cluster" "foo" {
-  cluster_name = "tf-eks-test"
+  cluster_name = "tf-eks-test2"
   k8s_version = "1.18.4"
   vpc_id = var.vpc_id
   subnet_ids = [

tencentcloud/resource_tc_emr_cluster.go

@@ -181,7 +181,7 @@ func resourceTencentCloudEmrCluster() *schema.Resource {
 }
 
 func resourceTencentCloudEmrClusterUpdate(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_emr_instance.update")()
+	defer logElapsed("resource.tencentcloud_emr_cluster.update")()
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 	emrService := EMRService{
@@ -245,7 +245,7 @@ func resourceTencentCloudEmrClusterUpdate(d *schema.ResourceData, meta interface
 }
 
 func resourceTencentCloudEmrClusterCreate(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_emr_instance.create")()
+	defer logElapsed("resource.tencentcloud_emr_cluster.create")()
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 	emrService := EMRService{
@@ -290,7 +290,7 @@ func resourceTencentCloudEmrClusterCreate(d *schema.ResourceData, meta interface
 }
 
 func resourceTencentCloudEmrClusterDelete(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_emr_instance.delete")()
+	defer logElapsed("resource.tencentcloud_emr_cluster.delete")()
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 	emrService := EMRService{