@@ -13,13 +13,13 @@ import (
1313
1414 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
1515 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
16+ tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http"
1617 cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
1718
1819 tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1920 "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
2021 svcas "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/as"
2122 svccvm "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cvm"
22- svctag "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tag"
2323
2424 "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
2525 "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -1172,10 +1172,7 @@ func resourceTencentCloudKubernetesClusterUpdateOnStart(ctx context.Context) err
11721172 d := tccommon .ResourceDataFromContext (ctx )
11731173 meta := tccommon .ProviderMetaFromContext (ctx )
11741174
1175- client := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()
1176- service := svctag .NewTagService (client )
11771175 tkeService := TkeService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
1178- region := client .Region
11791176
11801177 d .Partial (true )
11811178 id := d .Id ()
@@ -1185,14 +1182,27 @@ func resourceTencentCloudKubernetesClusterUpdateOnStart(ctx context.Context) err
11851182 }
11861183
11871184 if d .HasChange ("tags" ) {
1188- oldTags , newTags := d .GetChange ("tags" )
1189- replaceTags , deleteTags := svctag .DiffTags (oldTags .(map [string ]interface {}), newTags .(map [string ]interface {}))
1190-
1191- resourceName := tccommon .BuildTagResourceName ("ccs" , "cluster" , region , id )
1192- if err := service .ModifyTags (ctx , resourceName , replaceTags , deleteTags ); err != nil {
1185+ if err := modifyClusterTags (ctx ); err != nil {
11931186 return err
11941187 }
11951188
1189+ // wait for tags ok
1190+ // err := resource.Retry(5*tccommon.ReadRetryTimeout, func() *resource.RetryError {
1191+ // request := tke.NewDescribeBatchModifyTagsStatusRequest()
1192+ // resp, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DescribeBatchModifyTagsStatus(request)
1193+ // if errRet != nil {
1194+ // return tccommon.RetryError(errRet, tccommon.InternalError)
1195+ // }
1196+ // // TaskFailed = "failed"; TaskRunning = "running"; TaskDone = "done"
1197+ // if resp != nil && *resp.Response.Status == "done" {
1198+ // return nil
1199+ // }
1200+ // return resource.RetryableError(fmt.Errorf("modify tags status is %s, retry...", *resp.Response.Status))
1201+ // })
1202+ // if err != nil {
1203+ // return err
1204+ // }
1205+
11961206 }
11971207
11981208 var (
@@ -1640,6 +1650,39 @@ func ResourceTkeGetAddonsDiffs(o, n []interface{}) (adds, removes, changes []int
16401650 return
16411651}
16421652
1653+ func modifyClusterTags (ctx context.Context ) error {
1654+ d := tccommon .ResourceDataFromContext (ctx )
1655+ meta := tccommon .ProviderMetaFromContext (ctx )
1656+ logId := tccommon .GetLogId (ctx )
1657+
1658+ id := d .Id ()
1659+ tags := GetTkeTags (d , "tags" )
1660+ body := map [string ]interface {}{
1661+ "ClusterId" : id ,
1662+ "SyncSubresource" : false ,
1663+ "Tags" : tags ,
1664+ }
1665+
1666+ client := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseOmitNilClient ("tke" )
1667+ request := tchttp .NewCommonRequest ("tke" , "2018-05-25" , "ModifyClusterTags" )
1668+ err := request .SetActionParameters (body )
1669+ if err != nil {
1670+ return err
1671+ }
1672+
1673+ response := tchttp .NewCommonResponse ()
1674+ err = client .Send (request , response )
1675+ if err != nil {
1676+ fmt .Printf ("Modify Cluster Tags failed: %v \n " , err )
1677+ return err
1678+ }
1679+ reqBody , _ := request .MarshalJSON ()
1680+ respBody := response .GetBody ()
1681+
1682+ log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " , logId , request .GetAction (), string (reqBody ), string (respBody ))
1683+ return nil
1684+ }
1685+
16431686// upgradeClusterInstances upgrade instances, upgrade type try seq:major, hot.
16441687func upgradeClusterInstances (tkeService TkeService , ctx context.Context , id string ) error {
16451688 // get all available instances for upgrade
0 commit comments