diff --git a/tencentcloud/basic_test.go b/tencentcloud/basic_test.go index 2f7b535dbc..5cbaf2d90f 100644 --- a/tencentcloud/basic_test.go +++ b/tencentcloud/basic_test.go @@ -996,18 +996,20 @@ variable "cynosdb_cluster_security_group_id" { // TSF const ( - defaultNamespaceId = "namespace-aemrg36v" - defaultTsfApplicationId = "application-a24x29xv" - defaultTsfClustId = "cluster-vwgj5e6y" - defaultTsfGroupId = "group-yrjkln9v" - defaultTsfGateway = "gw-ins-lvdypq5k" - defaultTsfDestNamespaceId = "namespace-aemrg36v" - defaultTsfConfigId = "dcfg-y54wzk3a" - defaultTsfApiId = "api-j03q029a" - defaultTsfGWGroupId = "group-vzd97zpy" - defaultTsfFileConfigId = "dcfg-f-ab6l9x5y" - defaultTsfImageId = "img-7r9vq8wd" - defaultTsfGWNamespaceId = "namespace-vwgo38wy" + defaultNamespaceId = "namespace-aemrg36v" + defaultTsfApplicationId = "application-a24x29xv" + defaultTsfClustId = "cluster-vwgj5e6y" + defaultTsfGroupId = "group-yrjkln9v" + defaultTsfGateway = "gw-ins-lvdypq5k" + defaultTsfDestNamespaceId = "namespace-aemrg36v" + defaultTsfConfigId = "dcfg-y54wzk3a" + defaultTsfApiId = "api-j03q029a" + defaultTsfGWGroupId = "group-vzd97zpy" + defaultTsfFileConfigId = "dcfg-f-ab6l9x5y" + defaultTsfImageId = "img-7r9vq8wd" + defaultTsfGWNamespaceId = "namespace-vwgo38wy" + defaultTsfContainerGroupId = "group-y43x5jpa" + defaultTsfpodName = "keep-terraform-7f4874bc5c-w75q4" ) // End of TSF diff --git a/tencentcloud/data_source_tc_tsf_pod_instances_test.go b/tencentcloud/data_source_tc_tsf_pod_instances_test.go index af964168e6..4f738027c6 100644 --- a/tencentcloud/data_source_tc_tsf_pod_instances_test.go +++ b/tencentcloud/data_source_tc_tsf_pod_instances_test.go @@ -36,11 +36,21 @@ func TestAccTencentCloudTsfPodInstancesDataSource_basic(t *testing.T) { }) } -const testAccTsfPodInstancesDataSource = ` +const testAccTsfPodInstancesDataSourceVar = ` +variable "group_id" { + default = "` + defaultTsfContainerGroupId + `" +} + +variable "pod_name" { + default = "` + defaultTsfpodName + `" +} +` + +const testAccTsfPodInstancesDataSource = testAccTsfPodInstancesDataSourceVar + ` data "tencentcloud_tsf_pod_instances" "pod_instances" { - group_id = "group-ynd95rea" - pod_name_list = ["keep-terraform-6f8f977688-zvphm"] + group_id = var.group_id + pod_name_list = [var.pod_name] } ` diff --git a/tencentcloud/resource_tc_redis_ssl_test.go b/tencentcloud/resource_tc_redis_ssl_test.go index 1cc3b37428..32febd8fdf 100644 --- a/tencentcloud/resource_tc_redis_ssl_test.go +++ b/tencentcloud/resource_tc_redis_ssl_test.go @@ -19,7 +19,7 @@ func TestAccTencentCloudRedisSslResource_basic(t *testing.T) { Config: testAccRedisSsl, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_redis_ssl.ssl", "id"), - resource.TestCheckResourceAttr("tencentcloud_redis_ssl.ssl", "instance_id", defaultCrsInstanceId), + resource.TestCheckResourceAttrSet("tencentcloud_redis_ssl.ssl", "instance_id"), resource.TestCheckResourceAttr("tencentcloud_redis_ssl.ssl", "ssl_config", "enabled"), ), }, @@ -32,7 +32,7 @@ func TestAccTencentCloudRedisSslResource_basic(t *testing.T) { Config: testAccRedisSslUpdate, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_redis_ssl.ssl", "id"), - resource.TestCheckResourceAttr("tencentcloud_redis_ssl.ssl", "instance_id", defaultCrsInstanceId), + resource.TestCheckResourceAttrSet("tencentcloud_redis_ssl.ssl", "instance_id"), resource.TestCheckResourceAttr("tencentcloud_redis_ssl.ssl", "ssl_config", "disabled"), ), }, @@ -41,15 +41,40 @@ func TestAccTencentCloudRedisSslResource_basic(t *testing.T) { } const testAccRedisSslVar = ` -variable "instance_id" { - default = "` + defaultCrsInstanceId + `" +data "tencentcloud_redis_zone_config" "zone" { + type_id = 7 +} + +resource "tencentcloud_vpc" "vpc" { + cidr_block = "10.0.0.0/16" + name = "tf_redis_vpc" +} + +resource "tencentcloud_subnet" "subnet" { + vpc_id = tencentcloud_vpc.vpc.id + availability_zone = data.tencentcloud_redis_zone_config.zone.list[1].zone + name = "tf_redis_subnet" + cidr_block = "10.0.1.0/24" +} + +resource "tencentcloud_redis_instance" "foo" { + availability_zone = data.tencentcloud_redis_zone_config.zone.list[1].zone + type_id = data.tencentcloud_redis_zone_config.zone.list[1].type_id + password = "test12345789" + mem_size = 8192 + redis_shard_num = data.tencentcloud_redis_zone_config.zone.list[1].redis_shard_nums[0] + redis_replicas_num = data.tencentcloud_redis_zone_config.zone.list[1].redis_replicas_nums[0] + name = "terrform_test" + port = 6379 + vpc_id = tencentcloud_vpc.vpc.id + subnet_id = tencentcloud_subnet.subnet.id } ` const testAccRedisSsl = testAccRedisSslVar + ` resource "tencentcloud_redis_ssl" "ssl" { - instance_id = var.instance_id + instance_id = tencentcloud_redis_instance.foo.id ssl_config = "enabled" } @@ -58,7 +83,7 @@ resource "tencentcloud_redis_ssl" "ssl" { const testAccRedisSslUpdate = testAccRedisSslVar + ` resource "tencentcloud_redis_ssl" "ssl" { - instance_id = var.instance_id + instance_id = tencentcloud_redis_instance.foo.id ssl_config = "disabled" } diff --git a/tencentcloud/resource_tc_redis_switch_master_test.go b/tencentcloud/resource_tc_redis_switch_master_test.go index b2ae94158e..13ffc6f406 100644 --- a/tencentcloud/resource_tc_redis_switch_master_test.go +++ b/tencentcloud/resource_tc_redis_switch_master_test.go @@ -8,7 +8,7 @@ import ( // go test -i; go test -test.run TestAccTencentCloudRedisSwitchMasterResource_basic -v func TestAccTencentCloudRedisSwitchMasterResource_basic(t *testing.T) { - t.Parallel() + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) diff --git a/tencentcloud/resource_tc_tse_cngw_route_rate_limit_test.go b/tencentcloud/resource_tc_tse_cngw_route_rate_limit_test.go index 723de82894..82a9864043 100644 --- a/tencentcloud/resource_tc_tse_cngw_route_rate_limit_test.go +++ b/tencentcloud/resource_tc_tse_cngw_route_rate_limit_test.go @@ -11,7 +11,7 @@ import ( ) // go test -i; go test -test.run TestAccTencentCloudTseCngwRouteRateLimitResource_basic -v -func TestAccTencentCloudTseCngwRouteRateLimitResource_basic(t *testing.T) { +func TestAccTencentCloudNeedFixTseCngwRouteRateLimitResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/tencentcloud/resource_tc_tse_cngw_service_rate_limit_test.go b/tencentcloud/resource_tc_tse_cngw_service_rate_limit_test.go index 82dffff696..3a19af74c3 100644 --- a/tencentcloud/resource_tc_tse_cngw_service_rate_limit_test.go +++ b/tencentcloud/resource_tc_tse_cngw_service_rate_limit_test.go @@ -11,7 +11,7 @@ import ( ) // go test -i; go test -test.run TestAccTencentCloudTseCngwServiceRateLimitResource_basic -v -func TestAccTencentCloudTseCngwServiceRateLimitResource_basic(t *testing.T) { +func TestAccTencentCloudNeedFixTseCngwServiceRateLimitResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/tencentcloud/resource_tc_tsf_deploy_container_group_test.go b/tencentcloud/resource_tc_tsf_deploy_container_group_test.go index 62a590a177..7abde506ca 100644 --- a/tencentcloud/resource_tc_tsf_deploy_container_group_test.go +++ b/tencentcloud/resource_tc_tsf_deploy_container_group_test.go @@ -75,10 +75,16 @@ func TestAccTencentCloudTsfDeployContainerGroupResource_basic(t *testing.T) { }) } -const testAccTsfDeployContainerGroup = ` +const testAccTsfDeployContainerGroupVar = ` +variable "group_id" { + default = "` + defaultTsfContainerGroupId + `" +} +` + +const testAccTsfDeployContainerGroup = testAccTsfDeployContainerGroupVar + ` resource "tencentcloud_tsf_deploy_container_group" "deploy_container_group" { - group_id = "group-yqml6w3a" + group_id = var.group_id cpu_request = "0.25" mem_request = "640" server = "ccr.ccs.tencentyun.com" diff --git a/tencentcloud/resource_tc_tsf_operate_container_group_test.go b/tencentcloud/resource_tc_tsf_operate_container_group_test.go index 048ef99104..2d3a59444e 100644 --- a/tencentcloud/resource_tc_tsf_operate_container_group_test.go +++ b/tencentcloud/resource_tc_tsf_operate_container_group_test.go @@ -66,7 +66,7 @@ func testAccCheckTsfOperateContainerGroupExists(r string) resource.TestCheckFunc const testAccTsfOperateContainerGroup = ` resource "tencentcloud_tsf_operate_container_group" "operate_container_group" { - group_id = "group-yqml6w3a" + group_id = "group-ympdpdzy" operate = "stop" } @@ -74,7 +74,7 @@ resource "tencentcloud_tsf_operate_container_group" "operate_container_group" { const testAccTsfOperateContainerGroupUp = ` resource "tencentcloud_tsf_operate_container_group" "operate_container_group" { - group_id = "group-yqml6w3a" + group_id = "group-ympdpdzy" operate = "start" }