Skip to content

Commit 3ede164

Browse files
tongyimingmikatong
and
mikatong
authored
fix(ccn): [119957297] routes read (#2877)
* fix ccn routes read * add changelog * update * update --------- Co-authored-by: mikatong <[email protected]>
1 parent dd2bded commit 3ede164

File tree

4 files changed

+15
-41
lines changed

4 files changed

+15
-41
lines changed

.changelog/2877.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_ccn_routes: fix ccn routes read
3+
```

tencentcloud/services/ccn/resource_tc_ccn_routes_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func TestAccTencentCloudCcnRoutesResource_basic(t *testing.T) {
3939
const testAccVpcCcnRoutes = `
4040
4141
resource "tencentcloud_ccn_routes" "ccn_routes" {
42-
ccn_id = "ccn-39lqkygf"
43-
route_id = "ccnr-3o0dfyuw"
42+
ccn_id = "ccn-0bbkedsb"
43+
route_id = "ccnr-9sqye2qg"
4444
switch = "off"
4545
}
4646
@@ -49,8 +49,8 @@ resource "tencentcloud_ccn_routes" "ccn_routes" {
4949
const testAccVpcCcnRoutesUpdate = `
5050
5151
resource "tencentcloud_ccn_routes" "ccn_routes" {
52-
ccn_id = "ccn-39lqkygf"
53-
route_id = "ccnr-3o0dfyuw"
52+
ccn_id = "ccn-0bbkedsb"
53+
route_id = "ccnr-9sqye2qg"
5454
switch = "on"
5555
}
5656

tencentcloud/services/ccn/service_tencentcloud_ccn.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,12 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string
12601260

12611261
request := vpc.NewDescribeCcnRoutesRequest()
12621262
request.CcnId = &ccnId
1263-
1263+
request.Filters = []*vpc.Filter{
1264+
{
1265+
Name: helper.String("route-id"),
1266+
Values: []*string{helper.String(routeId)},
1267+
},
1268+
}
12641269
defer func() {
12651270
if errRet != nil {
12661271
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
@@ -1276,11 +1281,8 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string
12761281
}
12771282
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
12781283

1279-
for _, route := range response.Response.RouteSet {
1280-
if *route.RouteId == routeId {
1281-
ccnRoutes = route
1282-
return
1283-
}
1284+
if response != nil && response.Response != nil && len(response.Response.RouteSet) > 0 {
1285+
ccnRoutes = response.Response.RouteSet[0]
12841286
}
12851287

12861288
return

tencentcloud/services/dcg/service_tencentcloud_vpc.go

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5854,37 +5854,6 @@ func (me *VpcService) DescribeVpcBandwidthPackageByEip(ctx context.Context, eipI
58545854
return
58555855
}
58565856

5857-
func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string, routeId string) (ccnRoutes *vpc.CcnRoute, errRet error) {
5858-
logId := tccommon.GetLogId(ctx)
5859-
5860-
request := vpc.NewDescribeCcnRoutesRequest()
5861-
request.CcnId = &ccnId
5862-
5863-
defer func() {
5864-
if errRet != nil {
5865-
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
5866-
}
5867-
}()
5868-
5869-
ratelimit.Check(request.GetAction())
5870-
5871-
response, err := me.client.UseVpcClient().DescribeCcnRoutes(request)
5872-
if err != nil {
5873-
errRet = err
5874-
return
5875-
}
5876-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
5877-
5878-
for _, route := range response.Response.RouteSet {
5879-
if *route.RouteId == routeId {
5880-
ccnRoutes = route
5881-
return
5882-
}
5883-
}
5884-
5885-
return
5886-
}
5887-
58885857
func (me *VpcService) DescribeCcnCrossBorderComplianceByFilter(ctx context.Context, param map[string]interface{}) (crossBorderCompliance []*vpc.CrossBorderCompliance, errRet error) {
58895858
var (
58905859
logId = tccommon.GetLogId(ctx)

0 commit comments

Comments
 (0)