Skip to content

fix: as unit test #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 25, 2022
Merged

fix: as unit test #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1911e2
fix: as unit test
May 24, 2022
36b28bf
fix: unit test
May 24, 2022
899d934
fix: time format
May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions tencentcloud/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,22 @@ variable "snap_id" {
}
`

// AS
const defaultAsVariable = `
variable "availability_zone" {
default = "` + defaultCvmAZone + `"
}

data "tencentcloud_instance_types" "default" {
filter {
name = "zone"
values = [var.availability_zone]
}
cpu_core_count = 2
exclude_sold_out = true
}
`

//ckafka
const (
defaultKafkaInstanceId = "ckafka-vv7wpvae"
Expand Down
1 change: 0 additions & 1 deletion tencentcloud/data_source_tc_as_scaling_configs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func TestAccTencentCloudAsScalingConfigsDataSource_basic(t *testing.T) {
}

func TestAccTencentCloudAsScalingConfigsDataSource_full(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand Down
26 changes: 13 additions & 13 deletions tencentcloud/data_source_tc_as_scaling_groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_basic(t *testing.T) {
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAsScalingGroupExists("tencentcloud_as_scaling_group.scaling_group"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group-ds-basic"),
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.configuration_id"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.max_size", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.min_size", "0"),
Expand All @@ -29,7 +29,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_basic(t *testing.T) {
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.create_time"),

resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.scaling_group_name", "tf-as-group"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.scaling_group_name", "tf-as-group-ds-basic"),
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.configuration_id"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.max_size", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.min_size", "0"),
Expand Down Expand Up @@ -66,7 +66,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_full(t *testing.T) {
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAsScalingGroupExists("tencentcloud_as_scaling_group.scaling_group"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.#", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.scaling_group_name", "tf-as-group-ds-full"),
resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.configuration_id"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.max_size", "1"),
resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups", "scaling_group_list.0.min_size", "0"),
Expand All @@ -88,7 +88,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_full(t *testing.T) {

// todo
func testAccAsScalingGroupsDataSource_basic() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -98,17 +98,17 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-ds-basic"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-group"
scaling_group_name = "tf-as-group-ds-basic"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand All @@ -135,7 +135,7 @@ data "tencentcloud_as_scaling_groups" "scaling_groups_tags" {
}

func testAccAsScalingGroupsDataSource_full() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -145,17 +145,17 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-ds-full"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-group"
scaling_group_name = "tf-as-group-ds-full"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand Down
11 changes: 5 additions & 6 deletions tencentcloud/data_source_tc_as_scaling_policies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
)

func TestAccTencentCloudAsScalingPoliciesDataSource(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand Down Expand Up @@ -50,7 +49,7 @@ func TestAccTencentCloudAsScalingPoliciesDataSource(t *testing.T) {

//todo
func testAccAsScalingPoliciesDataSource() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -60,17 +59,17 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-ds"
image_id = "img-9qabwvbn"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-scaling-group"
scaling_group_name = "tf-as-scaling-group-datasource"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand Down
24 changes: 12 additions & 12 deletions tencentcloud/resource_tc_as_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func testAccCheckAsAttachmentDestroy(s *terraform.State) error {
}

func testAccAsAttachment() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -101,13 +101,13 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-attachment-config"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
Expand All @@ -121,9 +121,9 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {

resource "tencentcloud_instance" "cvm_instance" {
instance_name = "tf_as_instance"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
image_id = "img-2lr9q49h"
instance_type = "SA1.SMALL1"
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
system_disk_type = "CLOUD_SSD"
vpc_id = tencentcloud_vpc.vpc.id
subnet_id = tencentcloud_subnet.subnet.id
Expand All @@ -137,7 +137,7 @@ resource "tencentcloud_as_attachment" "attachment" {
}

func testAccAsAttachment_update() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -147,13 +147,13 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-attachment-config"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
Expand All @@ -167,19 +167,19 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {

resource "tencentcloud_instance" "cvm_instance" {
instance_name = "tf_as_instance"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
image_id = "img-2lr9q49h"
instance_type = "SA1.SMALL1"
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
system_disk_type = "CLOUD_SSD"
vpc_id = tencentcloud_vpc.vpc.id
subnet_id = tencentcloud_subnet.subnet.id
}

resource "tencentcloud_instance" "cvm_instance_1" {
instance_name = "tf_as_instance_1"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
image_id = "img-2lr9q49h"
instance_type = "SA1.SMALL1"
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
system_disk_type = "CLOUD_SSD"
vpc_id = tencentcloud_vpc.vpc.id
subnet_id = tencentcloud_subnet.subnet.id
Expand Down
8 changes: 4 additions & 4 deletions tencentcloud/resource_tc_as_lifecycle_hook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ resource "tencentcloud_subnet" "subnet" {
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-lifecycle-hook"
image_id = "img-9qabwvbn"
instance_types = ["SA1.SMALL1"]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-scaling-group"
scaling_group_name = "tf-as-scaling-group-lifecycle-hook"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand Down Expand Up @@ -147,13 +147,13 @@ resource "tencentcloud_subnet" "subnet" {
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-lifecycle-hook"
image_id = "img-9qabwvbn"
instance_types = ["SA1.SMALL1"]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-scaling-group"
scaling_group_name = "tf-as-scaling-group-lifecycle-hook"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand Down
9 changes: 4 additions & 5 deletions tencentcloud/resource_tc_as_scaling_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
)

func TestAccTencentCloudAsScalingConfig_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand Down Expand Up @@ -95,7 +94,7 @@ func TestAccTencentCloudAsScalingConfig_full(t *testing.T) {
func TestAccTencentCloudAsScalingConfig_charge(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAsScalingConfigDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -251,7 +250,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
func testAccAsScalingConfig_charge() string {
return `
resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-basic"
configuration_name = "tf-as-basic-charge"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_charge_type = "POSTPAID_BY_HOUR"
Expand All @@ -262,7 +261,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
func testAccAsScalingConfig_charge_spot() string {
return `
resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-basic"
configuration_name = "tf-as-basic-charge-spot"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_charge_type = "SPOTPAID"
Expand All @@ -275,7 +274,7 @@ resource "tencentcloud_as_scaling_config" "launch_configuration" {
func testAccAsScalingConfig_charge_perpaid() string {
return `
resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-basic"
configuration_name = "tf-as-basic-charge-perpaid"
image_id = "img-2lr9q49h"
instance_types = ["SA1.SMALL1"]
instance_charge_type = "PREPAID"
Expand Down
20 changes: 10 additions & 10 deletions tencentcloud/resource_tc_as_scaling_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func testAccCheckAsScalingPolicyDestroy(s *terraform.State) error {
}

func testAccAsScalingPolicy() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -112,17 +112,17 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-policy"
image_id = "img-9qabwvbn"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-scaling-group"
scaling_group_name = "tf-as-scaling-group-policy"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand All @@ -147,7 +147,7 @@ resource "tencentcloud_as_scaling_policy" "scaling_policy" {
}

func testAccAsScalingPolicy_update() string {
return `
return defaultAsVariable + `
resource "tencentcloud_vpc" "vpc" {
name = "tf-as-vpc"
cidr_block = "10.2.0.0/16"
Expand All @@ -157,17 +157,17 @@ resource "tencentcloud_subnet" "subnet" {
vpc_id = tencentcloud_vpc.vpc.id
name = "tf-as-subnet"
cidr_block = "10.2.11.0/24"
availability_zone = "ap-guangzhou-3"
availability_zone = var.availability_zone
}

resource "tencentcloud_as_scaling_config" "launch_configuration" {
configuration_name = "tf-as-configuration"
configuration_name = "tf-as-configuration-policy"
image_id = "img-9qabwvbn"
instance_types = ["SA1.SMALL1"]
instance_types = [data.tencentcloud_instance_types.default.instance_types.0.instance_type]
}

resource "tencentcloud_as_scaling_group" "scaling_group" {
scaling_group_name = "tf-as-scaling-group"
scaling_group_name = "tf-as-scaling-group-policy"
configuration_id = tencentcloud_as_scaling_config.launch_configuration.id
max_size = 1
min_size = 0
Expand Down
Loading