@@ -469,7 +469,6 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
469469 log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
470470 logId , sgRequest .GetAction (), sgRequest .ToJsonString (), sgResponse .ToJsonString ())
471471 requestId := * sgResponse .Response .RequestId
472-
473472 retryErr := waitForTaskFinish (requestId , meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseClbClient ())
474473 if retryErr != nil {
475474 return tccommon .RetryError (errors .WithStack (retryErr ))
@@ -499,7 +498,6 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
499498 log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
500499 logId , logRequest .GetAction (), logRequest .ToJsonString (), logResponse .ToJsonString ())
501500 requestId := * logResponse .Response .RequestId
502-
503501 retryErr := waitForTaskFinish (requestId , meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseClbClient ())
504502 if retryErr != nil {
505503 return tccommon .RetryError (errors .WithStack (retryErr ))
@@ -525,6 +523,7 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
525523 Region : & targetRegionInfoRegion ,
526524 VpcId : & targetRegionInfoVpcId ,
527525 }
526+
528527 mRequest := clb .NewModifyLoadBalancerAttributesRequest ()
529528 mRequest .LoadBalancerId = helper .String (clbId )
530529 mRequest .TargetRegionInfo = & targetRegionInfo
@@ -630,6 +629,10 @@ func resourceTencentCloudClbInstanceRead(d *schema.ResourceData, meta interface{
630629 _ = d .Set ("ipv6_mode" , instance .IPv6Mode )
631630 _ = d .Set ("address_ipv6" , instance .AddressIPv6 )
632631
632+ if instance .ClusterIds != nil && len (instance .ClusterIds ) > 0 {
633+ _ = d .Set ("cluster_id" , instance .ClusterIds [0 ])
634+ }
635+
633636 if instance .SlaType != nil {
634637 _ = d .Set ("sla_type" , instance .SlaType )
635638 }
@@ -696,7 +699,6 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
696699 )
697700
698701 immutableArgs := []string {"snat_ips" , "dynamic_vip" , "master_zone_id" , "slave_zone_id" , "vpc_id" , "subnet_id" , "address_ip_version" , "bandwidth_package_id" , "zone_id" }
699-
700702 for _ , v := range immutableArgs {
701703 if d .HasChange (v ) {
702704 return fmt .Errorf ("argument `%s` cannot be changed" , v )
@@ -811,7 +813,6 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
811813 param .LoadBalancerId = & clbId
812814 param .SlaType = helper .String (d .Get ("sla_type" ).(string ))
813815 slaRequest .LoadBalancerSla = []* clb.SlaUpdateParam {& param }
814-
815816 var taskId string
816817 err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
817818 result , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseClbClient ().ModifyLoadBalancerSla (slaRequest )
@@ -867,7 +868,6 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
867868 log .Printf ("[CRITAL]%s update CLB instance security_group failed, reason:%+v" , logId , err )
868869 return err
869870 }
870-
871871 }
872872
873873 if d .HasChange ("log_set_id" ) || d .HasChange ("log_topic_id" ) {
@@ -885,7 +885,6 @@ func resourceTencentCloudClbInstanceUpdate(d *schema.ResourceData, meta interfac
885885 log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
886886 logId , logRequest .GetAction (), logRequest .ToJsonString (), logResponse .ToJsonString ())
887887 requestId := * logResponse .Response .RequestId
888-
889888 retryErr := waitForTaskFinish (requestId , meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseClbClient ())
890889 if retryErr != nil {
891890 return tccommon .RetryError (errors .WithStack (retryErr ))
@@ -986,6 +985,7 @@ func checkSameName(name string, meta interface{}) (flag bool, errRet error) {
986985 clbService = ClbService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
987986 )
988987
988+ flag = false
989989 params := make (map [string ]interface {})
990990 params ["clb_name" ] = name
991991 err := resource .Retry (tccommon .ReadRetryTimeout , func () * resource.RetryError {
0 commit comments