Skip to content

Commit 8be14a3

Browse files
SevenEarthSevenEarth
committed
add
1 parent 365d6e6 commit 8be14a3

File tree

14 files changed

+5839
-1
lines changed

14 files changed

+5839
-1
lines changed

‎go.mod

Lines changed: 3 additions & 1 deletion
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.995
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -108,11 +108,13 @@ require (
108108
require (
109109
github.com/hashicorp/go-uuid v1.0.3
110110
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.970
111+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwdoris v1.0.993
111112
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwpg v1.0.772
112113
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860
113114
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970
114115
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831
115116
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920
117+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996
116118
github.com/wI2L/jsondiff v0.3.0
117119
k8s.io/apimachinery v0.22.4
118120
)

‎go.sum

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,10 +931,15 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.991 h1:0Xg2
931931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.991/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993 h1:+iJMmF0q1MPyhLs0+J7CcJ47w/vq6ICsCxnV4gc0dKw=
933933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
934+
<<<<<<< HEAD
934935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
935936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
936937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995 h1:I1l5kl6rdQYDLEk8DqWjZgwMh0+nYnqbwq7KS4bqi/s=
937938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939+
=======
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996 h1:m++6lrqL4NglwGwmgKD7VbvhxYVhmQRS9BWdFnzwVwY=
941+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
942+
>>>>>>> 7f715aaa2 (add)
938943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
939944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
940945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960 h1:Tpz3KVUfaJ7b98wQDYZSbmoKIn0hlH0oHPOzWMzE5Q8=
@@ -1037,6 +1042,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
10371042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
10381043
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5umgbXDDTSOuLmoLDfNdh712lCIgIzw5SQItrA=
10391044
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
1045+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996 h1:RtpskwAhYlNZ6I8KhzAkC1KkrOYK85xlbKcDPNyOq8s=
1046+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996/go.mod h1:NNaPLakkKjufzvcMcln18WPYVfbbIBI4NRenQy7VLr4=
10401047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921 h1:jCrZDMDNNI5TFZEEk5AXMcNThDzxAHMKrQFspoqEdCA=
10411048
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921/go.mod h1:waWKRKzVqvpXYIMuJvrXBEX9igTo5VntpP/Soi6O5Hc=
10421049
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=

‎tencentcloud/connectivity/client.go

Lines changed: 22 additions & 0 deletions
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"
@@ -203,10 +204,17 @@ type TencentCloudClient struct {
203204
regionConn *region.Client
204205
//internal version: replace client begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
205206
//internal version: replace client end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
207+
<<<<<<< HEAD
206208
tkev20220501Conn *tkev20220501.Client
207209
cdcConn *cdc.Client
208210
cdwdorisConn *cdwdoris.Client
209211
controlcenterConn *controlcenter.Client
212+
=======
213+
tkev20220501Conn *tkev20220501.Client
214+
cdcConn *cdc.Client
215+
cdwdorisConn *cdwdoris.Client
216+
thpcConn *thpc.Client
217+
>>>>>>> 7f715aaa2 (add)
210218
//omit nil client
211219
omitNilConn *common.Client
212220
}
@@ -1701,6 +1709,7 @@ func (me *TencentCloudClient) UseCdwdorisV20211228Client() *cdwdoris.Client {
17011709
return me.cdwdorisConn
17021710
}
17031711

1712+
<<<<<<< HEAD
17041713
// UseControlcenter return CONTROLCENTER client for service
17051714
func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.Client {
17061715
if me.controlcenterConn != nil {
@@ -1712,4 +1721,17 @@ func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.C
17121721
me.controlcenterConn.WithHttpTransport(&LogRoundTripper{})
17131722

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

‎tencentcloud/provider.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package tencentcloud
33
import (
44
"encoding/json"
55
"fmt"
6+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/thpc"
67

78
"io/ioutil"
89
"net/url"
@@ -2124,7 +2125,11 @@ func Provider() *schema.Provider {
21242125
"tencentcloud_cdwdoris_instance": cdwdoris.ResourceTencentCloudCdwdorisInstance(),
21252126
"tencentcloud_cdwdoris_workload_group": cdwdoris.ResourceTencentCloudCdwdorisWorkloadGroup(),
21262127
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
2128+
<<<<<<< HEAD
21272129
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
2130+
=======
2131+
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
2132+
>>>>>>> 7f715aaa2 (add)
21282133
},
21292134

21302135
ConfigureFunc: providerConfigure,

0 commit comments

Comments
 (0)