diff --git a/tencentcloud/data_source_tc_redis_instances_test.go b/tencentcloud/data_source_tc_redis_instances_test.go index ee18b83349..f54ab69709 100644 --- a/tencentcloud/data_source_tc_redis_instances_test.go +++ b/tencentcloud/data_source_tc_redis_instances_test.go @@ -46,7 +46,7 @@ func TestAccTencentCloudRedisInstancesDataSource(t *testing.T) { } func testAccTencentCloudRedisInstancesDataSourceConfig() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 @@ -54,6 +54,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { mem_size = 8192 name = "terraform_test" port = 6379 + vpc_id = var.vpc_id + subnet_id = var.subnet_id tags = { "test" = "test" } diff --git a/tencentcloud/resource_tc_redis_backup_config_test.go b/tencentcloud/resource_tc_redis_backup_config_test.go index 0154a72594..1ff07a61c2 100644 --- a/tencentcloud/resource_tc_redis_backup_config_test.go +++ b/tencentcloud/resource_tc_redis_backup_config_test.go @@ -91,13 +91,15 @@ func testAccTencentCloudRedisBackupConfigDestroy(s *terraform.State) error { } func testAccRedisBackupConfigUpdate() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 password = "test12345789" mem_size = 8192 name = "terrform_test" + vpc_id = var.vpc_id + subnet_id = var.subnet_id } resource "tencentcloud_redis_backup_config" "redis_backup_config" { redis_id = tencentcloud_redis_instance.redis_instance_test.id @@ -106,13 +108,15 @@ resource "tencentcloud_redis_backup_config" "redis_backup_config" { } func testAccRedisBackupConfig() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 password = "test12345789" mem_size = 8192 name = "terrform_test" + vpc_id = var.vpc_id + subnet_id = var.subnet_id } resource "tencentcloud_redis_backup_config" "redis_backup_config" { redis_id = tencentcloud_redis_instance.redis_instance_test.id diff --git a/tencentcloud/resource_tc_redis_instance.go b/tencentcloud/resource_tc_redis_instance.go index d4b0c66dc9..13d3bfde82 100644 --- a/tencentcloud/resource_tc_redis_instance.go +++ b/tencentcloud/resource_tc_redis_instance.go @@ -1,6 +1,8 @@ /* Provides a resource to create a Redis instance and set its attributes. +~> **NOTE:** The argument vpc_id and subnet_id is now required because Basic Network Instance is no longer supported. + ~> **NOTE:** Both adding and removing replications in one change is supported but not recommend. Example Usage diff --git a/tencentcloud/resource_tc_redis_instance_test.go b/tencentcloud/resource_tc_redis_instance_test.go index 2a03cffb16..115ac8d751 100644 --- a/tencentcloud/resource_tc_redis_instance_test.go +++ b/tencentcloud/resource_tc_redis_instance_test.go @@ -137,7 +137,7 @@ func init() { }) } -func TestAccTencentCloudRedisInstance(t *testing.T) { +func TestAccTencentCloudRedisInstanceBasic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -191,7 +191,7 @@ func TestAccTencentCloudRedisInstance(t *testing.T) { ), }, { - Config: testAccRedisInstanceUpdateMemsizeAndPassword(), + Config: testAccRedisInstanceUpdateMemSizeAndPassword(), Check: resource.ComposeAggregateTestCheckFunc( testAccTencentCloudRedisInstanceExists("tencentcloud_redis_instance.redis_instance_test"), resource.TestCheckResourceAttrSet("tencentcloud_redis_instance.redis_instance_test", "ip"), @@ -474,7 +474,7 @@ variable "redis_default_param_template" { ` func testAccRedisInstanceBasic() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 @@ -484,11 +484,13 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { port = 6379 redis_shard_num = 1 redis_replicas_num = 1 + vpc_id = var.vpc_id + subnet_id = var.subnet_id }` } func testAccRedisInstanceTags() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 @@ -498,6 +500,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { port = 6379 redis_shard_num = 1 redis_replicas_num = 1 + vpc_id = var.vpc_id + subnet_id = var.subnet_id tags = { test = "test" @@ -506,7 +510,7 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { } func testAccRedisInstanceTagsUpdate() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 @@ -516,6 +520,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { port = 6379 redis_shard_num = 1 redis_replicas_num = 1 + vpc_id = var.vpc_id + subnet_id = var.subnet_id tags = { abc = "abc" @@ -524,7 +530,7 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { } func testAccRedisInstanceUpdateName() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 @@ -534,15 +540,17 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { port = 6379 redis_shard_num = 1 redis_replicas_num = 1 - + vpc_id = var.vpc_id + subnet_id = var.subnet_id + tags = { abc = "abc" } }` } -func testAccRedisInstanceUpdateMemsizeAndPassword() string { - return ` +func testAccRedisInstanceUpdateMemSizeAndPassword() string { + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 2 @@ -552,6 +560,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { port = 6379 redis_shard_num = 1 redis_replicas_num = 1 + vpc_id = var.vpc_id + subnet_id = var.subnet_id tags = { "abc" = "abc" @@ -651,24 +661,26 @@ resource "tencentcloud_redis_instance" "redis_cluster" { } func testAccRedisInstancePrepaidBasic() string { - return ` + return defaultVpcVariable + ` resource "tencentcloud_redis_instance" "redis_prepaid_instance_test" { - availability_zone = "ap-guangzhou-3" - type_id = 2 - password = "test12345789" - mem_size = 8192 - name = "terraform_prepaid_test" - port = 6379 - redis_shard_num = 1 - redis_replicas_num = 1 - charge_type = "PREPAID" - prepaid_period = 2 - force_delete = true + availability_zone = "ap-guangzhou-3" + type_id = 2 + password = "test12345789" + mem_size = 8192 + name = "terraform_prepaid_test" + port = 6379 + redis_shard_num = 1 + redis_replicas_num = 1 + charge_type = "PREPAID" + prepaid_period = 2 + force_delete = true + vpc_id = var.vpc_id + subnet_id = var.subnet_id }` } func testAccRedisInstanceParamTemplate() string { - return testAccRedisDefaultTemplate + ` + return defaultVpcVariable + testAccRedisDefaultTemplate + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 6 @@ -679,11 +691,13 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { redis_shard_num = 1 redis_replicas_num = 1 params_template_id = var.redis_param_template + vpc_id = var.vpc_id + subnet_id = var.subnet_id }` } func testAccRedisInstanceParamTemplateUpdate() string { - return testAccRedisDefaultTemplate + ` + return defaultVpcVariable + testAccRedisDefaultTemplate + ` resource "tencentcloud_redis_instance" "redis_instance_test" { availability_zone = "ap-guangzhou-3" type_id = 6 @@ -694,6 +708,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" { redis_shard_num = 1 redis_replicas_num = 1 params_template_id = var.redis_default_param_template + vpc_id = var.vpc_id + subnet_id = var.subnet_id } ` } diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown index e737aef5a1..a17b19a539 100644 --- a/website/docs/r/redis_instance.html.markdown +++ b/website/docs/r/redis_instance.html.markdown @@ -11,6 +11,8 @@ description: |- Provides a resource to create a Redis instance and set its attributes. +~> **NOTE:** The argument vpc_id and subnet_id is now required because Basic Network Instance is no longer supported. + ~> **NOTE:** Both adding and removing replications in one change is supported but not recommend. ## Example Usage