Skip to content

Commit 721ef1c

Browse files
SevenEarthSevenEarth
committed
Merge branch 'master' of github.com:tencentcloudstack/terraform-provider-tencentcloud into feat/iacExtInfo2
2 parents 2a4b067 + 4e611bc commit 721ef1c

36 files changed

+4915
-102
lines changed

‎.changelog/2526.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
```release-note:new-resource
2+
tencentcloud_tse_cngw_network
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_tse_cngw_strategy
7+
```
8+
9+
```release-note:new-resource
10+
tencentcloud_tse_cngw_strategy_bind_group
11+
```
12+
13+
```release-note:enhancement
14+
resource/tencentcloud_tse_cngw_group: Add `group_id` field to output.
15+
```

‎.changelog/2560.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datasource/tencentcloud_kubernetes_cluster_instances: optimize cluster instance queries
3+
```

‎.github/02_Tcloud_wechat.jpg

240 KB
Loading

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 1.81.81 (March 13, 2024)
2+
3+
FEATURES:
4+
5+
* **New Resource:** `tencentcloud_tse_cngw_network` ([#2526](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2526))
6+
* **New Resource:** `tencentcloud_tse_cngw_strategy` ([#2526](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2526))
7+
* **New Resource:** `tencentcloud_tse_cngw_strategy_bind_group` ([#2526](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2526))
8+
9+
ENHANCEMENTS:
10+
11+
* datasource/tencentcloud_kubernetes_cluster_instances: optimize cluster instance queries ([#2560](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2560))
12+
* resource/tencentcloud_tse_cngw_group: Add `group_id` field to output. ([#2526](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2526))
13+
114
## 1.81.80 (March 11, 2024)
215

316
BUG FIXES:

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
* [![Documentation](https://img.shields.io/badge/documentation-blue)](https://registry.terraform.io/providers/tencentcloudstack/tencentcloud/latest/docs)
2727
* [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)
2828
* Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
29+
* Wechat Group:
2930

31+
<img src=".github/02_Tcloud_wechat.jpg" width="200"/>
3032

3133
## Requirements
3234

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.860
9999
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.845

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M
10231023
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756/go.mod h1:AJAItBOTaarpDpUF7pNp0tuz2Y6H2oFuMcyKouPs1IE=
10241024
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.804 h1:lYkKswjbdCICDATYfUtT1SrHhSBUcVFxnh0j0tSqhEA=
10251025
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.804/go.mod h1:nE+gtagqpenButXqRAWh1MJBMRFbQchlXK4yCPWbSaQ=
1026+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=
1027+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857/go.mod h1:CSGh7HSEzUoY09G67XTABi/aqNy3dSLCSuenb1i5x6k=
10261028
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674 h1:VsMV1/vsgVzespG7jUzraZS/AbAUllVQjmtVAlA9W/M=
10271029
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674/go.mod h1:6+MWxaNR4y+spZHYNntulOyj628owTLuWmEFebJOWdA=
10281030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860 h1:vW2NgAHK4BfpZP3m92eUEKbIP+nu9bL8mnaM0dBHWM8=

‎tencentcloud/provider.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,6 +1841,9 @@ func Provider() *schema.Provider {
18411841
"tencentcloud_tse_cngw_certificate": tse.ResourceTencentCloudTseCngwCertificate(),
18421842
"tencentcloud_tse_waf_protection": tse.ResourceTencentCloudTseWafProtection(),
18431843
"tencentcloud_tse_waf_domains": tse.ResourceTencentCloudTseWafDomains(),
1844+
"tencentcloud_tse_cngw_network": tse.ResourceTencentCloudTseCngwNetwork(),
1845+
"tencentcloud_tse_cngw_strategy": tse.ResourceTencentCloudTseCngwStrategy(),
1846+
"tencentcloud_tse_cngw_strategy_bind_group": tse.ResourceTencentCloudTseCngwStrategyBindGroup(),
18441847
"tencentcloud_clickhouse_instance": cdwch.ResourceTencentCloudClickhouseInstance(),
18451848
"tencentcloud_cls_kafka_recharge": cls.ResourceTencentCloudClsKafkaRecharge(),
18461849
"tencentcloud_cls_scheduled_sql": cls.ResourceTencentCloudClsScheduledSql(),

‎tencentcloud/provider.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,9 @@ Video on Demand(VOD)
11191119
tencentcloud_vod_image_sprite_template
11201120
tencentcloud_vod_super_player_config
11211121
tencentcloud_vod_sub_application
1122+
tencentcloud_vod_sample_snapshot_template
1123+
tencentcloud_vod_transcode_template
1124+
tencentcloud_vod_watermark_template
11221125

11231126
Oceanus
11241127
Data Source
@@ -1921,6 +1924,9 @@ Tencent Cloud Service Engine(TSE)
19211924
tencentcloud_tse_cngw_certificate
19221925
tencentcloud_tse_waf_protection
19231926
tencentcloud_tse_waf_domains
1927+
tencentcloud_tse_cngw_network
1928+
tencentcloud_tse_cngw_strategy
1929+
tencentcloud_tse_cngw_strategy_bind_group
19241930

19251931
ClickHouse(CDWCH)
19261932
Data Source

‎tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccTencentCloudKubernetesClusterInstancesDataSource_basic(t *testing.T)
2121
Check: resource.ComposeTestCheckFunc(
2222
tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_kubernetes_cluster_instances.cluster_instances"),
2323
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.#", "1"),
24-
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_id", "ins-kqmx8dm2"),
24+
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_id", "ins-1fb82v28"),
2525
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_role", "WORKER"),
2626
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_state", "running"),
2727
),
@@ -30,7 +30,7 @@ func TestAccTencentCloudKubernetesClusterInstancesDataSource_basic(t *testing.T)
3030
Config: testAccKubernetesClusterInstancesDataSourceFilter,
3131
Check: resource.ComposeTestCheckFunc(
3232
tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_kubernetes_cluster_instances.cluster_instances"),
33-
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.#", "0"),
33+
resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.#", "1"),
3434
),
3535
},
3636
},
@@ -39,20 +39,20 @@ func TestAccTencentCloudKubernetesClusterInstancesDataSource_basic(t *testing.T)
3939

4040
const testAccKubernetesClusterInstancesDataSource = `
4141
data "tencentcloud_kubernetes_cluster_instances" "cluster_instances" {
42-
cluster_id = "cls-ely08ic4"
43-
instance_ids = ["ins-kqmx8dm2"]
42+
cluster_id = "cls-6l3thsra"
43+
instance_ids = ["ins-1fb82v28"]
4444
instance_role = "WORKER"
4545
}
4646
`
4747

4848
const testAccKubernetesClusterInstancesDataSourceFilter = `
4949
data "tencentcloud_kubernetes_cluster_instances" "cluster_instances" {
50-
cluster_id = "cls-ely08ic4"
51-
instance_ids = ["ins-kqmx8dm2"]
50+
cluster_id = "cls-6l3thsra"
51+
instance_ids = ["ins-qzkwjklk"]
5252
instance_role = "WORKER"
5353
filters {
5454
name = "nodepool-id"
55-
values = ["np-p4e6whqu"]
55+
values = ["np-qrez0ayk"]
5656
}
5757
}
5858
`

‎tencentcloud/services/tke/service_tencentcloud_tke.go

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2718,20 +2718,38 @@ func (me *TkeService) DescribeKubernetesClusterInstancesByFilter(ctx context.Con
27182718
}
27192719
}
27202720

2721-
ratelimit.Check(request.GetAction())
2721+
var offset int64 = 0
2722+
var limit int64 = 20
2723+
var total int64 = -1
27222724

2723-
response, err := me.client.UseTkeClient().DescribeClusterInstances(request)
2724-
if err != nil {
2725-
errRet = err
2726-
return
2727-
}
2728-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
2725+
for {
2726+
if total >= 0 && offset >= total {
2727+
break
2728+
}
2729+
request.Offset = &offset
2730+
request.Limit = &limit
2731+
ratelimit.Check(request.GetAction())
27292732

2730-
if len(response.Response.InstanceSet) < 1 {
2731-
return
2732-
}
2733+
response, err := me.client.UseTkeClient().DescribeClusterInstances(request)
2734+
if err != nil {
2735+
errRet = err
2736+
return
2737+
}
2738+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
2739+
2740+
if total < 0 {
2741+
total = int64(*response.Response.TotalCount)
2742+
}
27332743

2734-
clusterInstances = response.Response.InstanceSet
2744+
if len(response.Response.InstanceSet) == 0 {
2745+
// get empty set, we're done
2746+
break
2747+
}
2748+
2749+
offset += limit
2750+
2751+
clusterInstances = append(clusterInstances, response.Response.InstanceSet...)
2752+
}
27352753
return
27362754
}
27372755

‎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)