Skip to content

Commit 588d059

Browse files
authored
fix(vpc): [138662289] tencentcloud_vpc_end_point Optimize query function (#3304)
* add * add * add
1 parent 4f895a4 commit 588d059

File tree

3 files changed

+59
-6
lines changed

3 files changed

+59
-6
lines changed

.changelog/3304.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_vpc_end_point: Optimize query function
3+
```

tencentcloud/services/dcg/service_tencentcloud_vpc.go

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5591,6 +5591,7 @@ func (me *VpcService) DescribeVpcEndPointServiceById(ctx context.Context, endPoi
55915591
logId := tccommon.GetLogId(ctx)
55925592

55935593
request := vpc.NewDescribeVpcEndPointServiceRequest()
5594+
response := vpc.NewDescribeVpcEndPointServiceResponse()
55945595
request.EndPointServiceIds = []*string{&endPointServiceId}
55955596

55965597
defer func() {
@@ -5609,12 +5610,28 @@ func (me *VpcService) DescribeVpcEndPointServiceById(ctx context.Context, endPoi
56095610
for {
56105611
request.Offset = &offset
56115612
request.Limit = &limit
5612-
response, err := me.client.UseVpcClient().DescribeVpcEndPointService(request)
5613+
5614+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
5615+
ratelimit.Check(request.GetAction())
5616+
result, e := me.client.UseVpcClient().DescribeVpcEndPointService(request)
5617+
if e != nil {
5618+
return tccommon.RetryError(e)
5619+
} else {
5620+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
5621+
}
5622+
5623+
if result == nil || result.Response == nil {
5624+
return resource.NonRetryableError(fmt.Errorf("Describe vpc endPoint service failed, Response is nil."))
5625+
}
5626+
5627+
response = result
5628+
return nil
5629+
})
5630+
56135631
if err != nil {
56145632
errRet = err
56155633
return
56165634
}
5617-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
56185635

56195636
if response == nil || len(response.Response.EndPointServiceSet) < 1 {
56205637
break
@@ -5662,6 +5679,7 @@ func (me *VpcService) DescribeVpcEndPointById(ctx context.Context, endPointId st
56625679
logId := tccommon.GetLogId(ctx)
56635680

56645681
request := vpc.NewDescribeVpcEndPointRequest()
5682+
response := vpc.NewDescribeVpcEndPointResponse()
56655683
request.EndPointId = []*string{&endPointId}
56665684

56675685
defer func() {
@@ -5680,12 +5698,27 @@ func (me *VpcService) DescribeVpcEndPointById(ctx context.Context, endPointId st
56805698
for {
56815699
request.Offset = &offset
56825700
request.Limit = &limit
5683-
response, err := me.client.UseVpcClient().DescribeVpcEndPoint(request)
5701+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
5702+
ratelimit.Check(request.GetAction())
5703+
result, e := me.client.UseVpcClient().DescribeVpcEndPoint(request)
5704+
if e != nil {
5705+
return tccommon.RetryError(e)
5706+
} else {
5707+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
5708+
}
5709+
5710+
if result == nil || result.Response == nil {
5711+
return resource.NonRetryableError(fmt.Errorf("Describe vpc endPoint failed, Response is nil."))
5712+
}
5713+
5714+
response = result
5715+
return nil
5716+
})
5717+
56845718
if err != nil {
56855719
errRet = err
56865720
return
56875721
}
5688-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
56895722

56905723
if response == nil || len(response.Response.EndPointSet) < 1 {
56915724
break

tencentcloud/services/vpc/service_tencentcloud_vpc.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5929,6 +5929,7 @@ func (me *VpcService) DescribeVpcEndPointById(ctx context.Context, endPointId st
59295929
logId := tccommon.GetLogId(ctx)
59305930

59315931
request := vpc.NewDescribeVpcEndPointRequest()
5932+
response := vpc.NewDescribeVpcEndPointResponse()
59325933
request.EndPointId = []*string{&endPointId}
59335934

59345935
defer func() {
@@ -5947,12 +5948,28 @@ func (me *VpcService) DescribeVpcEndPointById(ctx context.Context, endPointId st
59475948
for {
59485949
request.Offset = &offset
59495950
request.Limit = &limit
5950-
response, err := me.client.UseVpcClient().DescribeVpcEndPoint(request)
5951+
5952+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
5953+
ratelimit.Check(request.GetAction())
5954+
result, e := me.client.UseVpcClient().DescribeVpcEndPoint(request)
5955+
if e != nil {
5956+
return tccommon.RetryError(e)
5957+
} else {
5958+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
5959+
}
5960+
5961+
if result == nil || result.Response == nil {
5962+
return resource.NonRetryableError(fmt.Errorf("Describe vpc endPoint failed, Response is nil."))
5963+
}
5964+
5965+
response = result
5966+
return nil
5967+
})
5968+
59515969
if err != nil {
59525970
errRet = err
59535971
return
59545972
}
5955-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
59565973

59575974
if response == nil || len(response.Response.EndPointSet) < 1 {
59585975
break

0 commit comments

Comments
 (0)