Skip to content

Commit 488964d

Browse files
authored
fix(vpc): [121514068] tencentcloud_vpc_end_point update end_point_vip params (#3053)
* add * add * add
1 parent 2bba629 commit 488964d

File tree

4 files changed

+40
-23
lines changed

4 files changed

+40
-23
lines changed

.changelog/3053.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_vpc_end_point: update `end_point_vip` params
3+
```

tencentcloud/services/pls/resource_tc_vpc_end_point.go

+26-12
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ func ResourceTencentCloudVpcEndPoint() *schema.Resource {
5151

5252
"end_point_vip": {
5353
Optional: true,
54+
Computed: true,
5455
Type: schema.TypeString,
5556
Description: "VIP of endpoint ip.",
5657
},
@@ -128,13 +129,24 @@ func resourceTencentCloudVpcEndPointCreate(d *schema.ResourceData, meta interfac
128129
} else {
129130
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
130131
}
132+
133+
if result == nil || result.Response == nil || result.Response.EndPoint == nil {
134+
return resource.NonRetryableError(fmt.Errorf("Create vpc endPoint failed, Response is nil."))
135+
}
136+
131137
response = result
132138
return nil
133139
})
140+
134141
if err != nil {
135142
log.Printf("[CRITAL]%s create vpc endPoint failed, reason:%+v", logId, err)
136143
return err
137144
}
145+
146+
if response.Response.EndPoint.EndPointId == nil {
147+
return fmt.Errorf("EndPointId is nil.")
148+
}
149+
138150
endPointId = *response.Response.EndPoint.EndPointId
139151
d.SetId(endPointId)
140152

@@ -258,20 +270,22 @@ func resourceTencentCloudVpcEndPointUpdate(d *schema.ResourceData, meta interfac
258270
if v, ok := d.GetOk("security_groups_ids"); ok {
259271
request.SecurityGroupIds = helper.InterfacesStringsPoint(v.([]interface{}))
260272
}
261-
}
262273

263-
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
264-
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyVpcEndPointAttribute(request)
265-
if e != nil {
266-
return tccommon.RetryError(e)
267-
} else {
268-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
274+
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
275+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyVpcEndPointAttribute(request)
276+
if e != nil {
277+
return tccommon.RetryError(e)
278+
} else {
279+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
280+
}
281+
282+
return nil
283+
})
284+
285+
if err != nil {
286+
log.Printf("[CRITAL]%s create vpc endPoint failed, reason:%+v", logId, err)
287+
return err
269288
}
270-
return nil
271-
})
272-
if err != nil {
273-
log.Printf("[CRITAL]%s create vpc endPoint failed, reason:%+v", logId, err)
274-
return err
275289
}
276290

277291
return resourceTencentCloudVpcEndPointRead(d, meta)

tencentcloud/services/pls/resource_tc_vpc_end_point.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Provides a resource to create a vpc end_point
1+
Provides a resource to create a VPC end point
22

33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_vpc_end_point" "end_point" {
6+
resource "tencentcloud_vpc_end_point" "example" {
77
vpc_id = "vpc-391sv4w3"
88
subnet_id = "subnet-ljyn7h30"
9-
end_point_name = "terraform-test"
9+
end_point_name = "tf-example"
1010
end_point_service_id = "vpcsvc-69y13tdb"
1111
end_point_vip = "10.0.2.1"
1212
@@ -20,8 +20,8 @@ resource "tencentcloud_vpc_end_point" "end_point" {
2020

2121
Import
2222

23-
vpc end_point can be imported using the id, e.g.
23+
VPC end point can be imported using the id, e.g.
2424

2525
```
26-
terraform import tencentcloud_vpc_end_point.end_point end_point_id
26+
terraform import tencentcloud_vpc_end_point.example vpce-ntv3vy9k
2727
```

website/docs/r/vpc_end_point.html.markdown

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ layout: "tencentcloud"
44
page_title: "TencentCloud: tencentcloud_vpc_end_point"
55
sidebar_current: "docs-tencentcloud-resource-vpc_end_point"
66
description: |-
7-
Provides a resource to create a vpc end_point
7+
Provides a resource to create a VPC end point
88
---
99

1010
# tencentcloud_vpc_end_point
1111

12-
Provides a resource to create a vpc end_point
12+
Provides a resource to create a VPC end point
1313

1414
## Example Usage
1515

1616
```hcl
17-
resource "tencentcloud_vpc_end_point" "end_point" {
17+
resource "tencentcloud_vpc_end_point" "example" {
1818
vpc_id = "vpc-391sv4w3"
1919
subnet_id = "subnet-ljyn7h30"
20-
end_point_name = "terraform-test"
20+
end_point_name = "tf-example"
2121
end_point_service_id = "vpcsvc-69y13tdb"
2222
end_point_vip = "10.0.2.1"
2323
@@ -53,9 +53,9 @@ In addition to all arguments above, the following attributes are exported:
5353

5454
## Import
5555

56-
vpc end_point can be imported using the id, e.g.
56+
VPC end point can be imported using the id, e.g.
5757

5858
```
59-
terraform import tencentcloud_vpc_end_point.end_point end_point_id
59+
terraform import tencentcloud_vpc_end_point.example vpce-ntv3vy9k
6060
```
6161

0 commit comments

Comments
 (0)