@@ -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 {
182187func 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 }
0 commit comments