Skip to content

Commit 7269703

Browse files
KagashinoKagashino
authored
Fix/redis basic testcase (#1274)
* fix: redis - avoid using basic network testcase * fix: redis basic deprecated doc
1 parent ed17ac7 commit 7269703

File tree

5 files changed

+52
-26
lines changed

5 files changed

+52
-26
lines changed

‎tencentcloud/data_source_tc_redis_instances_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,16 @@ func TestAccTencentCloudRedisInstancesDataSource(t *testing.T) {
4646
}
4747

4848
func testAccTencentCloudRedisInstancesDataSourceConfig() string {
49-
return `
49+
return defaultVpcVariable + `
5050
resource "tencentcloud_redis_instance" "redis_instance_test" {
5151
availability_zone = "ap-guangzhou-3"
5252
type_id = 2
5353
password = "test12345789"
5454
mem_size = 8192
5555
name = "terraform_test"
5656
port = 6379
57+
vpc_id = var.vpc_id
58+
subnet_id = var.subnet_id
5759
tags = {
5860
"test" = "test"
5961
}

‎tencentcloud/resource_tc_redis_backup_config_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,15 @@ func testAccTencentCloudRedisBackupConfigDestroy(s *terraform.State) error {
9191
}
9292

9393
func testAccRedisBackupConfigUpdate() string {
94-
return `
94+
return defaultVpcVariable + `
9595
resource "tencentcloud_redis_instance" "redis_instance_test" {
9696
availability_zone = "ap-guangzhou-3"
9797
type_id = 2
9898
password = "test12345789"
9999
mem_size = 8192
100100
name = "terrform_test"
101+
vpc_id = var.vpc_id
102+
subnet_id = var.subnet_id
101103
}
102104
resource "tencentcloud_redis_backup_config" "redis_backup_config" {
103105
redis_id = tencentcloud_redis_instance.redis_instance_test.id
@@ -106,13 +108,15 @@ resource "tencentcloud_redis_backup_config" "redis_backup_config" {
106108
}
107109

108110
func testAccRedisBackupConfig() string {
109-
return `
111+
return defaultVpcVariable + `
110112
resource "tencentcloud_redis_instance" "redis_instance_test" {
111113
availability_zone = "ap-guangzhou-3"
112114
type_id = 2
113115
password = "test12345789"
114116
mem_size = 8192
115117
name = "terrform_test"
118+
vpc_id = var.vpc_id
119+
subnet_id = var.subnet_id
116120
}
117121
resource "tencentcloud_redis_backup_config" "redis_backup_config" {
118122
redis_id = tencentcloud_redis_instance.redis_instance_test.id

‎tencentcloud/resource_tc_redis_instance.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
Provides a resource to create a Redis instance and set its attributes.
33
4+
~> **NOTE:** The argument vpc_id and subnet_id is now required because Basic Network Instance is no longer supported.
5+
46
~> **NOTE:** Both adding and removing replications in one change is supported but not recommend.
57
68
Example Usage

‎tencentcloud/resource_tc_redis_instance_test.go‎

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func init() {
137137
})
138138
}
139139

140-
func TestAccTencentCloudRedisInstance(t *testing.T) {
140+
func TestAccTencentCloudRedisInstanceBasic(t *testing.T) {
141141
resource.Test(t, resource.TestCase{
142142
PreCheck: func() { testAccPreCheck(t) },
143143
Providers: testAccProviders,
@@ -191,7 +191,7 @@ func TestAccTencentCloudRedisInstance(t *testing.T) {
191191
),
192192
},
193193
{
194-
Config: testAccRedisInstanceUpdateMemsizeAndPassword(),
194+
Config: testAccRedisInstanceUpdateMemSizeAndPassword(),
195195
Check: resource.ComposeAggregateTestCheckFunc(
196196
testAccTencentCloudRedisInstanceExists("tencentcloud_redis_instance.redis_instance_test"),
197197
resource.TestCheckResourceAttrSet("tencentcloud_redis_instance.redis_instance_test", "ip"),
@@ -474,7 +474,7 @@ variable "redis_default_param_template" {
474474
`
475475

476476
func testAccRedisInstanceBasic() string {
477-
return `
477+
return defaultVpcVariable + `
478478
resource "tencentcloud_redis_instance" "redis_instance_test" {
479479
availability_zone = "ap-guangzhou-3"
480480
type_id = 2
@@ -484,11 +484,13 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
484484
port = 6379
485485
redis_shard_num = 1
486486
redis_replicas_num = 1
487+
vpc_id = var.vpc_id
488+
subnet_id = var.subnet_id
487489
}`
488490
}
489491

490492
func testAccRedisInstanceTags() string {
491-
return `
493+
return defaultVpcVariable + `
492494
resource "tencentcloud_redis_instance" "redis_instance_test" {
493495
availability_zone = "ap-guangzhou-3"
494496
type_id = 2
@@ -498,6 +500,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
498500
port = 6379
499501
redis_shard_num = 1
500502
redis_replicas_num = 1
503+
vpc_id = var.vpc_id
504+
subnet_id = var.subnet_id
501505
502506
tags = {
503507
test = "test"
@@ -506,7 +510,7 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
506510
}
507511

508512
func testAccRedisInstanceTagsUpdate() string {
509-
return `
513+
return defaultVpcVariable + `
510514
resource "tencentcloud_redis_instance" "redis_instance_test" {
511515
availability_zone = "ap-guangzhou-3"
512516
type_id = 2
@@ -516,6 +520,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
516520
port = 6379
517521
redis_shard_num = 1
518522
redis_replicas_num = 1
523+
vpc_id = var.vpc_id
524+
subnet_id = var.subnet_id
519525
520526
tags = {
521527
abc = "abc"
@@ -524,7 +530,7 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
524530
}
525531

526532
func testAccRedisInstanceUpdateName() string {
527-
return `
533+
return defaultVpcVariable + `
528534
resource "tencentcloud_redis_instance" "redis_instance_test" {
529535
availability_zone = "ap-guangzhou-3"
530536
type_id = 2
@@ -534,15 +540,17 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
534540
port = 6379
535541
redis_shard_num = 1
536542
redis_replicas_num = 1
537-
543+
vpc_id = var.vpc_id
544+
subnet_id = var.subnet_id
545+
538546
tags = {
539547
abc = "abc"
540548
}
541549
}`
542550
}
543551

544-
func testAccRedisInstanceUpdateMemsizeAndPassword() string {
545-
return `
552+
func testAccRedisInstanceUpdateMemSizeAndPassword() string {
553+
return defaultVpcVariable + `
546554
resource "tencentcloud_redis_instance" "redis_instance_test" {
547555
availability_zone = "ap-guangzhou-3"
548556
type_id = 2
@@ -552,6 +560,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
552560
port = 6379
553561
redis_shard_num = 1
554562
redis_replicas_num = 1
563+
vpc_id = var.vpc_id
564+
subnet_id = var.subnet_id
555565
556566
tags = {
557567
"abc" = "abc"
@@ -651,24 +661,26 @@ resource "tencentcloud_redis_instance" "redis_cluster" {
651661
}
652662

653663
func testAccRedisInstancePrepaidBasic() string {
654-
return `
664+
return defaultVpcVariable + `
655665
resource "tencentcloud_redis_instance" "redis_prepaid_instance_test" {
656-
availability_zone = "ap-guangzhou-3"
657-
type_id = 2
658-
password = "test12345789"
659-
mem_size = 8192
660-
name = "terraform_prepaid_test"
661-
port = 6379
662-
redis_shard_num = 1
663-
redis_replicas_num = 1
664-
charge_type = "PREPAID"
665-
prepaid_period = 2
666-
force_delete = true
666+
availability_zone = "ap-guangzhou-3"
667+
type_id = 2
668+
password = "test12345789"
669+
mem_size = 8192
670+
name = "terraform_prepaid_test"
671+
port = 6379
672+
redis_shard_num = 1
673+
redis_replicas_num = 1
674+
charge_type = "PREPAID"
675+
prepaid_period = 2
676+
force_delete = true
677+
vpc_id = var.vpc_id
678+
subnet_id = var.subnet_id
667679
}`
668680
}
669681

670682
func testAccRedisInstanceParamTemplate() string {
671-
return testAccRedisDefaultTemplate + `
683+
return defaultVpcVariable + testAccRedisDefaultTemplate + `
672684
resource "tencentcloud_redis_instance" "redis_instance_test" {
673685
availability_zone = "ap-guangzhou-3"
674686
type_id = 6
@@ -679,11 +691,13 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
679691
redis_shard_num = 1
680692
redis_replicas_num = 1
681693
params_template_id = var.redis_param_template
694+
vpc_id = var.vpc_id
695+
subnet_id = var.subnet_id
682696
}`
683697
}
684698

685699
func testAccRedisInstanceParamTemplateUpdate() string {
686-
return testAccRedisDefaultTemplate + `
700+
return defaultVpcVariable + testAccRedisDefaultTemplate + `
687701
resource "tencentcloud_redis_instance" "redis_instance_test" {
688702
availability_zone = "ap-guangzhou-3"
689703
type_id = 6
@@ -694,6 +708,8 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
694708
redis_shard_num = 1
695709
redis_replicas_num = 1
696710
params_template_id = var.redis_default_param_template
711+
vpc_id = var.vpc_id
712+
subnet_id = var.subnet_id
697713
}
698714
`
699715
}

‎website/docs/r/redis_instance.html.markdown‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ description: |-
1111

1212
Provides a resource to create a Redis instance and set its attributes.
1313

14+
~> **NOTE:** The argument vpc_id and subnet_id is now required because Basic Network Instance is no longer supported.
15+
1416
~> **NOTE:** Both adding and removing replications in one change is supported but not recommend.
1517

1618
## Example Usage

0 commit comments

Comments
 (0)