Skip to content

Commit e6ad55a

Browse files
KagashinoKagashino
authored
fix - update es, eks(ci), myqsl, redis, sqlserver sweepers (#948)
1 parent 21355cf commit e6ad55a

6 files changed

+67
-45
lines changed

‎tencentcloud/data_source_tc_elasticsearch_instances_test.go‎

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@ func TestAccTencentCloudElasticsearchInstancesDataSource(t *testing.T) {
1717
{
1818
Config: testAccElasticsearchInstancesDataSource,
1919
Check: resource.ComposeTestCheckFunc(
20-
testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.foo"),
2120
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.#", "1"),
2221
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.instance_id"),
23-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.instance_name", "tf-ci-test"),
24-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.availability_zone", defaultAZone),
25-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.vpc_id", defaultVpcId),
26-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.subnet_id", defaultSubnetId),
27-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.version", "7.5.1"),
28-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.license_type", "oss"),
29-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
30-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.tags.test", "terraform"),
31-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.#", "1"),
32-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.0.node_num", "2"),
33-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.0.node_type", "ES.S1.MEDIUM4"),
34-
resource.TestCheckResourceAttr("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.0.encrypt", "false"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.instance_name"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.availability_zone"),
24+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.vpc_id"),
25+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.subnet_id"),
26+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.version"),
27+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.license_type"),
28+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.charge_type"),
29+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.tags.test"),
30+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.#"),
31+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.0.node_num"),
32+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.0.node_type"),
33+
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.node_info_list.0.encrypt"),
3534
resource.TestCheckResourceAttrSet("data.tencentcloud_elasticsearch_instances.foo", "instance_list.0.create_time"),
3635
),
3736
},
@@ -40,26 +39,8 @@ func TestAccTencentCloudElasticsearchInstancesDataSource(t *testing.T) {
4039
}
4140

4241
const testAccElasticsearchInstancesDataSource = defaultVpcVariable + `
43-
resource "tencentcloud_elasticsearch_instance" "foo" {
44-
instance_name = "tf-ci-test"
45-
availability_zone = var.availability_zone
46-
version = "7.5.1"
47-
vpc_id = var.vpc_id
48-
subnet_id = var.subnet_id
49-
password = "Test1234"
50-
license_type = "oss"
5142
52-
node_info_list {
53-
node_num = 2
54-
node_type = "ES.S1.MEDIUM4"
55-
}
56-
57-
tags = {
58-
test = "terraform"
59-
}
60-
}
61-
62-
data "tencentcloud_elasticsearch_instances" "foo" {
63-
instance_id = tencentcloud_elasticsearch_instance.foo.id
64-
}
43+
data "tencentcloud_elasticsearch_instances" "foo" {
44+
instance_name = "keep"
45+
}
6546
`

‎tencentcloud/resource_tc_eks_container_instance_test.go‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,51 @@ import (
55
"fmt"
66
"testing"
77

8+
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
9+
810
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
911
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1012
)
1113

14+
func init() {
15+
// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_eks_ci
16+
resource.AddTestSweepers("tencentcloud_eks_ci", &resource.Sweeper{
17+
Name: "tencentcloud_eks_ci",
18+
F: func(r string) error {
19+
logId := getLogId(contextNil)
20+
ctx := context.WithValue(context.TODO(), logIdKey, logId)
21+
cli, _ := sharedClientForRegion(r)
22+
client := cli.(*TencentCloudClient).apiV3Conn
23+
service := EksService{client}
24+
25+
cis, err := service.DescribeEksContainerInstancesByFilter(ctx, nil, 100, 0)
26+
27+
if err != nil {
28+
return err
29+
}
30+
31+
var ids []*string
32+
for i := range cis {
33+
ci := cis[i]
34+
name := *ci.EksCiName
35+
if isResourcePersist(name, nil) {
36+
continue
37+
}
38+
ids = append(ids, ci.EksCiId)
39+
}
40+
request := tke.NewDeleteEKSContainerInstancesRequest()
41+
request.EksCiIds = ids
42+
err = service.DeleteEksContainerInstance(ctx, request)
43+
44+
if err != nil {
45+
return err
46+
}
47+
48+
return nil
49+
},
50+
})
51+
}
52+
1253
func TestAccTencentCloudEKSContainerInstance_basic(t *testing.T) {
1354
t.Parallel()
1455

@@ -90,7 +131,9 @@ func testAccCheckEksCiDestroy(s *terraform.State) error {
90131
}
91132

92133
const testAccEksCi = defaultVpcVariable + `
93-
data "tencentcloud_security_groups" "group" {}
134+
data "tencentcloud_security_groups" "group" {
135+
name = "default"
136+
}
94137
95138
resource "tencentcloud_eks_container_instance" "foo" {
96139
name = "foo"

‎tencentcloud/resource_tc_mysql_instance_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ func testSweepMySQLInstance(region string) error {
3636
service := MysqlService{client: client}
3737

3838
request := cdb.NewDescribeDBInstancesRequest()
39-
request.InstanceNames = []*string{
40-
helper.String(defaultInsName),
41-
helper.String(TestAccTencentCloudMysqlInstanceName),
42-
helper.String(TestAccTencentCloudMysqlInstanceNameVersion1),
43-
helper.String(TestAccTencentCloudMysqlInstanceNamePrepaid),
44-
}
4539
request.Limit = helper.IntUint64(2000)
4640

4741
response, err := client.UseMysqlClient().DescribeDBInstances(request)
@@ -55,6 +49,10 @@ func testSweepMySQLInstance(region string) error {
5549

5650
for _, v := range response.Response.Items {
5751
id := *v.InstanceId
52+
name := *v.InstanceName
53+
if isResourcePersist(name, nil) {
54+
continue
55+
}
5856
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
5957
_, err := service.IsolateDBInstance(ctx, id)
6058
if err != nil {

‎tencentcloud/resource_tc_redis_instance_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"log"
7-
"strings"
87
"testing"
98
"time"
109

@@ -34,7 +33,7 @@ func init() {
3433
for _, v := range instances {
3534
name := v.Name
3635
id := v.RedisId
37-
if !strings.HasPrefix(name, "terrform_test") {
36+
if isResourcePersist(name, nil) {
3837
continue
3938
}
4039
// Collect infos before deleting action

‎tencentcloud/resource_tc_sqlserver_instance_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package tencentcloud
33
import (
44
"context"
55
"fmt"
6-
"strings"
76
"sync"
87
"testing"
98

@@ -51,7 +50,7 @@ func batchDeleteSQLServerInstances(ctx context.Context, service SqlserverService
5150
defer wg.Done()
5251
id := *instances[i].InstanceId
5352
name := *instances[i].Name
54-
if strings.HasPrefix(name, "preset_sqlserver") {
53+
if isResourcePersist(name, nil) {
5554
return
5655
}
5756

‎tencentcloud/service_tencentcloud_eks.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ func (me *EksService) DescribeEksContainerInstancesByFilter(ctx context.Context,
238238
return
239239
}
240240

241+
instances = response.Response.EksCis
242+
241243
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
242244
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
243245

0 commit comments

Comments
 (0)