Skip to content

feat(thpc): [119548471] add new resource #2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 11, 2024
Merged

feat(thpc): [119548471] add new resource #2813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1792529
add
SevenEarth Sep 11, 2024
57d6303
add
SevenEarth Sep 9, 2024
a34f82b
add
SevenEarth Sep 11, 2024
ae1a94f
add
SevenEarth Sep 11, 2024
3682ce4
add
SevenEarth Sep 9, 2024
85576c0
add
SevenEarth Sep 9, 2024
4af53c8
add
SevenEarth Sep 10, 2024
51c19a9
add
SevenEarth Sep 11, 2024
f439899
add
SevenEarth Sep 11, 2024
793207e
add
SevenEarth Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/2813.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
tencentcloud_thpc_workspaces
```
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998
github.com/wI2L/jsondiff v0.3.0
k8s.io/apimachinery v0.22.4
)
Expand Down
14 changes: 14 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,16 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998 h1:FVOc
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995 h1:I1l5kl6rdQYDLEk8DqWjZgwMh0+nYnqbwq7KS4bqi/s=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996 h1:m++6lrqL4NglwGwmgKD7VbvhxYVhmQRS9BWdFnzwVwY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.996/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998 h1:FVOc3KPlI9JAFz7A7s19xGoF+t54vzNByRzenTyAKpA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960 h1:Tpz3KVUfaJ7b98wQDYZSbmoKIn0hlH0oHPOzWMzE5Q8=
Expand Down Expand Up @@ -1041,6 +1051,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5umgbXDDTSOuLmoLDfNdh712lCIgIzw5SQItrA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996 h1:RtpskwAhYlNZ6I8KhzAkC1KkrOYK85xlbKcDPNyOq8s=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.996/go.mod h1:NNaPLakkKjufzvcMcln18WPYVfbbIBI4NRenQy7VLr4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921 h1:jCrZDMDNNI5TFZEEk5AXMcNThDzxAHMKrQFspoqEdCA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921/go.mod h1:waWKRKzVqvpXYIMuJvrXBEX9igTo5VntpP/Soi6O5Hc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
Expand Down
15 changes: 15 additions & 0 deletions tencentcloud/connectivity/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ import (
tdmq "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq/v20200217"
tem "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701"
teo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
thpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc/v20230321"
tkev20180525 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
tkev20220501 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501"
trocket "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket/v20230308"
Expand Down Expand Up @@ -207,6 +208,7 @@ type TencentCloudClient struct {
cdcConn *cdc.Client
cdwdorisConn *cdwdoris.Client
controlcenterConn *controlcenter.Client
thpcConn *thpc.Client
//omit nil client
omitNilConn *common.Client
}
Expand Down Expand Up @@ -1713,3 +1715,16 @@ func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.C

return me.controlcenterConn
}

// UseThpcClient return THPC client for service
func (me *TencentCloudClient) UseThpcV20230321Client() *thpc.Client {
if me.thpcConn != nil {
return me.thpcConn
}
cpf := me.NewClientProfile(300)
cpf.Language = "zh-CN"
me.thpcConn, _ = thpc.NewClient(me.Credential, me.Region, cpf)
me.thpcConn.WithHttpTransport(&LogRoundTripper{})

return me.thpcConn
}
2 changes: 2 additions & 0 deletions tencentcloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ import (
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tdcpg"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tem"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/teo"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/thpc"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tke"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tmp"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tpulsar"
Expand Down Expand Up @@ -2126,6 +2127,7 @@ func Provider() *schema.Provider {
"tencentcloud_cdwdoris_workload_group": cdwdoris.ResourceTencentCloudCdwdorisWorkloadGroup(),
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
},

ConfigureFunc: providerConfigure,
Expand Down
6 changes: 5 additions & 1 deletion tencentcloud/provider.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,4 +2184,8 @@ CdwDoris

ControlCenter
Resource
tencentcloud_batch_apply_account_baselines
tencentcloud_batch_apply_account_baselines

THPC
Resource
tencentcloud_thpc_workspaces
3 changes: 2 additions & 1 deletion tencentcloud/services/postgresql/data_source_tc_postgresql_account_privileges.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package postgresql

import (
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
"log"
"strings"

"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"

tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/services/postgresql/resource_tc_postgresql_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ package postgresql
import (
"context"
"fmt"
"log"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
"log"
"strings"
)

func ResourceTencentCloudPostgresqlAccount() *schema.Resource {
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/services/postgresql/resource_tc_postgresql_account_privileges_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package postgresql

import (
"log"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
"log"
"strings"
)

func ResourceTencentCloudPostgresqlAccountPrivilegesOperation() *schema.Resource {
Expand Down
3 changes: 2 additions & 1 deletion tencentcloud/services/postgresql/resource_tc_postgresql_account_privileges_operation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package postgresql_test

import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
"testing"
)

// go test -i; go test -test.run TestAccTencentCloudPostgresqlAccountPrivilegesOperationResource_basic -v
Expand Down
3 changes: 2 additions & 1 deletion tencentcloud/services/postgresql/resource_tc_postgresql_account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package postgresql_test

import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
"testing"
)

// go test -i; go test -test.run TestAccTencentCloudPostgresqlAccountResource_basic -v
Expand Down
44 changes: 44 additions & 0 deletions tencentcloud/services/thpc/extension_thpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package thpc

const (
SPACE_STATE_ONLINE = "ONLINE"
SPACE_STATE_ARREARS = "ARREARS"
)

const (
SPACE_CHARGE_TYPE_PREPAID = "PREPAID"
SPACE_CHARGE_TYPE_UNDERWRITE = "UNDERWRITE"
)

var SPACE_CHARGE_TYPE = []string{
SPACE_CHARGE_TYPE_PREPAID,
SPACE_CHARGE_TYPE_UNDERWRITE,
}

const (
CVM_DISK_TYPE_LOCAL_NVME = "CVM_DISK_TYPE_LOCAL_NVME"
CVM_DISK_TYPE_LOCAL_BASIC = "LOCAL_BASIC"
CVM_DISK_TYPE_LOCAL_SSD = "LOCAL_SSD"
CVM_DISK_TYPE_CLOUD_BASIC = "CLOUD_BASIC"
CVM_DISK_TYPE_CLOUD_SSD = "CLOUD_SSD"
CVM_DISK_TYPE_CLOUD_PREMIUM = "CLOUD_PREMIUM"
CVM_DISK_TYPE_CLOUD_BSSD = "CLOUD_BSSD"
CVM_DISK_TYPE_CLOUD_HSSD = "CLOUD_HSSD"
CVM_DISK_TYPE_CLOUD_TSSD = "CLOUD_TSSD"
)

var SYSTEM_DISK_TYPE = []string{
CVM_DISK_TYPE_LOCAL_BASIC,
CVM_DISK_TYPE_LOCAL_SSD,
CVM_DISK_TYPE_CLOUD_BASIC,
CVM_DISK_TYPE_CLOUD_SSD,
CVM_DISK_TYPE_CLOUD_PREMIUM,
CVM_DISK_TYPE_CLOUD_BSSD,
CVM_DISK_TYPE_CLOUD_HSSD,
CVM_DISK_TYPE_CLOUD_TSSD,
}

const (
CVM_INSTANCE_STATE_FAILED = "FAILED"
CVM_INSTANCE_STATE_OPERATING = "OPERATING"
)
Loading
Loading