Skip to content

Commit f81b51e

Browse files
tongyimingmikatong
tongyiming
and
mikatong
authored
fix: as unit test (#1061)
* fix: as unit test * fix: unit test * fix: time format Co-authored-by: mikatong <mikatong@tencent.com>
1 parent f454e13 commit f81b51e

9 files changed

+70
-57
lines changed

‎tencentcloud/basic_test.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,22 @@ variable "snap_id" {
133133
}
134134
`
135135

136+
// AS
137+
const defaultAsVariable = `
138+
variable "availability_zone" {
139+
default = "` + defaultCvmAZone + `"
140+
}
141+
142+
data "tencentcloud_instance_types" "default" {
143+
filter {
144+
name = "zone"
145+
values = [var.availability_zone]
146+
}
147+
cpu_core_count = 2
148+
exclude_sold_out = true
149+
}
150+
`
151+
136152
//ckafka
137153
const (
138154
defaultKafkaInstanceId = "ckafka-vv7wpvae"

‎tencentcloud/data_source_tc_as_scaling_configs_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ func TestAccTencentCloudAsScalingConfigsDataSource_basic(t *testing.T) {
4242
}
4343

4444
func TestAccTencentCloudAsScalingConfigsDataSource_full(t *testing.T) {
45-
t.Parallel()
4645
resource.Test(t, resource.TestCase{
4746
PreCheck: func() { testAccPreCheck(t) },
4847
Providers: testAccProviders,

‎tencentcloud/data_source_tc_as_scaling_groups_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_basic(t *testing.T) {
1919
Check: resource.ComposeAggregateTestCheckFunc(
2020
testAccCheckAsScalingGroupExists("tencentcloud_as_scaling_group.scaling_group"),
2121
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.#", "1"),
22-
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group"),
22+
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group-ds-basic"),
2323
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.configuration_id"),
2424
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.max_size", "1"),
2525
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.min_size", "0"),
@@ -29,7 +29,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_basic(t *testing.T) {
2929
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.create_time"),
3030

3131
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.#", "1"),
32-
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.scaling_group_name", "tf-as-group"),
32+
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.scaling_group_name", "tf-as-group-ds-basic"),
3333
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.configuration_id"),
3434
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.max_size", "1"),
3535
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.min_size", "0"),
@@ -66,7 +66,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_full(t *testing.T) {
6666
Check: resource.ComposeAggregateTestCheckFunc(
6767
testAccCheckAsScalingGroupExists("tencentcloud_as_scaling_group.scaling_group"),
6868
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.#", "1"),
69-
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group"),
69+
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group-ds-full"),
7070
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.configuration_id"),
7171
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.max_size", "1"),
7272
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.min_size", "0"),
@@ -88,7 +88,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_full(t *testing.T) {
8888

8989
// todo
9090
func testAccAsScalingGroupsDataSource_basic() string {
91-
return `
91+
return defaultAsVariable + `
9292
resource "tencentcloud_vpc" "vpc" {
9393
name = "tf-as-vpc"
9494
cidr_block = "10.2.0.0/16"
@@ -98,17 +98,17 @@ resource "tencentcloud_subnet" "subnet" {
9898
vpc_id = tencentcloud_vpc.vpc.id
9999
name = "tf-as-subnet"
100100
cidr_block = "10.2.11.0/24"
101-
availability_zone = "ap-guangzhou-3"
101+
availability_zone = var.availability_zone
102102
}
103103
104104
resource "tencentcloud_as_scaling_config" "launch_configuration" {
105-
configuration_name = "tf-as-configuration"
105+
configuration_name = "tf-as-configuration-ds-basic"
106106
image_id = "img-2lr9q49h"
107-
instance_types = ["SA1.SMALL1"]
107+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
108108
}
109109
110110
resource "tencentcloud_as_scaling_group" "scaling_group" {
111-
scaling_group_name = "tf-as-group"
111+
scaling_group_name = "tf-as-group-ds-basic"
112112
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
113113
max_size = 1
114114
min_size = 0
@@ -135,7 +135,7 @@ data "tencentcloud_as_scaling_groups" "scaling_groups_tags" {
135135
}
136136

137137
func testAccAsScalingGroupsDataSource_full() string {
138-
return `
138+
return defaultAsVariable + `
139139
resource "tencentcloud_vpc" "vpc" {
140140
name = "tf-as-vpc"
141141
cidr_block = "10.2.0.0/16"
@@ -145,17 +145,17 @@ resource "tencentcloud_subnet" "subnet" {
145145
vpc_id = tencentcloud_vpc.vpc.id
146146
name = "tf-as-subnet"
147147
cidr_block = "10.2.11.0/24"
148-
availability_zone = "ap-guangzhou-3"
148+
availability_zone = var.availability_zone
149149
}
150150
151151
resource "tencentcloud_as_scaling_config" "launch_configuration" {
152-
configuration_name = "tf-as-configuration"
152+
configuration_name = "tf-as-configuration-ds-full"
153153
image_id = "img-2lr9q49h"
154-
instance_types = ["SA1.SMALL1"]
154+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
155155
}
156156
157157
resource "tencentcloud_as_scaling_group" "scaling_group" {
158-
scaling_group_name = "tf-as-group"
158+
scaling_group_name = "tf-as-group-ds-full"
159159
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
160160
max_size = 1
161161
min_size = 0

‎tencentcloud/data_source_tc_as_scaling_policies_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
)
88

99
func TestAccTencentCloudAsScalingPoliciesDataSource(t *testing.T) {
10-
t.Parallel()
1110
resource.Test(t, resource.TestCase{
1211
PreCheck: func() { testAccPreCheck(t) },
1312
Providers: testAccProviders,
@@ -50,7 +49,7 @@ func TestAccTencentCloudAsScalingPoliciesDataSource(t *testing.T) {
5049

5150
//todo
5251
func testAccAsScalingPoliciesDataSource() string {
53-
return `
52+
return defaultAsVariable + `
5453
resource "tencentcloud_vpc" "vpc" {
5554
name = "tf-as-vpc"
5655
cidr_block = "10.2.0.0/16"
@@ -60,17 +59,17 @@ resource "tencentcloud_subnet" "subnet" {
6059
vpc_id = tencentcloud_vpc.vpc.id
6160
name = "tf-as-subnet"
6261
cidr_block = "10.2.11.0/24"
63-
availability_zone = "ap-guangzhou-3"
62+
availability_zone = var.availability_zone
6463
}
6564
6665
resource "tencentcloud_as_scaling_config" "launch_configuration" {
67-
configuration_name = "tf-as-configuration"
66+
configuration_name = "tf-as-configuration-ds"
6867
image_id = "img-9qabwvbn"
69-
instance_types = ["SA1.SMALL1"]
68+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
7069
}
7170
7271
resource "tencentcloud_as_scaling_group" "scaling_group" {
73-
scaling_group_name = "tf-as-scaling-group"
72+
scaling_group_name = "tf-as-scaling-group-datasource"
7473
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
7574
max_size = 1
7675
min_size = 0

‎tencentcloud/resource_tc_as_attachment_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func testAccCheckAsAttachmentDestroy(s *terraform.State) error {
9191
}
9292

9393
func testAccAsAttachment() string {
94-
return `
94+
return defaultAsVariable + `
9595
resource "tencentcloud_vpc" "vpc" {
9696
name = "tf-as-vpc"
9797
cidr_block = "10.2.0.0/16"
@@ -101,13 +101,13 @@ resource "tencentcloud_subnet" "subnet" {
101101
vpc_id = tencentcloud_vpc.vpc.id
102102
name = "tf-as-subnet"
103103
cidr_block = "10.2.11.0/24"
104-
availability_zone = "ap-guangzhou-3"
104+
availability_zone = var.availability_zone
105105
}
106106
107107
resource "tencentcloud_as_scaling_config" "launch_configuration" {
108108
configuration_name = "tf-as-attachment-config"
109109
image_id = "img-2lr9q49h"
110-
instance_types = ["SA1.SMALL1"]
110+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
111111
}
112112
113113
resource "tencentcloud_as_scaling_group" "scaling_group" {
@@ -121,9 +121,9 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {
121121
122122
resource "tencentcloud_instance" "cvm_instance" {
123123
instance_name = "tf_as_instance"
124-
availability_zone = "ap-guangzhou-3"
124+
availability_zone = var.availability_zone
125125
image_id = "img-2lr9q49h"
126-
instance_type = "SA1.SMALL1"
126+
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
127127
system_disk_type = "CLOUD_SSD"
128128
vpc_id = tencentcloud_vpc.vpc.id
129129
subnet_id = tencentcloud_subnet.subnet.id
@@ -137,7 +137,7 @@ resource "tencentcloud_as_attachment" "attachment" {
137137
}
138138

139139
func testAccAsAttachment_update() string {
140-
return `
140+
return defaultAsVariable + `
141141
resource "tencentcloud_vpc" "vpc" {
142142
name = "tf-as-vpc"
143143
cidr_block = "10.2.0.0/16"
@@ -147,13 +147,13 @@ resource "tencentcloud_subnet" "subnet" {
147147
vpc_id = tencentcloud_vpc.vpc.id
148148
name = "tf-as-subnet"
149149
cidr_block = "10.2.11.0/24"
150-
availability_zone = "ap-guangzhou-3"
150+
availability_zone = var.availability_zone
151151
}
152152
153153
resource "tencentcloud_as_scaling_config" "launch_configuration" {
154154
configuration_name = "tf-as-attachment-config"
155155
image_id = "img-2lr9q49h"
156-
instance_types = ["SA1.SMALL1"]
156+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
157157
}
158158
159159
resource "tencentcloud_as_scaling_group" "scaling_group" {
@@ -167,19 +167,19 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {
167167
168168
resource "tencentcloud_instance" "cvm_instance" {
169169
instance_name = "tf_as_instance"
170-
availability_zone = "ap-guangzhou-3"
170+
availability_zone = var.availability_zone
171171
image_id = "img-2lr9q49h"
172-
instance_type = "SA1.SMALL1"
172+
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
173173
system_disk_type = "CLOUD_SSD"
174174
vpc_id = tencentcloud_vpc.vpc.id
175175
subnet_id = tencentcloud_subnet.subnet.id
176176
}
177177
178178
resource "tencentcloud_instance" "cvm_instance_1" {
179179
instance_name = "tf_as_instance_1"
180-
availability_zone = "ap-guangzhou-3"
180+
availability_zone = var.availability_zone
181181
image_id = "img-2lr9q49h"
182-
instance_type = "SA1.SMALL1"
182+
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
183183
system_disk_type = "CLOUD_SSD"
184184
vpc_id = tencentcloud_vpc.vpc.id
185185
subnet_id = tencentcloud_subnet.subnet.id

‎tencentcloud/resource_tc_as_lifecycle_hook_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ resource "tencentcloud_subnet" "subnet" {
107107
}
108108
109109
resource "tencentcloud_as_scaling_config" "launch_configuration" {
110-
configuration_name = "tf-as-configuration"
110+
configuration_name = "tf-as-configuration-lifecycle-hook"
111111
image_id = "img-9qabwvbn"
112112
instance_types = ["SA1.SMALL1"]
113113
}
114114
115115
resource "tencentcloud_as_scaling_group" "scaling_group" {
116-
scaling_group_name = "tf-as-scaling-group"
116+
scaling_group_name = "tf-as-scaling-group-lifecycle-hook"
117117
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
118118
max_size = 1
119119
min_size = 0
@@ -147,13 +147,13 @@ resource "tencentcloud_subnet" "subnet" {
147147
}
148148
149149
resource "tencentcloud_as_scaling_config" "launch_configuration" {
150-
configuration_name = "tf-as-configuration"
150+
configuration_name = "tf-as-configuration-lifecycle-hook"
151151
image_id = "img-9qabwvbn"
152152
instance_types = ["SA1.SMALL1"]
153153
}
154154
155155
resource "tencentcloud_as_scaling_group" "scaling_group" {
156-
scaling_group_name = "tf-as-scaling-group"
156+
scaling_group_name = "tf-as-scaling-group-lifecycle-hook"
157157
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
158158
max_size = 1
159159
min_size = 0

‎tencentcloud/resource_tc_as_scaling_config_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
)
1111

1212
func TestAccTencentCloudAsScalingConfig_basic(t *testing.T) {
13-
t.Parallel()
1413
resource.Test(t, resource.TestCase{
1514
PreCheck: func() { testAccPreCheck(t) },
1615
Providers: testAccProviders,
@@ -95,7 +94,7 @@ func TestAccTencentCloudAsScalingConfig_full(t *testing.T) {
9594
func TestAccTencentCloudAsScalingConfig_charge(t *testing.T) {
9695
t.Parallel()
9796
resource.Test(t, resource.TestCase{
98-
PreCheck: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
97+
PreCheck: func() { testAccPreCheck(t) },
9998
Providers: testAccProviders,
10099
CheckDestroy: testAccCheckAsScalingConfigDestroy,
101100
Steps: []resource.TestStep{
@@ -251,7 +250,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
251250
func testAccAsScalingConfig_charge() string {
252251
return `
253252
resource "tencentcloud_as_scaling_config" "launch_configuration" {
254-
configuration_name = "tf-as-basic"
253+
configuration_name = "tf-as-basic-charge"
255254
image_id = "img-2lr9q49h"
256255
instance_types = ["SA1.SMALL1"]
257256
instance_charge_type = "POSTPAID_BY_HOUR"
@@ -262,7 +261,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
262261
func testAccAsScalingConfig_charge_spot() string {
263262
return `
264263
resource "tencentcloud_as_scaling_config" "launch_configuration" {
265-
configuration_name = "tf-as-basic"
264+
configuration_name = "tf-as-basic-charge-spot"
266265
image_id = "img-2lr9q49h"
267266
instance_types = ["SA1.SMALL1"]
268267
instance_charge_type = "SPOTPAID"
@@ -275,7 +274,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
275274
func testAccAsScalingConfig_charge_perpaid() string {
276275
return `
277276
resource "tencentcloud_as_scaling_config" "launch_configuration" {
278-
configuration_name = "tf-as-basic"
277+
configuration_name = "tf-as-basic-charge-perpaid"
279278
image_id = "img-2lr9q49h"
280279
instance_types = ["SA1.SMALL1"]
281280
instance_charge_type = "PREPAID"

‎tencentcloud/resource_tc_as_scaling_policy_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func testAccCheckAsScalingPolicyDestroy(s *terraform.State) error {
102102
}
103103

104104
func testAccAsScalingPolicy() string {
105-
return `
105+
return defaultAsVariable + `
106106
resource "tencentcloud_vpc" "vpc" {
107107
name = "tf-as-vpc"
108108
cidr_block = "10.2.0.0/16"
@@ -112,17 +112,17 @@ resource "tencentcloud_subnet" "subnet" {
112112
vpc_id = tencentcloud_vpc.vpc.id
113113
name = "tf-as-subnet"
114114
cidr_block = "10.2.11.0/24"
115-
availability_zone = "ap-guangzhou-3"
115+
availability_zone = var.availability_zone
116116
}
117117
118118
resource "tencentcloud_as_scaling_config" "launch_configuration" {
119-
configuration_name = "tf-as-configuration"
119+
configuration_name = "tf-as-configuration-policy"
120120
image_id = "img-9qabwvbn"
121-
instance_types = ["SA1.SMALL1"]
121+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
122122
}
123123
124124
resource "tencentcloud_as_scaling_group" "scaling_group" {
125-
scaling_group_name = "tf-as-scaling-group"
125+
scaling_group_name = "tf-as-scaling-group-policy"
126126
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
127127
max_size = 1
128128
min_size = 0
@@ -147,7 +147,7 @@ resource "tencentcloud_as_scaling_policy" "scaling_policy" {
147147
}
148148

149149
func testAccAsScalingPolicy_update() string {
150-
return `
150+
return defaultAsVariable + `
151151
resource "tencentcloud_vpc" "vpc" {
152152
name = "tf-as-vpc"
153153
cidr_block = "10.2.0.0/16"
@@ -157,17 +157,17 @@ resource "tencentcloud_subnet" "subnet" {
157157
vpc_id = tencentcloud_vpc.vpc.id
158158
name = "tf-as-subnet"
159159
cidr_block = "10.2.11.0/24"
160-
availability_zone = "ap-guangzhou-3"
160+
availability_zone = var.availability_zone
161161
}
162162
163163
resource "tencentcloud_as_scaling_config" "launch_configuration" {
164-
configuration_name = "tf-as-configuration"
164+
configuration_name = "tf-as-configuration-policy"
165165
image_id = "img-9qabwvbn"
166-
instance_types = ["SA1.SMALL1"]
166+
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
167167
}
168168
169169
resource "tencentcloud_as_scaling_group" "scaling_group" {
170-
scaling_group_name = "tf-as-scaling-group"
170+
scaling_group_name = "tf-as-scaling-group-policy"
171171
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
172172
max_size = 1
173173
min_size = 0

0 commit comments

Comments
 (0)