diff --git a/tencentcloud/services/cvm/data_source_tc_instances_set_test.go b/tencentcloud/services/cvm/data_source_tc_instances_set_test.go index 8041c541f1..0f959f00c5 100644 --- a/tencentcloud/services/cvm/data_source_tc_instances_set_test.go +++ b/tencentcloud/services/cvm/data_source_tc_instances_set_test.go @@ -3,74 +3,73 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) func TestAccTencentCloudInstanceSetDataSource_Basic(t *testing.T) { t.Parallel() - resource.Test(t, resource.TestCase{ - PreCheck: func() { tcacctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, + PreCheck: func() { + acctest.AccPreCheck(t) + }, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccTencentCloudInstancesSetBasic, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.tencentcloud_instances_set.foo", "instance_list.#", "1"), - ), + Config: testAccInstanceSetDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_instances_set.foo"), resource.TestCheckResourceAttr("data.tencentcloud_instances_set.foo", "instance_list.#", "1")), }, }, }) } -const testAccTencentCloudInstancesSetBasic = ` +const testAccInstanceSetDataSource_BasicCreate = ` + data "tencentcloud_availability_zones" "default" { } -data "tencentcloud_images" "default" { - image_type = ["PUBLIC_IMAGE"] - image_name_regex = "Final" -} data "tencentcloud_images" "testing" { - image_type = ["PUBLIC_IMAGE"] + image_type = ["PUBLIC_IMAGE"] +} +data "tencentcloud_images" "default" { + image_type = ["PUBLIC_IMAGE"] + image_name_regex = "Final" } data "tencentcloud_instance_types" "default" { - - filter { - name = "instance-family" - values = ["S1", "S2", "S3", "S4", "S5"] - } - filter { - name = "zone" - values = ["ap-guangzhou-7"] - } - cpu_core_count = 2 - memory_size = 2 - exclude_sold_out = true + memory_size = 2 + exclude_sold_out = true + + filter { + values = ["ap-guangzhou-7"] + name = "zone" + } + filter { + values = ["S1","S2","S3","S4","S5"] + name = "instance-family" + } + cpu_core_count = 2 +} +data "tencentcloud_instances_set" "foo" { + instance_id = tencentcloud_instance.instances_set.id } resource "tencentcloud_vpc" "vpc" { - name = "cvm-basic-vpc" - cidr_block = "10.0.0.0/16" + name = "cvm-basic-vpc" + cidr_block = "10.0.0.0/16" } resource "tencentcloud_subnet" "subnet" { - availability_zone = "ap-guangzhou-7" - vpc_id = tencentcloud_vpc.vpc.id - name = "cvm-basic-subnet" - cidr_block = "10.0.0.0/16" + name = "cvm-basic-subnet" + cidr_block = "10.0.0.0/16" + availability_zone = "ap-guangzhou-7" + vpc_id = tencentcloud_vpc.vpc.id } resource "tencentcloud_instance" "instances_set" { - instance_name = "tf-ci-test" - availability_zone = "ap-guangzhou-7" - image_id = data.tencentcloud_images.default.images.0.image_id - vpc_id = tencentcloud_vpc.vpc.id - subnet_id = tencentcloud_subnet.subnet.id - instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type - system_disk_type = "CLOUD_PREMIUM" - project_id = 0 + availability_zone = "ap-guangzhou-7" + image_id = data.tencentcloud_images.default.images.0.image_id + vpc_id = tencentcloud_vpc.vpc.id + subnet_id = tencentcloud_subnet.subnet.id + instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type + system_disk_type = "CLOUD_PREMIUM" + project_id = 0 + instance_name = "tf-ci-test" } -data "tencentcloud_instances_set" "foo" { - instance_id = tencentcloud_instance.instances_set.id -} ` diff --git a/tencentcloud/services/cvm/data_source_tc_key_pairs_test.go b/tencentcloud/services/cvm/data_source_tc_key_pairs_test.go index fcf010c595..5a8d587aeb 100644 --- a/tencentcloud/services/cvm/data_source_tc_key_pairs_test.go +++ b/tencentcloud/services/cvm/data_source_tc_key_pairs_test.go @@ -3,48 +3,37 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudKeyPairsDataSource(t *testing.T) { +func TestAccTencentCloudKeyPairsDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { tcacctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, - CheckDestroy: testAccCheckKeyPairDestroy, + PreCheck: func() { + acctest.AccPreCheck(t) + }, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccKeyPairDataSource, - Check: resource.ComposeTestCheckFunc( - testAccCheckKeyPairExists("tencentcloud_key_pair.key"), - 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"), - 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.key_name", "key_pair_list.#", "1"), - resource.TestCheckResourceAttrSet("data.tencentcloud_key_pairs.key_name", "key_pair_list.0.key_id"), - resource.TestCheckResourceAttr("data.tencentcloud_key_pairs.key_name", "key_pair_list.0.key_name", "tf_test_key"), - ), + Config: testAccKeyPairsDataSource_BasicCreate, + 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")), }, }, }) } -const testAccKeyPairDataSource = ` -resource "tencentcloud_key_pair" "key" { - key_name = "tf_test_key" - public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw==" -} +const testAccKeyPairsDataSource_BasicCreate = ` data "tencentcloud_key_pairs" "data_key" { - key_id = tencentcloud_key_pair.key.id + key_id = tencentcloud_key_pair.key.id } - data "tencentcloud_key_pairs" "key_name" { - key_name = "^${tencentcloud_key_pair.key.key_name}$" + key_name = "^${tencentcloud_key_pair.key.key_name}$" +} +resource "tencentcloud_key_pair" "key" { + key_name = "tf_test_key" + public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw==" } + ` diff --git a/tencentcloud/services/cvm/data_source_tc_placement_groups_test.go b/tencentcloud/services/cvm/data_source_tc_placement_groups_test.go index 6345f42234..2a2895201a 100644 --- a/tencentcloud/services/cvm/data_source_tc_placement_groups_test.go +++ b/tencentcloud/services/cvm/data_source_tc_placement_groups_test.go @@ -3,39 +3,34 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudPlacementGroupsDataSource(t *testing.T) { +func TestAccTencentCloudPlacementGroupsDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { tcacctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, - CheckDestroy: testAccCheckPlacementGroupDestroy, + PreCheck: func() { + acctest.AccPreCheck(t) + }, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccPlacementGroupDataSource, - Check: resource.ComposeTestCheckFunc( - testAccCheckPlacementGroupExists("tencentcloud_placement_group.placement"), - resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.#", "1"), - 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.name", "tf-test-placement"), - resource.TestCheckResourceAttr("data.tencentcloud_placement_groups.data_placement", "placement_group_list.0.type", "HOST"), - ), + Config: testAccPlacementGroupsDataSource_BasicCreate, + 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")), }, }, }) } -const testAccPlacementGroupDataSource = ` -resource "tencentcloud_placement_group" "placement" { - name = "tf-test-placement" - type = "HOST" -} +const testAccPlacementGroupsDataSource_BasicCreate = ` data "tencentcloud_placement_groups" "data_placement" { - placement_group_id = tencentcloud_placement_group.placement.id + placement_group_id = tencentcloud_placement_group.placement.id } +resource "tencentcloud_placement_group" "placement" { + name = "tf-test-placement" + type = "HOST" +} + ` diff --git a/tencentcloud/services/cvm/data_source_tc_reserved_instance_configs_test.go b/tencentcloud/services/cvm/data_source_tc_reserved_instance_configs_test.go index bf81ea1f0d..63f40b8542 100644 --- a/tencentcloud/services/cvm/data_source_tc_reserved_instance_configs_test.go +++ b/tencentcloud/services/cvm/data_source_tc_reserved_instance_configs_test.go @@ -3,29 +3,31 @@ package cvm_test import ( "testing" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccTencentCloudReservedInstanceConfigsDataSource(t *testing.T) { +func TestAccTencentCloudReservedInstanceConfigsDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL) }, - Providers: tcacctest.AccProviders, + PreCheck: func() { + tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL) + }, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccReservedInstanceConfigsDataSource, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instance_configs.configs", "config_list.#"), - ), + Config: testAccReservedInstanceConfigsDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_reserved_instance_configs.configs"), resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instance_configs.configs", "config_list.#")), }, }, }) } -const testAccReservedInstanceConfigsDataSource = ` +const testAccReservedInstanceConfigsDataSource_BasicCreate = ` + data "tencentcloud_reserved_instance_configs" "configs" { - availability_zone = "ap-guangzhou-2" + availability_zone = "ap-guangzhou-2" } + ` diff --git a/tencentcloud/services/cvm/data_source_tc_reserved_instances_test.go b/tencentcloud/services/cvm/data_source_tc_reserved_instances_test.go index 69c65a5660..4b1704d28f 100644 --- a/tencentcloud/services/cvm/data_source_tc_reserved_instances_test.go +++ b/tencentcloud/services/cvm/data_source_tc_reserved_instances_test.go @@ -3,29 +3,31 @@ package cvm_test import ( "testing" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccTencentCloudReservedInstancesDataSource(t *testing.T) { +func TestAccTencentCloudReservedInstancesDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL) }, - Providers: tcacctest.AccProviders, + PreCheck: func() { + tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_INTERNATIONAL) + }, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccReservedInstancesDataSource, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instances.instances", "reserved_instance_list.#"), - ), + Config: testAccReservedInstancesDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_reserved_instances.instances"), resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instances.instances", "reserved_instance_list.#")), }, }, }) } -const testAccReservedInstancesDataSource = ` +const testAccReservedInstancesDataSource_BasicCreate = ` + data "tencentcloud_reserved_instances" "instances" { - availability_zone = "ap-guangzhou-3" + availability_zone = "ap-guangzhou-3" } + `