Skip to content

Commit 8a08566

Browse files
lyu571lyu571
committed
add describe tags api
1 parent 35962d0 commit 8a08566

File tree

6 files changed

+38
-23
lines changed

6 files changed

+38
-23
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.984
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1024
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1014
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -91,7 +91,7 @@ require (
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1024
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

‎go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018 h1:PjT
935935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
936936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1024 h1:Xexz/KT0061zBvfzlk4AH8ObaPOmV0cqvXw0uItPtoI=
937937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1024/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
938+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1025 h1:VBCr8GCiZioqKepLH78Al6PQLhLno9ExtF2U32m/hHY=
939+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1025/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027 h1:4/chUqYM26idp2Rd3pPmsL94RTAwIM5dGXoaskOQ+cM=
941+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
938942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
939943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
940944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1041,6 +1045,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008 h1:Cz7JSu
10411045
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008/go.mod h1:71PkDdVPT2Pd8yiuX6QFUDReTji39R/03dg1JwcjHWo=
10421046
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1024 h1:7g3dTZb+QbiZR2mFv6i5cE2pMMx1+Q4FMOZSxE4lUu4=
10431047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1024/go.mod h1:2xDvw52Z3FwGuFadvpIGd42J9myl/RKqROAlelctOVA=
1048+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1025 h1:KQTBLtkU6VEKMJfPcyh4WiLybxxvq0BBYRi7q5/aD3A=
1049+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1025/go.mod h1:WBsBVG3Qb9bupdElk/d/S7xLadGwyBvKF2VikkezhjE=
1050+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027 h1:CCbjHzYueJMa6O3aH2zn/Uppp+u7YJSd7oTrtypxGhM=
1051+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027/go.mod h1:U0WwaLeMZf4Qx1SGG6TlFBhwlV03BMF5F176G14W9Qc=
10441052
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
10451053
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947/go.mod h1:eAgJ+XUEhffMq79zjpgHoR3PBVcciSg+LuPDC8hLWsE=
10461054
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,21 +1187,22 @@ func resourceTencentCloudKubernetesClusterUpdateOnStart(ctx context.Context) err
11871187
}
11881188

11891189
// 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-
// }
1190+
err := resource.Retry(5*tccommon.ReadRetryTimeout, func() *resource.RetryError {
1191+
request := tke.NewDescribeBatchModifyTagsStatusRequest()
1192+
request.ClusterId = &id
1193+
resp, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DescribeBatchModifyTagsStatus(request)
1194+
if errRet != nil {
1195+
return tccommon.RetryError(errRet, tccommon.InternalError)
1196+
}
1197+
// TaskFailed = "failed"; TaskRunning = "running"; TaskDone = "done"
1198+
if resp != nil && *resp.Response.Status == "done" {
1199+
return nil
1200+
}
1201+
return resource.RetryableError(fmt.Errorf("modify tags status is %s, retry...", *resp.Response.Status))
1202+
})
1203+
if err != nil {
1204+
return err
1205+
}
12051206

12061207
}
12071208

‎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/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go

Lines changed: 9 additions & 3 deletions
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
@@ -1163,7 +1163,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11631163
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
11641164
## explicit; go 1.14
11651165
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
1166-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1024
1166+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027
11671167
## explicit; go 1.11
11681168
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11691169
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
@@ -1321,7 +1321,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901
13211321
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998
13221322
## explicit; go 1.14
13231323
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc/v20230321
1324-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1024
1324+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027
13251325
## explicit; go 1.14
13261326
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525
13271327
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501

0 commit comments

Comments
 (0)