Skip to content

Commit 86edff0

Browse files
andrew-txandrew-tx
authored
Merge pull request #2096 from tencentcloudstack/feat/tse-cngw-group
Feat/tse cngw group
2 parents 35c357b + 302e001 commit 86edff0

36 files changed

+6616
-473
lines changed

‎.changelog/2096.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
```release-note:new-data-source
2+
tencentcloud_tse_groups
3+
```
4+
5+
```release-note:new-data-source
6+
tencentcloud_tse_gateways
7+
```
8+
9+
```release-note:new-data-source
10+
tencentcloud_tse_gateway_routes
11+
```
12+
13+
```release-note:new-resource
14+
tencentcloud_tse_cngw_gateway
15+
```
16+
17+
```release-note:new-resource
18+
tencentcloud_tse_cngw_service_rate_limit
19+
```
20+
21+
```release-note:new-resource
22+
tencentcloud_tse_cngw_route
23+
```
24+
25+
```release-note:new-resource
26+
tencentcloud_tse_cngw_route_rate_limit
27+
```
28+
29+
```release-note:enhancement
30+
resource/tencentcloud_tse_cngw_service: Deprecate ineffective tags
31+
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ require (
8888
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
8989
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.730
9090
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.691
91-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.701
91+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.732
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
9494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.706

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.730 h1:5biR
877877
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.730/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
878878
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.731 h1:CEVwQ9XWRPJuESAE5svto2WZZqtk9i1eAaqsviQyhyA=
879879
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.731/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
880+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.732 h1:19TNf4ATZQLFDSKNsJ+FE86rc2HlqkFeIO6wNw2Hj6g=
881+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.732/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
880882
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.735 h1:LJF4eHQdBd5fvjoIGrgB19knAZ98besEzskr0uyypLQ=
881883
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.735/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
882884
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.736 h1:kDxUSuxipDOYAgssgXVf33WT2g6UyY+67yVMsVHPGiU=
@@ -983,6 +985,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.691 h1:D+a7bZn
983985
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.691/go.mod h1:hsc/CPzbCRXqblCYuE1HuvP3G06OWA9zhAGI6AtEe5U=
984986
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.701 h1:k048M8hxerqIt9am5Hw9xJBmbJdPDxJd3Fzp2O1jlf0=
985987
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.701/go.mod h1:t8LNOPsOOP1JtkDcZLtDu7dyAp4mwffBKu4Q+5Oyl/o=
988+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.732 h1:hC6bRxIBwjAEnqDsJh8tpY/SqcSfP84exN+cVvHwtd4=
989+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.732/go.mod h1:jF0O9bIPZ/oQ+m3qeEfWHLbtsJFKNaiqvdSNGP7AQCI=
986990
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674 h1:VsMV1/vsgVzespG7jUzraZS/AbAUllVQjmtVAlA9W/M=
987991
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674/go.mod h1:6+MWxaNR4y+spZHYNntulOyj628owTLuWmEFebJOWdA=
988992
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=

‎tencentcloud/data_source_tc_tse_gateway_routes.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -283,17 +283,22 @@ func dataSourceTencentCloudTseGatewayRoutesRead(d *schema.ResourceData, meta int
283283
}
284284

285285
if routeList.Headers != nil {
286-
headersMap := map[string]interface{}{}
286+
headersList := []interface{}{}
287+
for _, headers := range routeList.Headers {
288+
headersMap := map[string]interface{}{}
287289

288-
if routeList.Headers.Key != nil {
289-
headersMap["key"] = routeList.Headers.Key
290-
}
290+
if headers.Key != nil {
291+
headersMap["key"] = headers.Key
292+
}
293+
294+
if headers.Value != nil {
295+
headersMap["value"] = headers.Value
296+
}
291297

292-
if routeList.Headers.Value != nil {
293-
headersMap["value"] = routeList.Headers.Value
298+
headersList = append(headersList, headersMap)
294299
}
295300

296-
routeListMap["headers"] = []interface{}{headersMap}
301+
routeListMap["headers"] = headersList
297302
}
298303

299304
routeListList = append(routeListList, routeListMap)

‎tencentcloud/data_source_tc_tse_gateway_routes_test.go‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
77
)
88

9-
func TestAccTencentCloudNeedFixTseGatewayRoutesDataSource_basic(t *testing.T) {
9+
// go test -i; go test -test.run TestAccTencentCloudTseGatewayRoutesDataSource_basic -v
10+
func TestAccTencentCloudTseGatewayRoutesDataSource_basic(t *testing.T) {
1011
t.Parallel()
1112
resource.Test(t, resource.TestCase{
1213
PreCheck: func() {
@@ -19,23 +20,23 @@ func TestAccTencentCloudNeedFixTseGatewayRoutesDataSource_basic(t *testing.T) {
1920
Check: resource.ComposeTestCheckFunc(
2021
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tse_gateway_routes.gateway_routes"),
2122
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.#"),
22-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.#"),
23-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.name"),
24-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.id"),
25-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.methods.#"),
26-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.paths.#"),
27-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.hosts.#"),
28-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.protocols.#"),
29-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.preserveHost"),
30-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.https_redirect_status_code"),
31-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.strip_path"),
32-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.created_time"),
33-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.destination_ports"),
34-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.service_name"),
35-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.service_id"),
36-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.headers.#"),
37-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.headers.0.key"),
38-
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.RouteList.0.headers.0.value"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.#"),
24+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.name"),
25+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.id"),
26+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.methods.#"),
27+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.paths.#"),
28+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.hosts.#"),
29+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.protocols.#"),
30+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.preserve_host"),
31+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.https_redirect_status_code"),
32+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.strip_path"),
33+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.created_time"),
34+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.destination_ports.#"),
35+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.service_name"),
36+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.service_id"),
37+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.headers.#"),
38+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.headers.0.key"),
39+
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.route_list.0.headers.0.value"),
3940
resource.TestCheckResourceAttrSet("data.tencentcloud_tse_gateway_routes.gateway_routes", "result.0.total_count"),
4041
),
4142
},

0 commit comments

Comments
 (0)