Skip to content

Commit 0787ef9

Browse files
SevenEarthSevenEarth
committed
add
1 parent 4b01d55 commit 0787ef9

File tree

8 files changed

+396
-54
lines changed

8 files changed

+396
-54
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ require (
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
4444
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695
4545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.748
46-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.960
46+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.952
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.960
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.961
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

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.860 h1:P2TPFCB
858858
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.860/go.mod h1:eTGN2Qz4NxaYl+CwMpcj4vNImNOr74NC8WTCLSJN8Ks=
859859
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.960 h1:wiX0lViAGID1CRQBnoK8TqkgsA/qPm37AwPyy1TgVVo=
860860
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.960/go.mod h1:ge3NiZB+9eEL6gcnlX2CnyYq3Qvx1AW29aP8d9RiDxE=
861+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961 h1:H8oPv420A7TtLsrKQv1VYaHHboI6YmYT/kNbgZXfO1Y=
862+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961/go.mod h1:iEXw9vSSrx7vJ2v+ird8vpjRPmF7kqTa2/VypAs8n64=
861863
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544 h1:ApY6rS7I9otgujOdAFy0+Epno1PNVCQmsOoWQxx724Y=
862864
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544/go.mod h1:c37rIdL3LrJXYwrfp9c8L4MabTqKIZUe1xvnWhN75oc=
863865
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860 h1:IU20AhNd0fEbgFzTTGB8cdMkUCrgB0FsLd0puC4QDzU=
@@ -948,6 +950,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.958 h1:WoN2
948950
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.958/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
949951
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.960 h1:hde8uWA3624nGUvC8QPf9njcyBZ7A9weqscRrqyM1Rk=
950952
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.960/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
953+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.961 h1:UqinjIsO+Y48BQYSxrD6aHQe8SD+Wsbvj+jU9V9VvWM=
954+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.961/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
951955
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
952956
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
953957
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=

‎tencentcloud/services/clb/data_source_tc_clb_instances.go

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ func DataSourceTencentCloudClbInstances() *schema.Resource {
7575
Computed: true,
7676
Description: "ID of the project.",
7777
},
78+
"cluster_id": {
79+
Type: schema.TypeString,
80+
Computed: true,
81+
Description: "ID of the cluster.",
82+
},
7883
"clb_vips": {
7984
Type: schema.TypeList,
8085
Computed: true,
@@ -182,42 +187,49 @@ func DataSourceTencentCloudClbInstances() *schema.Resource {
182187
func dataSourceTencentCloudClbInstancesRead(d *schema.ResourceData, meta interface{}) error {
183188
defer tccommon.LogElapsed("data_source.tencentcloud_clb_instances.read")()
184189

185-
logId := tccommon.GetLogId(tccommon.ContextNil)
186-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
190+
var (
191+
logId = tccommon.GetLogId(tccommon.ContextNil)
192+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
193+
clbService = ClbService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
194+
clbs []*clb.LoadBalancer
195+
)
187196

188197
params := make(map[string]interface{})
189198
if v, ok := d.GetOk("clb_id"); ok {
190199
params["clb_id"] = v.(string)
191200
}
201+
192202
if v, ok := d.GetOk("clb_name"); ok {
193203
params["clb_name"] = v.(string)
194204
}
205+
195206
if v, ok := d.GetOkExists("project_id"); ok {
196207
params["project_id"] = v.(int)
197208
}
209+
198210
if v, ok := d.GetOk("network_type"); ok {
199211
params["network_type"] = v.(string)
200212
}
213+
201214
if v, ok := d.GetOk("master_zone"); ok {
202215
params["master_zone"] = v.(string)
203216
}
204217

205-
clbService := ClbService{
206-
client: meta.(tccommon.ProviderMeta).GetAPIV3Conn(),
207-
}
208-
var clbs []*clb.LoadBalancer
209218
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
210219
results, e := clbService.DescribeLoadBalancerByFilter(ctx, params)
211220
if e != nil {
212221
return tccommon.RetryError(e)
213222
}
223+
214224
clbs = results
215225
return nil
216226
})
227+
217228
if err != nil {
218229
log.Printf("[CRITAL]%s read CLB instances failed, reason:%+v", logId, err)
219230
return err
220231
}
232+
221233
clbList := make([]map[string]interface{}, 0, len(clbs))
222234
ids := make([]string, 0, len(clbs))
223235
for _, clbInstance := range clbs {
@@ -238,10 +250,16 @@ func dataSourceTencentCloudClbInstancesRead(d *schema.ResourceData, meta interfa
238250
"vip_isp": clbInstance.VipIsp,
239251
"security_groups": helper.StringsInterfaces(clbInstance.SecureGroups),
240252
}
253+
254+
if clbInstance.ClusterIds != nil && len(clbInstance.ClusterIds) > 0 {
255+
mapping["cluster_id"] = *clbInstance.ClusterIds[0]
256+
}
257+
241258
if clbInstance.NetworkAttributes != nil {
242259
mapping["internet_charge_type"] = *clbInstance.NetworkAttributes.InternetChargeType
243260
mapping["internet_bandwidth_max_out"] = *clbInstance.NetworkAttributes.InternetMaxBandwidthOut
244261
}
262+
245263
if clbInstance.MasterZone != nil {
246264
mapping["zone_id"] = *clbInstance.MasterZone.ZoneId
247265
mapping["zone"] = *clbInstance.MasterZone.Zone
@@ -255,8 +273,10 @@ func dataSourceTencentCloudClbInstancesRead(d *schema.ResourceData, meta interfa
255273
for _, t := range clbInstance.Tags {
256274
tags[*t.TagKey] = *t.TagValue
257275
}
276+
258277
mapping["tags"] = tags
259278
}
279+
260280
clbList = append(clbList, mapping)
261281
ids = append(ids, *clbInstance.LoadBalancerId)
262282
}

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/client.go

Lines changed: 26 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam/v20220331
11481148
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.748
11491149
## explicit; go 1.14
11501150
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka/v20190819
1151-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.960
1151+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961
11521152
## explicit; go 1.14
11531153
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317
11541154
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
@@ -1157,7 +1157,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11571157
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.952
11581158
## explicit; go 1.14
11591159
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
1160-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.960
1160+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.961
11611161
## explicit; go 1.11
11621162
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11631163
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors

‎website/docs/d/clb_instances.html.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ In addition to all arguments above, the following attributes are exported:
4343
* `clb_id` - ID of CLB.
4444
* `clb_name` - Name of CLB.
4545
* `clb_vips` - The virtual service address table of the CLB.
46+
* `cluster_id` - ID of the cluster.
4647
* `create_time` - Create time of the CLB.
4748
* `internet_bandwidth_max_out` - Max bandwidth out, only applicable to open CLB. Valid value ranges is [1, 2048]. Unit is MB.
4849
* `internet_charge_type` - Internet charge type, only applicable to open CLB. Valid values are `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.

0 commit comments

Comments
 (0)