Skip to content

Commit bf0d7e0

Browse files
andrew-txandrew-tx
authored
Merge branch 'master' into dev/tke-health-check
2 parents dd63893 + d76d437 commit bf0d7e0

34 files changed

+7329
-75
lines changed

‎.changelog/2813.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_thpc_workspaces
3+
```

‎.changelog/2816.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_gaap_layer4_listener: support udp listener enable `health_check`
3+
```

‎.changelog/2817.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_vpc: Fix the issue where field assistant_cidrs cannot be edited
3+
```

‎.changelog/2823.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_ccn_route_table_associate_instance_config: Support assume role
3+
```

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 1.81.121 (September 11 , 2024)
2+
3+
FEATURES:
4+
5+
* **New Resource:** `tencentcloud_as_start_instance_refresh` ([#2814](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2814))
6+
* **New Resource:** `tencentcloud_thpc_workspaces` ([#2813](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2813))
7+
8+
ENHANCEMENTS:
9+
10+
* resource/tencentcloud_gaap_layer4_listener: support udp listener enable `health_check` ([#2816](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2816))
11+
* resource/tencentcloud_vpc: Fix the issue where field assistant_cidrs cannot be edited ([#2817](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2817))
12+
113
## 1.81.120 (September 6 , 2024)
214

315
FEATURES:

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ require (
115115
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970
116116
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831
117117
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920
118+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998
118119
github.com/wI2L/jsondiff v0.3.0
119120
k8s.io/apimachinery v0.22.4
120121
)

‎go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,16 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001 h1:uX1
932932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
933933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
934934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
935+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
936+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
937+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995 h1:I1l5kl6rdQYDLEk8DqWjZgwMh0+nYnqbwq7KS4bqi/s=
938+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996 h1:m++6lrqL4NglwGwmgKD7VbvhxYVhmQRS9BWdFnzwVwY=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
941+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998 h1:FVOc3KPlI9JAFz7A7s19xGoF+t54vzNByRzenTyAKpA=
942+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
943+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
944+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
935945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
936946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
937947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960 h1:Tpz3KVUfaJ7b98wQDYZSbmoKIn0hlH0oHPOzWMzE5Q8=
@@ -1028,6 +1038,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
10281038
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
10291039
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5umgbXDDTSOuLmoLDfNdh712lCIgIzw5SQItrA=
10301040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
1041+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996 h1:RtpskwAhYlNZ6I8KhzAkC1KkrOYK85xlbKcDPNyOq8s=
1042+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996/go.mod h1:NNaPLakkKjufzvcMcln18WPYVfbbIBI4NRenQy7VLr4=
1043+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
1044+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10311045
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001 h1:qj+pw5MJFuOvA+a+yAA2JR8B4TmfX5H5D8jy3L0YKH0=
10321046
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001/go.mod h1:FVJUGrfLPiJWiKrH+62h38Iyo9mA2O1wuaPLMlbeDBI=
10331047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=

‎tencentcloud/common/common.go

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"os/user"
1414
"path/filepath"
1515
"reflect"
16+
"sort"
1617
"strconv"
1718
"strings"
1819
"sync/atomic"
@@ -656,3 +657,62 @@ func GetAuthFromCAM(roleName string) (camResp *CAMResponse, err error) {
656657

657658
return
658659
}
660+
661+
func GetArrayIntersect(sliceA, sliceB []string) []string {
662+
intersection := make([]string, 0)
663+
temp := make(map[string]bool)
664+
665+
for _, a := range sliceA {
666+
temp[a] = true
667+
}
668+
669+
for _, b := range sliceB {
670+
if _, ok := temp[b]; ok {
671+
intersection = append(intersection, b)
672+
delete(temp, b)
673+
}
674+
}
675+
676+
return intersection
677+
}
678+
679+
func RemoveArrayIntersect(sliceA, elementsToRemove []string) []string {
680+
result := make([]string, 0)
681+
temp := make(map[string]bool)
682+
683+
for _, e := range elementsToRemove {
684+
temp[e] = true
685+
}
686+
687+
for _, s := range sliceA {
688+
if _, ok := temp[s]; !ok {
689+
result = append(result, s)
690+
}
691+
}
692+
693+
return result
694+
695+
}
696+
697+
func EqualArrayIgnoreOrder(sliceA, sliceB []string) bool {
698+
if len(sliceA) != len(sliceB) {
699+
return false
700+
}
701+
702+
sortedA := make([]string, len(sliceA))
703+
sortedB := make([]string, len(sliceB))
704+
705+
copy(sortedA, sliceA)
706+
copy(sortedB, sliceB)
707+
708+
sort.Strings(sortedA)
709+
sort.Strings(sortedB)
710+
711+
for i := range sortedA {
712+
if sortedA[i] != sortedB[i] {
713+
return false
714+
}
715+
}
716+
717+
return true
718+
}

‎tencentcloud/connectivity/client.go

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ import (
9090
tdmq "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq/v20200217"
9191
tem "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701"
9292
teo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
93+
thpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc/v20230321"
9394
tkev20180525 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
9495
tkev20220501 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501"
9596
trocket "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket/v20230308"
@@ -207,6 +208,7 @@ type TencentCloudClient struct {
207208
cdcConn *cdc.Client
208209
cdwdorisConn *cdwdoris.Client
209210
controlcenterConn *controlcenter.Client
211+
thpcConn *thpc.Client
210212
//omit nil client
211213
omitNilConn *common.Client
212214
}
@@ -364,8 +366,15 @@ func (me *TencentCloudClient) UseVpcClient(iacExtInfo ...IacExtInfo) *vpc.Client
364366
func (me *TencentCloudClient) UseOmitNilClient(module string) *common.Client {
365367
secretId := me.Credential.SecretId
366368
secretKey := me.Credential.SecretKey
369+
token := me.Credential.Token
367370
region := me.Region
368-
credential := common.NewCredential(secretId, secretKey)
371+
var credential common.CredentialIface
372+
if token != "" {
373+
credential = common.NewTokenCredential(secretId, secretKey, token)
374+
} else {
375+
credential = common.NewCredential(secretId, secretKey)
376+
}
377+
369378
cpf := profile.NewClientProfile()
370379
cpf.HttpProfile.Endpoint = fmt.Sprintf("%s.tencentcloudapi.com", module)
371380
cpf.HttpProfile.ReqMethod = "POST"
@@ -1713,3 +1722,16 @@ func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.C
17131722

17141723
return me.controlcenterConn
17151724
}
1725+
1726+
// UseThpcClient return THPC client for service
1727+
func (me *TencentCloudClient) UseThpcV20230321Client() *thpc.Client {
1728+
if me.thpcConn != nil {
1729+
return me.thpcConn
1730+
}
1731+
cpf := me.NewClientProfile(300)
1732+
cpf.Language = "zh-CN"
1733+
me.thpcConn, _ = thpc.NewClient(me.Credential, me.Region, cpf)
1734+
me.thpcConn.WithHttpTransport(&LogRoundTripper{})
1735+
1736+
return me.thpcConn
1737+
}

‎tencentcloud/provider.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ import (
103103
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tdcpg"
104104
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tem"
105105
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/teo"
106+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/thpc"
106107
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tke"
107108
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tmp"
108109
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tpulsar"
@@ -2127,6 +2128,8 @@ func Provider() *schema.Provider {
21272128
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
21282129
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
21292130
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy()},
2131+
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
2132+
},
21302133

21312134
ConfigureFunc: providerConfigure,
21322135
}

‎tencentcloud/provider.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2184,4 +2184,8 @@ CdwDoris
21842184

21852185
ControlCenter
21862186
Resource
2187-
tencentcloud_batch_apply_account_baselines
2187+
tencentcloud_batch_apply_account_baselines
2188+
2189+
THPC
2190+
Resource
2191+
tencentcloud_thpc_workspaces

0 commit comments

Comments
 (0)