From 4b48f2a268400bdc152e0baef7ec84f21154ac5d Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 12 Sep 2024 14:35:43 +0800 Subject: [PATCH 1/2] add --- tencentcloud/connectivity/client.go | 9 ++++++++- .../services/thpc/resource_tc_thpc_workspaces.md | 2 +- website/docs/r/thpc_workspaces.html.markdown | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tencentcloud/connectivity/client.go b/tencentcloud/connectivity/client.go index 7d2267d505..7f2902c2ce 100644 --- a/tencentcloud/connectivity/client.go +++ b/tencentcloud/connectivity/client.go @@ -366,8 +366,15 @@ func (me *TencentCloudClient) UseVpcClient(iacExtInfo ...IacExtInfo) *vpc.Client func (me *TencentCloudClient) UseOmitNilClient(module string) *common.Client { secretId := me.Credential.SecretId secretKey := me.Credential.SecretKey + token := me.Credential.Token region := me.Region - credential := common.NewCredential(secretId, secretKey) + var credential common.CredentialIface + if token != "" { + credential = common.NewTokenCredential(secretId, secretKey, token) + } else { + credential = common.NewCredential(secretId, secretKey) + } + cpf := profile.NewClientProfile() cpf.HttpProfile.Endpoint = fmt.Sprintf("%s.tencentcloudapi.com", module) cpf.HttpProfile.ReqMethod = "POST" diff --git a/tencentcloud/services/thpc/resource_tc_thpc_workspaces.md b/tencentcloud/services/thpc/resource_tc_thpc_workspaces.md index c09bea7995..bff4d58128 100644 --- a/tencentcloud/services/thpc/resource_tc_thpc_workspaces.md +++ b/tencentcloud/services/thpc/resource_tc_thpc_workspaces.md @@ -64,7 +64,7 @@ resource "tencentcloud_thpc_workspaces" "example" { disk_type = "CLOUD_HSSD" } - data_disk { + data_disks { disk_size = 200 disk_type = "CLOUD_HSSD" encrypt = false diff --git a/website/docs/r/thpc_workspaces.html.markdown b/website/docs/r/thpc_workspaces.html.markdown index bd57186ead..223e3347b6 100644 --- a/website/docs/r/thpc_workspaces.html.markdown +++ b/website/docs/r/thpc_workspaces.html.markdown @@ -75,7 +75,7 @@ resource "tencentcloud_thpc_workspaces" "example" { disk_type = "CLOUD_HSSD" } - data_disk { + data_disks { disk_size = 200 disk_type = "CLOUD_HSSD" encrypt = false From 7c2346f4e540449f0bd43f890ee540cf04e21b66 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 12 Sep 2024 17:11:12 +0800 Subject: [PATCH 2/2] add --- .changelog/2823.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2823.txt diff --git a/.changelog/2823.txt b/.changelog/2823.txt new file mode 100644 index 0000000000..3d4c72b6ea --- /dev/null +++ b/.changelog/2823.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_ccn_route_table_associate_instance_config: Support assume role +```