Skip to content

Fix/redis basic testcase #1274

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 2 commits into from
Sep 16, 2022
Merged

Fix/redis basic testcase #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84d84f9
fix: redis - avoid using basic network testcase
Kagashino Sep 15, 2022
f3db4f7
fix: redis basic deprecated doc
Kagashino Sep 16, 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
4 changes: 3 additions & 1 deletion tencentcloud/data_source_tc_redis_instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@ 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
password = "test12345789"
mem_size = 8192
name = "terraform_test"
port = 6379
vpc_id = var.vpc_id
subnet_id = var.subnet_id
tags = {
"test" = "test"
}
Expand Down
8 changes: 6 additions & 2 deletions tencentcloud/resource_tc_redis_backup_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tencentcloud/resource_tc_redis_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
62 changes: 39 additions & 23 deletions tencentcloud/resource_tc_redis_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
}
`
}
2 changes: 2 additions & 0 deletions website/docs/r/redis_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down