Skip to content

Commit 5e3e6a5

Browse files
gitmkngitmkn
committed
feat: support strategy
1 parent f58687b commit 5e3e6a5

26 files changed

+4564
-87
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.847
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.711
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.856
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -93,7 +93,7 @@ require (
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758
9494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
96-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.804
96+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
9898
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
9999
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.845
@@ -107,10 +107,10 @@ require (
107107

108108
require (
109109
github.com/hashicorp/go-uuid v1.0.3
110+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/billing v1.0.856
110111
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwpg v1.0.772
111112
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.798
112113
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831
113-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/billing v1.0.856
114114
github.com/wI2L/jsondiff v0.3.0
115115
k8s.io/apimachinery v0.22.4
116116
)

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.847 h1:ITZm
958958
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.847/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
959959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.856 h1:4PaaKxPjh0dmRzzz0CRZSZlbvzQIPcg4TE1Ibz0Cdlk=
960960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.856/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
961+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 h1:6TxCHz3zSG67cLDDu8w3TkFm/FwiyiAWBhcidGXWH/0=
962+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
961963
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
962964
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
963965
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69SP/wPsmnfozcQVZ6tUY6F6N/TpEe/7xtXrc/8=
@@ -1058,6 +1060,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M
10581060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756/go.mod h1:AJAItBOTaarpDpUF7pNp0tuz2Y6H2oFuMcyKouPs1IE=
10591061
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.804 h1:lYkKswjbdCICDATYfUtT1SrHhSBUcVFxnh0j0tSqhEA=
10601062
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.804/go.mod h1:nE+gtagqpenButXqRAWh1MJBMRFbQchlXK4yCPWbSaQ=
1063+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=
1064+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857/go.mod h1:CSGh7HSEzUoY09G67XTABi/aqNy3dSLCSuenb1i5x6k=
10611065
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674 h1:VsMV1/vsgVzespG7jUzraZS/AbAUllVQjmtVAlA9W/M=
10621066
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674/go.mod h1:6+MWxaNR4y+spZHYNntulOyj628owTLuWmEFebJOWdA=
10631067
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=

‎tencentcloud/provider.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,6 +1838,9 @@ func Provider() *schema.Provider {
18381838
"tencentcloud_tse_cngw_certificate": tse.ResourceTencentCloudTseCngwCertificate(),
18391839
"tencentcloud_tse_waf_protection": tse.ResourceTencentCloudTseWafProtection(),
18401840
"tencentcloud_tse_waf_domains": tse.ResourceTencentCloudTseWafDomains(),
1841+
"tencentcloud_tse_cngw_network": tse.ResourceTencentCloudTseCngwNetwork(),
1842+
"tencentcloud_tse_cngw_strategy": tse.ResourceTencentCloudTseCngwStrategy(),
1843+
"tencentcloud_tse_cngw_strategy_bind_group": tse.ResourceTencentCloudTseCngwStrategyBindGroup(),
18411844
"tencentcloud_clickhouse_instance": cdwch.ResourceTencentCloudClickhouseInstance(),
18421845
"tencentcloud_cls_kafka_recharge": cls.ResourceTencentCloudClsKafkaRecharge(),
18431846
"tencentcloud_cls_scheduled_sql": cls.ResourceTencentCloudClsScheduledSql(),

‎tencentcloud/provider.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,6 +1917,9 @@ Tencent Cloud Service Engine(TSE)
19171917
tencentcloud_tse_cngw_certificate
19181918
tencentcloud_tse_waf_protection
19191919
tencentcloud_tse_waf_domains
1920+
tencentcloud_tse_cngw_network
1921+
tencentcloud_tse_cngw_strategy
1922+
tencentcloud_tse_cngw_strategy_bind_group
19201923

19211924
ClickHouse(CDWCH)
19221925
Data Source

‎tencentcloud/services/tse/resource_tc_tse_cngw_gateway_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestAccTencentCloudTseCngwGatewayResource_basic(t *testing.T) {
3232
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "description", "terraform test"),
3333
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "enable_cls", "false"),
3434
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "engine_region", "ap-guangzhou"),
35-
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "feature_version", "STANDARD"),
35+
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "feature_version", "PROFESSIONAL"),
3636
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "gateway_version", "2.5.1"),
3737
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "ingress_class_name", "tse-nginx-ingress"),
3838
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "internet_max_bandwidth_out", "0"),
@@ -60,7 +60,7 @@ func TestAccTencentCloudTseCngwGatewayResource_basic(t *testing.T) {
6060
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "description", "terraform test update"),
6161
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "enable_cls", "true"),
6262
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "engine_region", "ap-guangzhou"),
63-
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "feature_version", "STANDARD"),
63+
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "feature_version", "PROFESSIONAL"),
6464
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "gateway_version", "2.5.1"),
6565
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "ingress_class_name", "tse-nginx-ingress"),
6666
resource.TestCheckResourceAttr("tencentcloud_tse_cngw_gateway.cngw_gateway", "internet_max_bandwidth_out", "0"),
@@ -153,7 +153,7 @@ resource "tencentcloud_tse_cngw_gateway" "cngw_gateway" {
153153
description = "terraform test"
154154
enable_cls = false
155155
engine_region = "ap-guangzhou"
156-
feature_version = "STANDARD"
156+
feature_version = "PROFESSIONAL"
157157
gateway_version = "2.5.1"
158158
ingress_class_name = "tse-nginx-ingress"
159159
internet_max_bandwidth_out = 0
@@ -183,7 +183,7 @@ resource "tencentcloud_tse_cngw_gateway" "cngw_gateway" {
183183
description = "terraform test update"
184184
enable_cls = true
185185
engine_region = "ap-guangzhou"
186-
feature_version = "STANDARD"
186+
feature_version = "PROFESSIONAL"
187187
gateway_version = "2.5.1"
188188
ingress_class_name = "tse-nginx-ingress"
189189
internet_max_bandwidth_out = 0

‎tencentcloud/services/tse/resource_tc_tse_cngw_group.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,12 @@ func ResourceTencentCloudTseCngwGroup() *schema.Resource {
126126
},
127127
},
128128
},
129+
130+
"group_id": {
131+
Computed: true,
132+
Type: schema.TypeString,
133+
Description: "gateway group id.",
134+
},
129135
},
130136
}
131137
}
@@ -262,6 +268,8 @@ func resourceTencentCloudTseCngwGroupRead(d *schema.ResourceData, meta interface
262268
_ = d.Set("gateway_id", cngwGroup.GatewayId)
263269
}
264270

271+
_ = d.Set("group_id", groupId)
272+
265273
if cngwGroup.Name != nil {
266274
_ = d.Set("name", cngwGroup.Name)
267275
}

0 commit comments

Comments
 (0)