diff --git a/tencentcloud/resource_tc_kubernetes_cluster_endpoint_test.go b/tencentcloud/resource_tc_kubernetes_cluster_endpoint_test.go index b448846293..a47a38a385 100644 --- a/tencentcloud/resource_tc_kubernetes_cluster_endpoint_test.go +++ b/tencentcloud/resource_tc_kubernetes_cluster_endpoint_test.go @@ -63,12 +63,12 @@ func TestAccTencentCloudTkeClusterEndpoint(t *testing.T) { } const testAccTkeClusterEndpointNewSG = ` -resource "tencentcloud_security_group" "foo" { +resource "tencentcloud_security_group" "new_sg" { name = "test-endpoint" } -resource "tencentcloud_security_group_lite_rule" "foo" { - security_group_id = tencentcloud_security_group.foo.id +resource "tencentcloud_security_group_lite_rule" "new_sg" { + security_group_id = tencentcloud_security_group.new_sg.id ingress = [ "DROP#0.0.0.0/16#ALL#ALL", @@ -76,7 +76,7 @@ resource "tencentcloud_security_group_lite_rule" "foo" { } locals { - new_sg = tencentcloud_security_group_lite_rule.foo.id + new_sg = tencentcloud_security_group.new_sg.id } ` diff --git a/tencentcloud/resource_tc_kubernetes_node_pool_test.go b/tencentcloud/resource_tc_kubernetes_node_pool_test.go index 317e8b8bd5..7a6706f87b 100644 --- a/tencentcloud/resource_tc_kubernetes_node_pool_test.go +++ b/tencentcloud/resource_tc_kubernetes_node_pool_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + "regexp" "strings" "testing" @@ -26,6 +27,8 @@ func init() { }) } +var nodePoolNameReg = regexp.MustCompile("^(mynodepool|np)") + func testNodePoolSweep(region string) error { logId := getLogId(contextNil) ctx := context.WithValue(context.TODO(), logIdKey, logId) @@ -50,7 +53,11 @@ func testNodePoolSweep(region string) error { for i := range nodePools { poolId := *nodePools[i].NodePoolId poolName := nodePools[i].Name - if poolName == nil || (*poolName != "mynodepool" && *poolName != "mynodepoolupdate") { + if poolName == nil { + continue + } + + if !nodePoolNameReg.MatchString(*poolName) { continue } err := service.DeleteClusterNodePool(ctx, defaultTkeClusterId, poolId, false)