fix: EKS test cases (#841)

Author: Kagashino

CHANGELOG.md

@@ -142,7 +142,7 @@ FEATURES:
 ENHANCEMENTS:
 
 * resource `tencentcloud_kubernetes_addon_attachment` add tcr example values
-* resource  `tencentcloud_instance` supprt cvm import params
+* resource  `tencentcloud_instance` support cvm import params
 * datasource `tencentcloud_kubernetes_charts`fix domain 404
 
 ## 1.60.18 (December 10, 2021)

tencentcloud/resource_tc_eks_cluster_test.go

@@ -20,6 +20,7 @@ func TestAccTencentCloudEKSCluster_basic(t *testing.T) {
 			{
 				Config: testAccEksCluster,
 				Check: resource.ComposeTestCheckFunc(
+					testAccTencentCloudEKSClusterExists("tencentcloud_eks_cluster.foo"),
 					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"),
@@ -29,7 +30,7 @@ func TestAccTencentCloudEKSCluster_basic(t *testing.T) {
 					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", "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"),
@@ -49,7 +50,7 @@ func TestAccTencentCloudEKSCluster_basic(t *testing.T) {
 					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", "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"),
@@ -158,7 +159,7 @@ resource "tencentcloud_eks_cluster" "foo" {
     servers = ["10.0.0.1:80", "10.0.0.1:81"]
   }
   enable_vpc_core_dns = true
-  need_delete_cbs = true
+  need_delete_cbs = false
   tags = {
     test = "tf"
   }
@@ -180,7 +181,7 @@ resource "tencentcloud_eks_cluster" "foo" {
     servers = ["10.0.0.1:82", "10.0.0.1:83"]
   }
   enable_vpc_core_dns = false
-  need_delete_cbs = false
+  need_delete_cbs = true
   tags = {
     test = "tf"
   }

tencentcloud/resource_tc_eks_container_instance_test.go

@@ -20,12 +20,12 @@ func TestAccTencentCloudEKSContainerInstance_basic(t *testing.T) {
 			{
 				Config: testAccEksCi,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckTencentCloudDataSourceID("tencentcloud_eks_container_instance.eci"),
+					testAccCheckTencentCloudDataSourceID("tencentcloud_eks_container_instance.foo"),
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "name", "foo"),
-					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "cpu", "foo"),
-					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "memory", "foo"),
-					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "cpu_type", "foo"),
-					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "restart_policy", "foo"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "cpu", "2"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "memory", "4"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "cpu_type", "intel"),
+					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "restart_policy", "Always"),
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "security_groups.#", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "container.#", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "container.0.name", "nginx"),
@@ -45,7 +45,6 @@ func TestAccTencentCloudEKSContainerInstance_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "container.0.readiness_probe.0.failure_threshold", "3"),
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "container.0.readiness_probe.0.tcp_socket_port", "81"),
 					resource.TestCheckResourceAttr("tencentcloud_eks_container_instance.foo", "init_container.#", "1"),
-					resource.TestCheckResourceAttrSet("tencentcloud_eks_container_instance.foo", "cbs_volume.0.disk_id"),
 					resource.TestCheckResourceAttrSet("tencentcloud_eks_container_instance.foo", "vpc_id"),
 					resource.TestCheckResourceAttrSet("tencentcloud_eks_container_instance.foo", "subnet_id"),
 				),
@@ -93,7 +92,7 @@ func testAccCheckEksCiDestroy(s *terraform.State) error {
 const testAccEksCi = defaultVpcVariable + `
 data "tencentcloud_security_groups" "group" {}
 
-resource "tencentcloud_eks_container_instance" "eci" {
+resource "tencentcloud_eks_container_instance" "foo" {
   name = "foo"
   vpc_id = var.vpc_id
   subnet_id = var.subnet_id

tencentcloud/service_tencentcloud_vpc.go

@@ -1598,13 +1598,17 @@ func (me *VpcService) DescribeSecurityGroupPolices(ctx context.Context, sgId str
 			}
 
 			liteRule := VpcSecurityGroupLiteRule{
-				protocol:        strings.ToUpper(*in.Protocol),
+				//protocol:        strings.ToUpper(*in.Protocol),
 				port:            *in.Port,
 				cidrIp:          *in.CidrBlock,
 				action:          *in.Action,
 				securityGroupId: *in.SecurityGroupId,
 			}
 
+			if in.Protocol != nil {
+				liteRule.protocol = strings.ToUpper(*in.Protocol)
+			}
+
 			if in.AddressTemplate != nil {
 				liteRule.addressId = *in.AddressTemplate.AddressId
 				liteRule.addressGroupId = *in.AddressTemplate.AddressGroupId