Skip to content

Commit 233b0ca

Browse files
tongyimingmikatong
tongyiming
and
mikatong
authored
fix(cvm): [123456789]generate cvm datasource test (#2660)
* generate cvm datasource test * keep same testname --------- Co-authored-by: mikatong <[email protected]>
1 parent 97ba2a1 commit 233b0ca

5 files changed

+103
-116
lines changed

‎tencentcloud/services/cvm/data_source_tc_instances_set_test.go

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,73 @@ package cvm_test
33
import (
44
"testing"
55

6-
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
7-
8-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
6+
resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
98
)
109

1110
func TestAccTencentCloudInstanceSetDataSource_Basic(t *testing.T) {
1211
t.Parallel()
13-
1412
resource.Test(t, resource.TestCase{
15-
PreCheck: func() { tcacctest.AccPreCheck(t) },
16-
Providers: tcacctest.AccProviders,
13+
PreCheck: func() {
14+
acctest.AccPreCheck(t)
15+
},
16+
Providers: acctest.AccProviders,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccTencentCloudInstancesSetBasic,
20-
Check: resource.ComposeTestCheckFunc(
21-
resource.TestCheckResourceAttr("data.tencentcloud_instances_set.foo", "instance_list.#", "1"),
22-
),
19+
Config: testAccInstanceSetDataSource_BasicCreate,
20+
Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_instances_set.foo"), resource.TestCheckResourceAttr("data.tencentcloud_instances_set.foo", "instance_list.#", "1")),
2321
},
2422
},
2523
})
2624
}
2725

28-
const testAccTencentCloudInstancesSetBasic = `
26+
const testAccInstanceSetDataSource_BasicCreate = `
27+
2928
data "tencentcloud_availability_zones" "default" {
3029
}
31-
data "tencentcloud_images" "default" {
32-
image_type = ["PUBLIC_IMAGE"]
33-
image_name_regex = "Final"
34-
}
3530
data "tencentcloud_images" "testing" {
36-
image_type = ["PUBLIC_IMAGE"]
31+
image_type = ["PUBLIC_IMAGE"]
32+
}
33+
data "tencentcloud_images" "default" {
34+
image_type = ["PUBLIC_IMAGE"]
35+
image_name_regex = "Final"
3736
}
3837
data "tencentcloud_instance_types" "default" {
39-
40-
filter {
41-
name = "instance-family"
42-
values = ["S1", "S2", "S3", "S4", "S5"]
43-
}
44-
filter {
45-
name = "zone"
46-
values = ["ap-guangzhou-7"]
47-
}
48-
cpu_core_count = 2
49-
memory_size = 2
50-
exclude_sold_out = true
38+
memory_size = 2
39+
exclude_sold_out = true
40+
41+
filter {
42+
values = ["ap-guangzhou-7"]
43+
name = "zone"
44+
}
45+
filter {
46+
values = ["S1","S2","S3","S4","S5"]
47+
name = "instance-family"
48+
}
49+
cpu_core_count = 2
50+
}
51+
data "tencentcloud_instances_set" "foo" {
52+
instance_id = tencentcloud_instance.instances_set.id
5153
}
5254
resource "tencentcloud_vpc" "vpc" {
53-
name = "cvm-basic-vpc"
54-
cidr_block = "10.0.0.0/16"
55+
name = "cvm-basic-vpc"
56+
cidr_block = "10.0.0.0/16"
5557
}
5658
resource "tencentcloud_subnet" "subnet" {
57-
availability_zone = "ap-guangzhou-7"
58-
vpc_id = tencentcloud_vpc.vpc.id
59-
name = "cvm-basic-subnet"
60-
cidr_block = "10.0.0.0/16"
59+
name = "cvm-basic-subnet"
60+
cidr_block = "10.0.0.0/16"
61+
availability_zone = "ap-guangzhou-7"
62+
vpc_id = tencentcloud_vpc.vpc.id
6163
}
6264
resource "tencentcloud_instance" "instances_set" {
63-
instance_name = "tf-ci-test"
64-
availability_zone = "ap-guangzhou-7"
65-
image_id = data.tencentcloud_images.default.images.0.image_id
66-
vpc_id = tencentcloud_vpc.vpc.id
67-
subnet_id = tencentcloud_subnet.subnet.id
68-
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
69-
system_disk_type = "CLOUD_PREMIUM"
70-
project_id = 0
65+
availability_zone = "ap-guangzhou-7"
66+
image_id = data.tencentcloud_images.default.images.0.image_id
67+
vpc_id = tencentcloud_vpc.vpc.id
68+
subnet_id = tencentcloud_subnet.subnet.id
69+
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
70+
system_disk_type = "CLOUD_PREMIUM"
71+
project_id = 0
72+
instance_name = "tf-ci-test"
7173
}
7274
73-
data "tencentcloud_instances_set" "foo" {
74-
instance_id = tencentcloud_instance.instances_set.id
75-
}
7675
`

‎tencentcloud/services/cvm/data_source_tc_key_pairs_test.go

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,37 @@ package cvm_test
33
import (
44
"testing"
55

6-
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
7-
8-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
6+
resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
98
)
109

11-
func TestAccTencentCloudKeyPairsDataSource(t *testing.T) {
10+
func TestAccTencentCloudKeyPairsDataSource_Basic(t *testing.T) {
1211
t.Parallel()
1312
resource.Test(t, resource.TestCase{
14-
PreCheck: func() { tcacctest.AccPreCheck(t) },
15-
Providers: tcacctest.AccProviders,
16-
CheckDestroy: testAccCheckKeyPairDestroy,
13+
PreCheck: func() {
14+
acctest.AccPreCheck(t)
15+
},
16+
Providers: acctest.AccProviders,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccKeyPairDataSource,
20-
Check: resource.ComposeTestCheckFunc(
21-
testAccCheckKeyPairExists("tencentcloud_key_pair.key"),
22-
resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.data_key", "key_pair_list.#", "1"),
23-
resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.key_id"),
24-
resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.key_name", "tf_test_key"),
25-
resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.project_id", "0"),
26-
resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.public_key"),
27-
resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.create_time"),
28-
resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.key_name", "key_pair_list.#", "1"),
29-
resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.key_name", "key_pair_list.0.key_id"),
30-
resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.key_name", "key_pair_list.0.key_name", "tf_test_key"),
31-
),
19+
Config: testAccKeyPairsDataSource_BasicCreate,
20+
Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_key_pairs.data_key"), resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.public_key"), resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.create_time"), resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.data_key", "key_pair_list.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.key_id"), resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.key_name", "tf_test_key"), resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.data_key", "key_pair_list.0.project_id", "0")),
3221
},
3322
},
3423
})
3524
}
3625

37-
const testAccKeyPairDataSource = `
38-
resource "tencentcloud_key_pair" "key" {
39-
key_name = "tf_test_key"
40-
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw=="
41-
}
26+
const testAccKeyPairsDataSource_BasicCreate = `
4227
4328
data "tencentcloud_key_pairs" "data_key" {
44-
key_id = tencentcloud_key_pair.key.id
29+
key_id = tencentcloud_key_pair.key.id
4530
}
46-
4731
data "tencentcloud_key_pairs" "key_name" {
48-
key_name = "^${tencentcloud_key_pair.key.key_name}$"
32+
key_name = "^${tencentcloud_key_pair.key.key_name}$"
33+
}
34+
resource "tencentcloud_key_pair" "key" {
35+
key_name = "tf_test_key"
36+
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw=="
4937
}
38+
5039
`

‎tencentcloud/services/cvm/data_source_tc_placement_groups_test.go

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,34 @@ package cvm_test
33
import (
44
"testing"
55

6-
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
7-
8-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
6+
resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
98
)
109

11-
func TestAccTencentCloudPlacementGroupsDataSource(t *testing.T) {
10+
func TestAccTencentCloudPlacementGroupsDataSource_Basic(t *testing.T) {
1211
t.Parallel()
1312
resource.Test(t, resource.TestCase{
14-
PreCheck: func() { tcacctest.AccPreCheck(t) },
15-
Providers: tcacctest.AccProviders,
16-
CheckDestroy: testAccCheckPlacementGroupDestroy,
13+
PreCheck: func() {
14+
acctest.AccPreCheck(t)
15+
},
16+
Providers: acctest.AccProviders,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccPlacementGroupDataSource,
20-
Check: resource.ComposeTestCheckFunc(
21-
testAccCheckPlacementGroupExists("tencentcloud_placement_group.placement"),
22-
resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.#", "1"),
23-
resource.TestCheckResourceAttrSet("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.placement_group_id"),
24-
resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.name", "tf-test-placement"),
25-
resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.type", "HOST"),
26-
),
19+
Config: testAccPlacementGroupsDataSource_BasicCreate,
20+
Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_placement_groups.data_placement"), resource.TestCheckResourceAttrSet("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.placement_group_id"), resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.type", "HOST"), resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.name", "tf-test-placement"), resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.#", "1")),
2721
},
2822
},
2923
})
3024
}
3125

32-
const testAccPlacementGroupDataSource = `
33-
resource "tencentcloud_placement_group" "placement" {
34-
name = "tf-test-placement"
35-
type = "HOST"
36-
}
26+
const testAccPlacementGroupsDataSource_BasicCreate = `
3727
3828
data "tencentcloud_placement_groups" "data_placement" {
39-
placement_group_id = tencentcloud_placement_group.placement.id
29+
placement_group_id = tencentcloud_placement_group.placement.id
4030
}
31+
resource "tencentcloud_placement_group" "placement" {
32+
name = "tf-test-placement"
33+
type = "HOST"
34+
}
35+
4136
`

‎tencentcloud/services/cvm/data_source_tc_reserved_instance_configs_test.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,31 @@ package cvm_test
33
import (
44
"testing"
55

6+
resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
68
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
7-
8-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
99
)
1010

11-
func TestAccTencentCloudReservedInstanceConfigsDataSource(t *testing.T) {
11+
func TestAccTencentCloudReservedInstanceConfigsDataSource_Basic(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
14-
PreCheck: func() { tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL) },
15-
Providers: tcacctest.AccProviders,
14+
PreCheck: func() {
15+
tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL)
16+
},
17+
Providers: acctest.AccProviders,
1618
Steps: []resource.TestStep{
1719
{
18-
Config: testAccReservedInstanceConfigsDataSource,
19-
Check: resource.ComposeTestCheckFunc(
20-
resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instance_configs.configs", "config_list.#"),
21-
),
20+
Config: testAccReservedInstanceConfigsDataSource_BasicCreate,
21+
Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_reserved_instance_configs.configs"), resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instance_configs.configs", "config_list.#")),
2222
},
2323
},
2424
})
2525
}
2626

27-
const testAccReservedInstanceConfigsDataSource = `
27+
const testAccReservedInstanceConfigsDataSource_BasicCreate = `
28+
2829
data "tencentcloud_reserved_instance_configs" "configs" {
29-
availability_zone = "ap-guangzhou-2"
30+
availability_zone = "ap-guangzhou-2"
3031
}
32+
3133
`

‎tencentcloud/services/cvm/data_source_tc_reserved_instances_test.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,31 @@ package cvm_test
33
import (
44
"testing"
55

6+
resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
68
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
7-
8-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
99
)
1010

11-
func TestAccTencentCloudReservedInstancesDataSource(t *testing.T) {
11+
func TestAccTencentCloudReservedInstancesDataSource_Basic(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
14-
PreCheck: func() { tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL) },
15-
Providers: tcacctest.AccProviders,
14+
PreCheck: func() {
15+
tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL)
16+
},
17+
Providers: acctest.AccProviders,
1618
Steps: []resource.TestStep{
1719
{
18-
Config: testAccReservedInstancesDataSource,
19-
Check: resource.ComposeTestCheckFunc(
20-
resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instances.instances", "reserved_instance_list.#"),
21-
),
20+
Config: testAccReservedInstancesDataSource_BasicCreate,
21+
Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_reserved_instances.instances"), resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instances.instances", "reserved_instance_list.#")),
2222
},
2323
},
2424
})
2525
}
2626

27-
const testAccReservedInstancesDataSource = `
27+
const testAccReservedInstancesDataSource_BasicCreate = `
28+
2829
data "tencentcloud_reserved_instances" "instances" {
29-
availability_zone = "ap-guangzhou-3"
30+
availability_zone = "ap-guangzhou-3"
3031
}
32+
3133
`

0 commit comments

Comments
 (0)