Skip to content

Commit 38cc10e

Browse files
lyu571lyu571
committed
rm rs_access_strategy from instance resource
1 parent ce5c9d7 commit 38cc10e

File tree

4 files changed

+2
-58
lines changed

4 files changed

+2
-58
lines changed

‎tencentcloud/resource_tc_dcdb_db_instance.go‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,6 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
173173
Description: "Whether to open the extranet access.",
174174
},
175175

176-
"rs_access_strategy": {
177-
Optional: true,
178-
Type: schema.TypeInt,
179-
Description: "RS nearest access mode, 0-no policy, 1-nearest access.",
180-
},
181-
182176
"vip": {
183177
Optional: true,
184178
Computed: true,
@@ -470,14 +464,6 @@ func resourceTencentCloudDcdbDbInstanceCreate(d *schema.ResourceData, meta inter
470464
}
471465
}
472466

473-
if v, ok := d.GetOkExists("rs_access_strategy"); ok && v != nil {
474-
rsStrategy := v.(int)
475-
err := service.SetRealServerAccessStrategy(ctx, instanceId, rsStrategy)
476-
if err != nil {
477-
return err
478-
}
479-
}
480-
481467
var (
482468
vip string
483469
vipv6 string
@@ -672,10 +658,9 @@ func resourceTencentCloudDcdbDbInstanceRead(d *schema.ResourceData, meta interfa
672658
return err
673659
}
674660

675-
// set rs_access_strategy, vip, vipv6 and vport
661+
// set vip, vipv6 and vport
676662
if detail, err := service.DescribeDcdbDbInstanceDetailById(ctx, instanceId); err == nil {
677663
if detail != nil {
678-
_ = d.Set("rs_access_strategy", detail.RsAccessStrategy)
679664
_ = d.Set("vip", detail.Vip)
680665
_ = d.Set("vipv6", detail.Vip6)
681666
_ = d.Set("vport", detail.Vport)
@@ -763,7 +748,6 @@ func resourceTencentCloudDcdbDbInstanceUpdate(d *schema.ResourceData, meta inter
763748
return fmt.Errorf("`shard_count` do not support change now.")
764749
}
765750

766-
// if d.HasChange("extranet_access") {
767751
if v, ok := d.GetOkExists("extranet_access"); ok && v != nil {
768752
flag := v.(bool)
769753
var ipv6Flag int
@@ -776,16 +760,6 @@ func resourceTencentCloudDcdbDbInstanceUpdate(d *schema.ResourceData, meta inter
776760
}
777761
time.Sleep(2 * time.Second)
778762
}
779-
// }
780-
781-
if v, ok := d.GetOkExists("rs_access_strategy"); ok && v != nil {
782-
rsStrategy := v.(int)
783-
err := service.SetRealServerAccessStrategy(ctx, instanceId, rsStrategy)
784-
if err != nil {
785-
return err
786-
}
787-
time.Sleep(2 * time.Second)
788-
}
789763

790764
if d.HasChange("project_id") {
791765
if projectId, ok := d.GetOk("project_id"); ok {

‎tencentcloud/resource_tc_dcdb_db_instance_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ resource "tencentcloud_dcdb_db_instance" "db_instance" {
230230
}
231231
security_group_ids = [local.sg_id]
232232
project_id = 0
233-
rs_access_strategy = 1
234233
// extranet_access = true
235234
}
236235
@@ -272,7 +271,6 @@ resource "tencentcloud_dcdb_db_instance" "db_instance" {
272271
}
273272
security_group_ids = [local.sg_id]
274273
project_id = var.default_project
275-
rs_access_strategy = 2
276274
// extranet_access = false
277275
}
278276

‎tencentcloud/resource_tc_dcdb_hourdb_instance.go‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ func resourceTencentCloudDcdbHourdbInstance() *schema.Resource {
146146
Description: "Whether to open the extranet access.",
147147
},
148148

149-
"rs_access_strategy": {
150-
Optional: true,
151-
Type: schema.TypeInt,
152-
Description: "RS nearest access mode, 0-no policy, 1-nearest access.",
153-
},
154-
155149
"vip": {
156150
Optional: true,
157151
Computed: true,
@@ -365,14 +359,6 @@ func resourceTencentCloudDcdbHourdbInstanceCreate(d *schema.ResourceData, meta i
365359
}
366360
}
367361

368-
if v, ok := d.GetOkExists("rs_access_strategy"); ok && v != nil {
369-
rsStrategy := v.(int)
370-
err := service.SetRealServerAccessStrategy(ctx, instanceId, rsStrategy)
371-
if err != nil {
372-
return err
373-
}
374-
}
375-
376362
var (
377363
vip string
378364
vipv6 string
@@ -523,10 +509,9 @@ func resourceTencentCloudDcdbHourdbInstanceRead(d *schema.ResourceData, meta int
523509
return err
524510
}
525511

526-
// set rs_access_strategy, vip, vipv6 and vport
512+
// set vip, vipv6 and vport
527513
if detail, err := service.DescribeDcdbDbInstanceDetailById(ctx, instanceId); err == nil {
528514
if detail != nil {
529-
_ = d.Set("rs_access_strategy", detail.RsAccessStrategy)
530515
_ = d.Set("vip", detail.Vip)
531516
_ = d.Set("vipv6", detail.Vip6)
532517
_ = d.Set("vport", detail.Vport)
@@ -604,15 +589,6 @@ func resourceTencentCloudDcdbHourdbInstanceUpdate(d *schema.ResourceData, meta i
604589
time.Sleep(2 * time.Second)
605590
}
606591

607-
if v, ok := d.GetOkExists("rs_access_strategy"); ok && v != nil {
608-
rsStrategy := v.(int)
609-
err := service.SetRealServerAccessStrategy(ctx, instanceId, rsStrategy)
610-
if err != nil {
611-
return err
612-
}
613-
time.Sleep(2 * time.Second)
614-
}
615-
616592
if d.HasChange("project_id") {
617593
if projectId, ok := d.GetOk("project_id"); ok {
618594
request := dcdb.NewModifyDBInstancesProjectRequest()

‎tencentcloud/resource_tc_dcdb_hourdb_instance_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ func TestAccTencentCloudDcdbHourdbInstanceResource_basic(t *testing.T) {
7575
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "shard_count", "2"),
7676
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "db_version_id", "8.0"),
7777
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "project_id", "0"),
78-
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "rs_access_strategy", "0"),
7978
// resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "extranet_access", "true"),
8079
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "resource_tags.#", "1"),
8180
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "resource_tags.0.tag_key", "aaa"),
@@ -89,7 +88,6 @@ func TestAccTencentCloudDcdbHourdbInstanceResource_basic(t *testing.T) {
8988
resource.TestCheckResourceAttrSet("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "vpc_id"),
9089
resource.TestCheckResourceAttrSet("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "subnet_id"),
9190
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "project_id", defaultProjectId),
92-
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "rs_access_strategy", "1"),
9391
// resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "extranet_access", "false"),
9492
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "vip", "172.18.111.10"),
9593
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "instance_name", "test_dcdb_hourdb_instance_CHANGED"),
@@ -201,7 +199,6 @@ resource "tencentcloud_dcdb_hourdb_instance" "hourdb_instance" {
201199
security_group_id = local.sg_id
202200
db_version_id = "8.0"
203201
project_id = 0
204-
rs_access_strategy = 0
205202
// extranet_access = true
206203
resource_tags {
207204
tag_key = "aaa"
@@ -226,7 +223,6 @@ resource "tencentcloud_dcdb_hourdb_instance" "hourdb_instance" {
226223
security_group_id = ""
227224
db_version_id = "8.0"
228225
project_id = var.default_project
229-
rs_access_strategy = 1
230226
// extranet_access = false
231227
resource_tags {
232228
tag_key = "aaa"

0 commit comments

Comments
 (0)