diff --git a/.changelog/2806.txt b/.changelog/2806.txt new file mode 100644 index 0000000000..cb6dfd7765 --- /dev/null +++ b/.changelog/2806.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_clb_attachment: support `SRV` type +``` diff --git a/tencentcloud/services/clb/extension_clb.go b/tencentcloud/services/clb/extension_clb.go index a80b5f2e92..2eedc1f678 100644 --- a/tencentcloud/services/clb/extension_clb.go +++ b/tencentcloud/services/clb/extension_clb.go @@ -136,6 +136,7 @@ const ( CLB_BACKEND_TYPE_ENI = "ENI" CLB_BACKEND_TYPE_NAT = "NAT" CLB_BACKEND_TYPE_CCN = "CCN" + CLB_BACKEND_TYPE_SRV = "SRV" ) const ( diff --git a/tencentcloud/services/clb/resource_tc_clb_attachment.go b/tencentcloud/services/clb/resource_tc_clb_attachment.go index 354256c3ad..35ac0e9755 100644 --- a/tencentcloud/services/clb/resource_tc_clb_attachment.go +++ b/tencentcloud/services/clb/resource_tc_clb_attachment.go @@ -293,7 +293,8 @@ func resourceTencentCloudClbServerAttachmentRead(d *schema.ResourceData, meta in } targets = append(targets, target) - } else if *onlineTarget.Type == CLB_BACKEND_TYPE_ENI || *onlineTarget.Type == CLB_BACKEND_TYPE_NAT || *onlineTarget.Type == CLB_BACKEND_TYPE_CCN { + } else if *onlineTarget.Type == CLB_BACKEND_TYPE_ENI || *onlineTarget.Type == CLB_BACKEND_TYPE_NAT || + *onlineTarget.Type == CLB_BACKEND_TYPE_CCN || *onlineTarget.Type == CLB_BACKEND_TYPE_SRV { target := map[string]interface{}{ "weight": int(*onlineTarget.Weight), "port": int(*onlineTarget.Port), @@ -306,21 +307,6 @@ func resourceTencentCloudClbServerAttachmentRead(d *schema.ResourceData, meta in _ = d.Set("targets", targets) - err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { - result, e := clbService.DescribeTargetsByPara(ctx, clbId, listenerId, locationId) - if e != nil { - return tccommon.RetryError(e) - } - - instance = result - return nil - }) - - if err != nil { - log.Printf("[CRITAL]%s read CLB attachment tag failed, reason:%+v", logId, err) - return err - } - return nil }