Skip to content

Commit 15f3ec9

Browse files
KagashinoKagashino
authored
fix: cfs testcases (#951)
* fix: cfs testcases * reformat code
1 parent a9af76c commit 15f3ec9

6 files changed

+57
-30
lines changed

‎tencentcloud/data_source_tc_cfs_access_groups_test.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ func TestAccTencentCloudCfsAccessGroupsDataSource(t *testing.T) {
1616
{
1717
Config: testAccCfsAccessGroupsDataSource,
1818
Check: resource.ComposeTestCheckFunc(
19-
testAccCheckCfsAccessGroupExists("tencentcloud_cfs_access_group.foo"),
2019
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_groups.access_groups", "access_group_list.#", "1"),
21-
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_groups.access_groups", "access_group_list.0.name", "test_cfs_access_group"),
20+
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_groups.access_groups", "access_group_list.0.name", "keep_access_group"),
2221
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_groups.access_groups", "access_group_list.0.description", "test"),
2322
resource.TestCheckResourceAttrSet("data.tencentcloud_cfs_access_groups.access_groups", "access_group_list.0.access_group_id"),
2423
resource.TestCheckResourceAttrSet("data.tencentcloud_cfs_access_groups.access_groups", "access_group_list.0.create_time"),
@@ -28,14 +27,20 @@ func TestAccTencentCloudCfsAccessGroupsDataSource(t *testing.T) {
2827
})
2928
}
3029

31-
const testAccCfsAccessGroupsDataSource = `
32-
resource "tencentcloud_cfs_access_group" "foo" {
33-
name = "test_cfs_access_group"
34-
description = "test"
30+
const BasicCfsAccessGroup = "pgroupbasic"
31+
32+
const defaultCfsAccessGroup = `
33+
data "tencentcloud_cfs_access_groups" "access_groups" {
34+
name = "keep_access_group"
3535
}
3636
37+
locals {
38+
cfs_access_group_id = data.tencentcloud_cfs_access_groups.access_groups.access_group_list.0.access_group_id
39+
}
40+
`
41+
42+
const testAccCfsAccessGroupsDataSource = `
3743
data "tencentcloud_cfs_access_groups" "access_groups" {
38-
access_group_id = tencentcloud_cfs_access_group.foo.id
39-
name = tencentcloud_cfs_access_group.foo.name
44+
name = "keep_access_group"
4045
}
4146
`

‎tencentcloud/data_source_tc_cfs_access_rules_test.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestAccTencentCloudCfsAccessRulesDataSource(t *testing.T) {
1717
Config: testAccCfsAccessRulesDataSource,
1818
Check: resource.ComposeTestCheckFunc(
1919
testAccCheckCfsAccessRuleExists("tencentcloud_cfs_access_rule.foo"),
20-
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_rules.access_rules", "access_rule_list.#", "1"),
20+
resource.TestCheckResourceAttrSet("data.tencentcloud_cfs_access_rules.access_rules", "access_rule_list.#"),
2121
resource.TestCheckResourceAttrSet("data.tencentcloud_cfs_access_rules.access_rules", "access_rule_list.0.access_rule_id"),
2222
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_rules.access_rules", "access_rule_list.0.auth_client_ip", "10.10.1.0/24"),
2323
resource.TestCheckResourceAttr("data.tencentcloud_cfs_access_rules.access_rules", "access_rule_list.0.priority", "1"),
@@ -27,19 +27,16 @@ func TestAccTencentCloudCfsAccessRulesDataSource(t *testing.T) {
2727
})
2828
}
2929

30-
const testAccCfsAccessRulesDataSource = `
31-
resource "tencentcloud_cfs_access_group" "foo" {
32-
name = "test_cfs_access_rule"
33-
}
30+
const testAccCfsAccessRulesDataSource = defaultCfsAccessGroup + `
3431
3532
resource "tencentcloud_cfs_access_rule" "foo" {
36-
access_group_id = tencentcloud_cfs_access_group.foo.id
33+
access_group_id = local.cfs_access_group_id
3734
auth_client_ip = "10.10.1.0/24"
3835
priority = 1
3936
}
4037
4138
data "tencentcloud_cfs_access_rules" "access_rules" {
42-
access_group_id = tencentcloud_cfs_access_group.foo.id
39+
access_group_id = local.cfs_access_group_id
4340
access_rule_id = tencentcloud_cfs_access_rule.foo.id
4441
}
4542
`

‎tencentcloud/data_source_tc_cfs_file_systems_test.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestAccTencentCloudCfsFileSystemsDataSource(t *testing.T) {
3131
})
3232
}
3333

34-
const testAccCfsFileSystemsDataSource = `
34+
const testAccCfsFileSystemsDataSource = defaultCfsAccessGroup + `
3535
resource "tencentcloud_vpc" "vpc" {
3636
name = "test-cfs-vpc"
3737
cidr_block = "10.2.0.0/16"
@@ -44,14 +44,10 @@ resource "tencentcloud_subnet" "subnet" {
4444
availability_zone = "ap-guangzhou-3"
4545
}
4646
47-
resource "tencentcloud_cfs_access_group" "foo" {
48-
name = "test_cfs_access_rule"
49-
}
50-
5147
resource "tencentcloud_cfs_file_system" "foo" {
5248
name = "test_cfs_file_system"
5349
availability_zone = "ap-guangzhou-3"
54-
access_group_id = tencentcloud_cfs_access_group.foo.id
50+
access_group_id = local.cfs_access_group_id
5551
protocol = "NFS"
5652
vpc_id = tencentcloud_vpc.vpc.id
5753
subnet_id = tencentcloud_subnet.subnet.id

‎tencentcloud/resource_tc_cfs_access_group_test.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,47 @@ package tencentcloud
33
import (
44
"context"
55
"fmt"
6+
"strings"
67
"testing"
78

89
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
910
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1011
)
1112

13+
func init() {
14+
// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_cfs_access_group
15+
resource.AddTestSweepers("tencentcloud_cfs_access_group", &resource.Sweeper{
16+
Name: "tencentcloud_cfs_access_group",
17+
F: func(r string) error {
18+
logId := getLogId(contextNil)
19+
ctx := context.WithValue(context.TODO(), logIdKey, logId)
20+
cli, _ := sharedClientForRegion(r)
21+
client := cli.(*TencentCloudClient).apiV3Conn
22+
23+
service := CfsService{client}
24+
25+
groups, err := service.DescribeAccessGroup(ctx, "", "")
26+
27+
if err != nil {
28+
return err
29+
}
30+
31+
for i := range groups {
32+
id := *groups[i].PGroupId
33+
name := *groups[i].Name
34+
if isResourcePersist(name, nil) || !strings.HasPrefix(name, "pgroup-") {
35+
continue
36+
}
37+
if err := service.DeleteAccessGroup(ctx, id); err != nil {
38+
continue
39+
}
40+
}
41+
42+
return nil
43+
},
44+
})
45+
}
46+
1247
func TestAccTencentCloudCfsAccessGroup(t *testing.T) {
1348
t.Parallel()
1449
resource.Test(t, resource.TestCase{

‎tencentcloud/resource_tc_cfs_access_rule_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,9 @@ func testAccCheckCfsAccessRuleExists(n string) resource.TestCheckFunc {
9898
}
9999

100100
const testAccCfsAccessRule = `
101-
resource "tencentcloud_cfs_access_group" "foo" {
102-
name = "test_cfs_access_rule"
103-
}
104101
105102
resource "tencentcloud_cfs_access_rule" "foo" {
106-
access_group_id = tencentcloud_cfs_access_group.foo.id
103+
access_group_id = "` + BasicCfsAccessGroup + `"
107104
auth_client_ip = "10.10.1.0/24"
108105
priority = 1
109106
}

‎tencentcloud/resource_tc_cfs_file_system_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,11 @@ resource "tencentcloud_subnet" "subnet" {
163163
availability_zone = "ap-guangzhou-3"
164164
}
165165
166-
resource "tencentcloud_cfs_access_group" "foo" {
167-
name = "test_cfs_access_rule"
168-
}
169166
170167
resource "tencentcloud_cfs_file_system" "foo" {
171168
name = "test_cfs_file_system"
172169
availability_zone = "ap-guangzhou-3"
173-
access_group_id = tencentcloud_cfs_access_group.foo.id
170+
access_group_id = "%s"
174171
protocol = "NFS"
175172
vpc_id = tencentcloud_vpc.vpc.id
176173
subnet_id = tencentcloud_subnet.subnet.id
@@ -181,5 +178,5 @@ resource "tencentcloud_cfs_file_system" "foo" {
181178
role = "%s"
182179
}
183180
}
184-
`, value)
181+
`, BasicCfsAccessGroup, value)
185182
}

0 commit comments

Comments
 (0)