From 17d71edfb5ed197329645e7d181ae59688b4424b Mon Sep 17 00:00:00 2001 From: mikatong Date: Wed, 9 Oct 2024 16:29:18 +0800 Subject: [PATCH 1/4] fix ccn routes read --- .../ccn/resource_tc_ccn_routes_test.go | 8 ++--- .../services/ccn/service_tencentcloud_ccn.go | 7 ++++- .../services/dcg/service_tencentcloud_vpc.go | 31 ------------------- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/tencentcloud/services/ccn/resource_tc_ccn_routes_test.go b/tencentcloud/services/ccn/resource_tc_ccn_routes_test.go index 4cc6c50555..d3f71f2bd0 100644 --- a/tencentcloud/services/ccn/resource_tc_ccn_routes_test.go +++ b/tencentcloud/services/ccn/resource_tc_ccn_routes_test.go @@ -39,8 +39,8 @@ func TestAccTencentCloudCcnRoutesResource_basic(t *testing.T) { const testAccVpcCcnRoutes = ` resource "tencentcloud_ccn_routes" "ccn_routes" { - ccn_id = "ccn-39lqkygf" - route_id = "ccnr-3o0dfyuw" + ccn_id = "ccn-0bbkedsb" + route_id = "ccnr-9sqye2qg" switch = "off" } @@ -49,8 +49,8 @@ resource "tencentcloud_ccn_routes" "ccn_routes" { const testAccVpcCcnRoutesUpdate = ` resource "tencentcloud_ccn_routes" "ccn_routes" { - ccn_id = "ccn-39lqkygf" - route_id = "ccnr-3o0dfyuw" + ccn_id = "ccn-0bbkedsb" + route_id = "ccnr-9sqye2qg" switch = "on" } diff --git a/tencentcloud/services/ccn/service_tencentcloud_ccn.go b/tencentcloud/services/ccn/service_tencentcloud_ccn.go index 72892e5915..3d46dbf850 100644 --- a/tencentcloud/services/ccn/service_tencentcloud_ccn.go +++ b/tencentcloud/services/ccn/service_tencentcloud_ccn.go @@ -1260,7 +1260,12 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string request := vpc.NewDescribeCcnRoutesRequest() request.CcnId = &ccnId - + request.Filters = []*vpc.Filter{ + { + Name: helper.String("route-id"), + Values: []*string{helper.String(routeId)}, + }, + } defer func() { if errRet != nil { log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error()) diff --git a/tencentcloud/services/dcg/service_tencentcloud_vpc.go b/tencentcloud/services/dcg/service_tencentcloud_vpc.go index e4fcd27c23..93951601fb 100644 --- a/tencentcloud/services/dcg/service_tencentcloud_vpc.go +++ b/tencentcloud/services/dcg/service_tencentcloud_vpc.go @@ -5854,37 +5854,6 @@ func (me *VpcService) DescribeVpcBandwidthPackageByEip(ctx context.Context, eipI return } -func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string, routeId string) (ccnRoutes *vpc.CcnRoute, errRet error) { - logId := tccommon.GetLogId(ctx) - - request := vpc.NewDescribeCcnRoutesRequest() - request.CcnId = &ccnId - - defer func() { - if errRet != nil { - log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error()) - } - }() - - ratelimit.Check(request.GetAction()) - - response, err := me.client.UseVpcClient().DescribeCcnRoutes(request) - if err != nil { - errRet = err - return - } - log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) - - for _, route := range response.Response.RouteSet { - if *route.RouteId == routeId { - ccnRoutes = route - return - } - } - - return -} - func (me *VpcService) DescribeCcnCrossBorderComplianceByFilter(ctx context.Context, param map[string]interface{}) (crossBorderCompliance []*vpc.CrossBorderCompliance, errRet error) { var ( logId = tccommon.GetLogId(ctx) From db40866ad63adfee18448c1c7a8c11954e8226be Mon Sep 17 00:00:00 2001 From: mikatong Date: Wed, 9 Oct 2024 16:35:10 +0800 Subject: [PATCH 2/4] add changelog --- .changelog/2877.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2877.txt diff --git a/.changelog/2877.txt b/.changelog/2877.txt new file mode 100644 index 0000000000..d8bf167a48 --- /dev/null +++ b/.changelog/2877.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_ccn_routes: fix ccn routes read +``` \ No newline at end of file From c7841e904a82df0cb62dddf5ac0b67d485b7f48f Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 11 Oct 2024 17:35:02 +0800 Subject: [PATCH 3/4] update --- tencentcloud/services/ccn/service_tencentcloud_ccn.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tencentcloud/services/ccn/service_tencentcloud_ccn.go b/tencentcloud/services/ccn/service_tencentcloud_ccn.go index 3d46dbf850..e0564f6939 100644 --- a/tencentcloud/services/ccn/service_tencentcloud_ccn.go +++ b/tencentcloud/services/ccn/service_tencentcloud_ccn.go @@ -1281,13 +1281,6 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string } log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) - for _, route := range response.Response.RouteSet { - if *route.RouteId == routeId { - ccnRoutes = route - return - } - } - return } From 008b86b51b7f34835e384569a589c2f8e326c1df Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 11 Oct 2024 17:50:33 +0800 Subject: [PATCH 4/4] update --- tencentcloud/services/ccn/service_tencentcloud_ccn.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tencentcloud/services/ccn/service_tencentcloud_ccn.go b/tencentcloud/services/ccn/service_tencentcloud_ccn.go index e0564f6939..7573dd769b 100644 --- a/tencentcloud/services/ccn/service_tencentcloud_ccn.go +++ b/tencentcloud/services/ccn/service_tencentcloud_ccn.go @@ -1281,6 +1281,10 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string } log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) + if response != nil && response.Response != nil && len(response.Response.RouteSet) > 0 { + ccnRoutes = response.Response.RouteSet[0] + } + return }