Skip to content

Commit bee79a1

Browse files
committed
1.adjust vip ForceNew. 2.rm extranet_access e2e case.
1 parent 9e4e5bc commit bee79a1

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

tencentcloud/resource_tc_dcdb_db_instance_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestAccTencentCloudNeedFixDcdbDbInstanceResource_basic(t *testing.T) {
8888
resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "init_params.3.value", "16384"),
8989
resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "security_group_ids.#", "1"),
9090
resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "project_id", "0"),
91-
resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "extranet_access", "true"),
91+
// resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "extranet_access", "true"),
9292
),
9393
},
9494
{
@@ -100,7 +100,7 @@ func TestAccTencentCloudNeedFixDcdbDbInstanceResource_basic(t *testing.T) {
100100
resource.TestCheckResourceAttrSet("tencentcloud_dcdb_db_instance.db_instance", "vpc_id"),
101101
resource.TestCheckResourceAttrSet("tencentcloud_dcdb_db_instance.db_instance", "subnet_id"),
102102
resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "project_id", defaultProjectId),
103-
resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "extranet_access", "false"),
103+
// resource.TestCheckResourceAttr("tencentcloud_dcdb_db_instance.db_instance", "extranet_access", "false"),
104104
),
105105
},
106106
{
@@ -217,7 +217,7 @@ resource "tencentcloud_dcdb_db_instance" "db_instance" {
217217
security_group_ids = [local.sg_id]
218218
project_id = 0
219219
rs_access_strategy = 1
220-
extranet_access = true
220+
// extranet_access = true
221221
vip = "172.16.112.200"
222222
}
223223
@@ -259,7 +259,7 @@ resource "tencentcloud_dcdb_db_instance" "db_instance" {
259259
security_group_ids = [local.sg_id]
260260
project_id = var.default_project
261261
rs_access_strategy = 2
262-
extranet_access = false
262+
// extranet_access = false
263263
vip = "172.16.112.201"
264264
}
265265

tencentcloud/resource_tc_dcdb_hourdb_instance.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,12 @@ func resourceTencentCloudDcdbHourdbInstance() *schema.Resource {
154154

155155
"vip": {
156156
Optional: true,
157-
ForceNew: true,
158157
Type: schema.TypeString,
159158
Description: "The field is required to specify VIP.",
160159
},
161160

162161
"vipv6": {
163162
Optional: true,
164-
ForceNew: true,
165163
Type: schema.TypeString,
166164
Description: "The field is required to specify VIPv6.",
167165
},

tencentcloud/resource_tc_dcdb_hourdb_instance_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestAccTencentCloudDcdbHourdbInstanceResource_basic(t *testing.T) {
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"),
7878
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "rs_access_strategy", "1"),
79-
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "extranet_access", "true"),
79+
// resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "extranet_access", "true"),
8080
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "vip", "172.16.112.200"),
8181
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "resource_tags.#", "1"),
8282
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "resource_tags.0.tag_key", "aaa"),
@@ -91,7 +91,7 @@ func TestAccTencentCloudDcdbHourdbInstanceResource_basic(t *testing.T) {
9191
resource.TestCheckResourceAttrSet("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "subnet_id"),
9292
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "project_id", defaultProjectId),
9393
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "rs_access_strategy", "2"),
94-
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "extranet_access", "false"),
94+
// resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "extranet_access", "false"),
9595
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "vip", "172.16.112.201"),
9696
resource.TestCheckResourceAttr("tencentcloud_dcdb_hourdb_instance.hourdb_instance", "instance_name", "test_dcdb_hourdb_instance_CHANGED"),
9797
),
@@ -189,7 +189,7 @@ resource "tencentcloud_dcdb_hourdb_instance" "hourdb_instance" {
189189
db_version_id = "8.0"
190190
project_id = 0
191191
rs_access_strategy = 1
192-
extranet_access = true
192+
// extranet_access = true
193193
vip = "172.16.112.200"
194194
resource_tags {
195195
tag_key = "aaa"
@@ -214,7 +214,7 @@ resource "tencentcloud_dcdb_hourdb_instance" "hourdb_instance" {
214214
db_version_id = "8.0"
215215
project_id = var.default_project
216216
rs_access_strategy = 2
217-
extranet_access = false
217+
// extranet_access = false
218218
vip = "172.16.112.201"
219219
resource_tags {
220220
tag_key = "aaa"

tencentcloud/service_tencentcloud_dcdb.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,10 @@ func (me *DcdbService) DcdbDbInstanceStateRefreshFunc(flowId *int64, failStates
664664
return func() (interface{}, string, error) {
665665
ctx := contextNil
666666

667+
if *flowId == 0 {
668+
return &dcdb.DescribeFlowResponseParams{}, "0", nil
669+
}
670+
667671
object, err := me.DescribeDcdbFlowById(ctx, flowId)
668672

669673
if err != nil {

website/docs/r/dcdb_hourdb_instance.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ The following arguments are supported:
5151
* `rs_access_strategy` - (Optional, Int) RS nearest access mode, 0-no policy, 1-nearest access.
5252
* `security_group_id` - (Optional, String) security group id.
5353
* `subnet_id` - (Optional, String) subnet id, it's required when vpcId is set.
54-
* `vip` - (Optional, String, ForceNew) The field is required to specify VIP.
55-
* `vipv6` - (Optional, String, ForceNew) The field is required to specify VIPv6.
54+
* `vip` - (Optional, String) The field is required to specify VIP.
55+
* `vipv6` - (Optional, String) The field is required to specify VIPv6.
5656
* `vpc_id` - (Optional, String) vpc id.
5757
* `zones` - (Optional, Set: [`String`]) available zone.
5858

0 commit comments

Comments
 (0)