Skip to content

Commit 7840f3e

Browse files
committed
add
1 parent 64cc842 commit 7840f3e

File tree

9 files changed

+417
-57
lines changed

9 files changed

+417
-57
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.973
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.976
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -73,7 +73,7 @@ require (
7373
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.873
7474
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.859
7575
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts v1.0.762
76-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.973
76+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.976
7777
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum v1.0.744
7878
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.807
7979
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.748

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971 h1:T5zE
972972
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
973973
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.973 h1:XtrGe/XEyusLgGiv1DpEg9SRR7sxsSbIgAhMxcEVbjY=
974974
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.973/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
975+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.976 h1:k49CShY+0s4vMip96eimmno/qm0RO5VzKDjwXDcyWsc=
976+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.976/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
975977
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
976978
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
977979
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1052,6 +1054,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.971 h1:G8+MT
10521054
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.971/go.mod h1:dZboVm97Cz4p3ARJAx+08LQOYYNKI8fKCIhJd9xdMLw=
10531055
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.973 h1:DsSTfkZQ5cPeVwol8zo4kYg57AFFHqEr0fdpke0eRtI=
10541056
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.973/go.mod h1:Z+EvpolXVYJ8/VbdCLUen73PfwFAqIWHCOV5xrkFnPA=
1057+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.976 h1:sz55cAVBG5+6WvEpP+A5VhXRZrvchEIvDdPWkUUmnQQ=
1058+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.976/go.mod h1:5xaiCbtLOTK5j5SPEQP5qJ9bU33TeodyYl2vwli9b+M=
10551059
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920 h1:Kaab57oHrhiagHURsTNU/XfRFWXXSWxOXoix+YvLHrY=
10561060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920/go.mod h1:AhvwfhTo0JOz2FG4FcmVVdxJ73NpPAQ7rzjjWoEYFOw=
10571061
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum v1.0.744 h1:Z6xqpgnVPQfw2Yx/c2z6n30LfNodK4JEgMca1WpfOrY=

tencentcloud/services/crs/resource_tc_redis_instance.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ func ResourceTencentCloudRedisInstance() *schema.Resource {
204204
Description: "Instance tags.",
205205
},
206206
// Computed values
207+
"dedicated_cluster_id": {
208+
Type: schema.TypeString,
209+
Computed: true,
210+
Description: "Dedicated Cluster ID.",
211+
},
207212
"status": {
208213
Type: schema.TypeString,
209214
Computed: true,
@@ -611,8 +616,9 @@ func resourceTencentCloudRedisInstanceRead(d *schema.ResourceData, meta interfac
611616
_ = d.Set("ip", info.WanIp)
612617
_ = d.Set("create_time", info.Createtime)
613618
_ = d.Set("auto_renew_flag", info.AutoRenewFlag)
614-
_ = d.Set("product_version", info.)
615-
_ = d.Set("redis_cluster_id", info.)
619+
_ = d.Set("product_version", info.ProductVersion)
620+
_ = d.Set("redis_cluster_id", info.RedisClusterId)
621+
_ = d.Set("dedicated_cluster_id", info.DedicatedClusterId)
616622
slaveReadWeight := *info.SlaveReadWeight
617623
if slaveReadWeight == 0 {
618624
_ = d.Set("replicas_read_only", false)
@@ -698,6 +704,8 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
698704

699705
unsupportedUpdateFields := []string{
700706
"prepaid_period",
707+
"product_version",
708+
"redis_cluster_id",
701709
}
702710
for _, field := range unsupportedUpdateFields {
703711
if d.HasChange(field) {

tencentcloud/services/crs/resource_tc_redis_instance.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ resource "tencentcloud_subnet" "subnet" {
2525
cidr_block = "10.0.1.0/24"
2626
}
2727
28-
resource "tencentcloud_redis_instance" "foo" {
28+
resource "tencentcloud_redis_instance" "example" {
2929
availability_zone = data.tencentcloud_redis_zone_config.zone.list[0].zone
3030
type_id = data.tencentcloud_redis_zone_config.zone.list[0].type_id
31-
password = "test12345789"
31+
password = "Password@123"
3232
mem_size = 8192
3333
redis_shard_num = data.tencentcloud_redis_zone_config.zone.list[0].redis_shard_nums[0]
3434
redis_replicas_num = data.tencentcloud_redis_zone_config.zone.list[0].redis_replicas_nums[0]
35-
name = "terrform_test"
35+
name = "tf-example"
3636
port = 6379
3737
vpc_id = tencentcloud_vpc.vpc.id
3838
subnet_id = tencentcloud_subnet.subnet.id
@@ -66,12 +66,12 @@ resource "tencentcloud_subnet" "subnet" {
6666
cidr_block = "10.0.1.0/24"
6767
}
6868
69-
resource "tencentcloud_security_group" "foo" {
69+
resource "tencentcloud_security_group" "security_group" {
7070
name = "tf-redis-sg"
7171
}
7272
73-
resource "tencentcloud_security_group_lite_rule" "foo" {
74-
security_group_id = tencentcloud_security_group.foo.id
73+
resource "tencentcloud_security_group_lite_rule" "sg_rule" {
74+
security_group_id = tencentcloud_security_group.security_group.id
7575
7676
ingress = [
7777
"ACCEPT#192.168.1.0/24#80#TCP",
@@ -86,18 +86,18 @@ resource "tencentcloud_security_group_lite_rule" "foo" {
8686
]
8787
}
8888
89-
resource "tencentcloud_redis_instance" "red1" {
89+
resource "tencentcloud_redis_instance" "example" {
9090
availability_zone = data.tencentcloud_availability_zones_by_product.az.zones[0].name
9191
type_id = var.redis_type_id
9292
charge_type = "POSTPAID"
9393
mem_size = 1024
94-
name = "test-redis"
94+
name = "tf-example"
9595
port = 6379
9696
project_id = 0
9797
vpc_id = tencentcloud_vpc.vpc.id
9898
subnet_id = tencentcloud_subnet.subnet.id
99-
password = "a12121312334"
100-
security_groups = [tencentcloud_security_group.foo.id]
99+
password = "Password@123"
100+
security_groups = [tencentcloud_security_group.security_group.id]
101101
redis_replicas_num = var.redis_replicas_num
102102
redis_shard_num = 1
103103
replica_zone_ids = [
@@ -126,12 +126,12 @@ resource "tencentcloud_subnet" "subnet" {
126126
cidr_block = "10.0.1.0/24"
127127
}
128128
129-
resource "tencentcloud_security_group" "foo" {
129+
resource "tencentcloud_security_group" "security_group" {
130130
name = "tf-redis-sg"
131131
}
132132
133-
resource "tencentcloud_security_group_lite_rule" "foo" {
134-
security_group_id = tencentcloud_security_group.foo.id
133+
resource "tencentcloud_security_group_lite_rule" "sg_rule" {
134+
security_group_id = tencentcloud_security_group.security_group.id
135135
136136
ingress = [
137137
"ACCEPT#192.168.1.0/24#80#TCP",
@@ -146,18 +146,18 @@ resource "tencentcloud_security_group_lite_rule" "foo" {
146146
]
147147
}
148148
149-
resource "tencentcloud_redis_instance" "foo" {
149+
resource "tencentcloud_redis_instance" "example" {
150150
availability_zone = data.tencentcloud_redis_zone_config.zone.list[0].zone
151151
type_id = data.tencentcloud_redis_zone_config.zone.list[0].type_id
152-
password = "test12345789"
152+
password = "Password@123"
153153
mem_size = 8192
154154
redis_shard_num = data.tencentcloud_redis_zone_config.zone.list[0].redis_shard_nums[0]
155155
redis_replicas_num = data.tencentcloud_redis_zone_config.zone.list[0].redis_replicas_nums[0]
156-
name = "terrform_test"
156+
name = "tf-example"
157157
port = 6379
158158
vpc_id = tencentcloud_vpc.vpc.id
159159
subnet_id = tencentcloud_subnet.subnet.id
160-
security_groups = [tencentcloud_security_group.foo.id]
160+
security_groups = [tencentcloud_security_group.security_group.id]
161161
charge_type = "PREPAID"
162162
prepaid_period = 1
163163
}
@@ -187,12 +187,12 @@ resource "tencentcloud_subnet" "subnet" {
187187
cidr_block = "10.0.1.0/24"
188188
}
189189
190-
resource "tencentcloud_security_group" "foo" {
190+
resource "tencentcloud_security_group" "security_group" {
191191
name = "tf-redis-sg"
192192
}
193193
194-
resource "tencentcloud_security_group_lite_rule" "foo" {
195-
security_group_id = tencentcloud_security_group.foo.id
194+
resource "tencentcloud_security_group_lite_rule" "sg_rule" {
195+
security_group_id = tencentcloud_security_group.security_group.id
196196
197197
ingress = [
198198
"ACCEPT#192.168.1.0/24#80#TCP",
@@ -207,19 +207,19 @@ resource "tencentcloud_security_group_lite_rule" "foo" {
207207
]
208208
}
209209
210-
resource "tencentcloud_redis_instance" "foo" {
210+
resource "tencentcloud_redis_instance" "example" {
211211
availability_zone = data.tencentcloud_redis_zone_config.zone.list[2].zone
212212
type_id = data.tencentcloud_redis_zone_config.zone.list[2].type_id
213-
password = "test12345789"
213+
password = "Password@123"
214214
mem_size = 8192
215215
redis_shard_num = data.tencentcloud_redis_zone_config.zone.list[2].redis_shard_nums[0]
216216
redis_replicas_num = 2
217217
replica_zone_ids = var.replica_zone_ids
218-
name = "terrform_test"
218+
name = "tf-example"
219219
port = 6379
220220
vpc_id = tencentcloud_vpc.vpc.id
221221
subnet_id = tencentcloud_subnet.subnet.id
222-
security_groups = [tencentcloud_security_group.foo.id]
222+
security_groups = [tencentcloud_security_group.security_group.id]
223223
}
224224
```
225225

@@ -228,5 +228,5 @@ Import
228228
Redis instance can be imported, e.g.
229229

230230
```
231-
$ terraform import tencentcloud_redis_instance.redislab redis-id
231+
$ terraform import tencentcloud_redis_instance.example crs-iu22tdrf
232232
```

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412/client.go

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)