Skip to content

Commit ae1a94f

Browse files
SevenEarthSevenEarth
committed
add
1 parent a34f82b commit ae1a94f

18 files changed

+606
-87
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +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.996
118+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998
119119
github.com/wI2L/jsondiff v0.3.0
120120
k8s.io/apimachinery v0.22.4
121121
)

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995 h1:I1l5
945945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
946946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996 h1:m++6lrqL4NglwGwmgKD7VbvhxYVhmQRS9BWdFnzwVwY=
947947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
948+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998 h1:FVOc3KPlI9JAFz7A7s19xGoF+t54vzNByRzenTyAKpA=
949+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
950+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
951+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
948952
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
949953
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
950954
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960 h1:Tpz3KVUfaJ7b98wQDYZSbmoKIn0hlH0oHPOzWMzE5Q8=
@@ -1049,6 +1053,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5u
10491053
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
10501054
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996 h1:RtpskwAhYlNZ6I8KhzAkC1KkrOYK85xlbKcDPNyOq8s=
10511055
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996/go.mod h1:NNaPLakkKjufzvcMcln18WPYVfbbIBI4NRenQy7VLr4=
1056+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
1057+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10521058
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921 h1:jCrZDMDNNI5TFZEEk5AXMcNThDzxAHMKrQFspoqEdCA=
10531059
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921/go.mod h1:waWKRKzVqvpXYIMuJvrXBEX9igTo5VntpP/Soi6O5Hc=
10541060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=

‎tencentcloud/connectivity/client.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,11 @@ type TencentCloudClient struct {
204204
regionConn *region.Client
205205
//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.
206206
//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
208207
tkev20220501Conn *tkev20220501.Client
209208
cdcConn *cdc.Client
210209
cdwdorisConn *cdwdoris.Client
211210
controlcenterConn *controlcenter.Client
212-
=======
213-
tkev20220501Conn *tkev20220501.Client
214-
cdcConn *cdc.Client
215-
cdwdorisConn *cdwdoris.Client
216-
thpcConn *thpc.Client
217-
>>>>>>> 7f715aaa2 (add)
211+
thpcConn *thpc.Client
218212
//omit nil client
219213
omitNilConn *common.Client
220214
}
@@ -1709,7 +1703,6 @@ func (me *TencentCloudClient) UseCdwdorisV20211228Client() *cdwdoris.Client {
17091703
return me.cdwdorisConn
17101704
}
17111705

1712-
<<<<<<< HEAD
17131706
// UseControlcenter return CONTROLCENTER client for service
17141707
func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.Client {
17151708
if me.controlcenterConn != nil {
@@ -1721,7 +1714,8 @@ func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.C
17211714
me.controlcenterConn.WithHttpTransport(&LogRoundTripper{})
17221715

17231716
return me.controlcenterConn
1724-
=======
1717+
}
1718+
17251719
// UseThpcClient return THPC client for service
17261720
func (me *TencentCloudClient) UseThpcV20230321Client() *thpc.Client {
17271721
if me.thpcConn != nil {
@@ -1733,5 +1727,4 @@ func (me *TencentCloudClient) UseThpcV20230321Client() *thpc.Client {
17331727
me.thpcConn.WithHttpTransport(&LogRoundTripper{})
17341728

17351729
return me.thpcConn
1736-
>>>>>>> 7f715aaa2 (add)
17371730
}

‎tencentcloud/provider.go

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

87
"io/ioutil"
98
"net/url"
@@ -104,6 +103,7 @@ import (
104103
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tdcpg"
105104
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tem"
106105
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/teo"
106+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/thpc"
107107
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tke"
108108
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tmp"
109109
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tpulsar"
@@ -2126,11 +2126,8 @@ func Provider() *schema.Provider {
21262126
"tencentcloud_cdwdoris_instance": cdwdoris.ResourceTencentCloudCdwdorisInstance(),
21272127
"tencentcloud_cdwdoris_workload_group": cdwdoris.ResourceTencentCloudCdwdorisWorkloadGroup(),
21282128
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
2129-
<<<<<<< HEAD
21302129
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
2131-
=======
2132-
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
2133-
>>>>>>> 7f715aaa2 (add)
2130+
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
21342131
},
21352132

21362133
ConfigureFunc: providerConfigure,

‎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

‎tencentcloud/services/postgresql/data_source_tc_postgresql_account_privileges.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package postgresql
22

33
import (
4-
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
54
"log"
65
"strings"
76

7+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
8+
89
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
910

1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"

‎tencentcloud/services/postgresql/resource_tc_postgresql_account.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package postgresql
33
import (
44
"context"
55
"fmt"
6+
"log"
7+
"strings"
8+
69
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
710
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
811
postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
912
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1013
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
11-
"log"
12-
"strings"
1314
)
1415

1516
func ResourceTencentCloudPostgresqlAccount() *schema.Resource {

‎tencentcloud/services/postgresql/resource_tc_postgresql_account_privileges_operation.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package postgresql
22

33
import (
4+
"log"
5+
"strings"
6+
47
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
58
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
69
postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
710
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
811
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
9-
"log"
10-
"strings"
1112
)
1213

1314
func ResourceTencentCloudPostgresqlAccountPrivilegesOperation() *schema.Resource {

‎tencentcloud/services/postgresql/resource_tc_postgresql_account_privileges_operation_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package postgresql_test
22

33
import (
4+
"testing"
5+
46
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
57
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
6-
"testing"
78
)
89

910
// go test -i; go test -test.run TestAccTencentCloudPostgresqlAccountPrivilegesOperationResource_basic -v

‎tencentcloud/services/postgresql/resource_tc_postgresql_account_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package postgresql_test
22

33
import (
4+
"testing"
5+
46
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
57
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
6-
"testing"
78
)
89

910
// go test -i; go test -test.run TestAccTencentCloudPostgresqlAccountResource_basic -v

‎tencentcloud/services/thpc/extension_thpc.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package thpc
22

33
const (
4-
SPACE_STATE_ONLINE = "ONLINE"
4+
SPACE_STATE_ONLINE = "ONLINE"
5+
SPACE_STATE_ARREARS = "ARREARS"
56
)
67

78
const (
8-
SPACE_CHARGE_TYPE_PREPAID = "PREPAID"
9+
SPACE_CHARGE_TYPE_PREPAID = "PREPAID"
10+
SPACE_CHARGE_TYPE_UNDERWRITE = "UNDERWRITE"
911
)
12+
13+
var SPACE_CHARGE_TYPE = []string{
14+
SPACE_CHARGE_TYPE_PREPAID,
15+
SPACE_CHARGE_TYPE_UNDERWRITE,
16+
}

0 commit comments

Comments
 (0)