From 9f832143b12f522e31d6d69541ddd82d20118ddc Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 29 Oct 2025 14:29:12 +0800 Subject: [PATCH 1/3] add --- go.mod | 4 +- go.sum | 4 + tencentcloud/provider.md | 2 + .../resource_tc_wedata_resource_group.md | 6 + .../tencentcloud/common/http/request.go | 2 +- .../tencentcloud/wedata/v20250806/client.go | 12 +- .../tencentcloud/wedata/v20250806/models.go | 11 ++ vendor/modules.txt | 4 +- .../r/wedata_resource_group.html.markdown | 121 ++++++++++++++++++ ..._group_to_project_attachment.html.markdown | 45 +++++++ website/tencentcloud.erb | 6 + 11 files changed, 206 insertions(+), 11 deletions(-) create mode 100644 website/docs/r/wedata_resource_group.html.markdown create mode 100644 website/docs/r/wedata_resource_group_to_project_attachment.html.markdown diff --git a/go.mod b/go.mod index c8076c67d2..7fb2e8277f 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.42 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.45 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161 @@ -98,7 +98,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1170 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.42 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.45 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 github.com/tencentyun/cos-go-sdk-v5 v0.7.66 github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1 diff --git a/go.sum b/go.sum index 832edba365..cb86b72eee 100644 --- a/go.sum +++ b/go.sum @@ -966,6 +966,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.40 h1:mNP6S github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.40/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.42 h1:zOTQCji3vmxrZPkDPfqs2cklL0ZwZYABvWPdm1NQ9lk= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.42/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.45 h1:aHdlXJIg0Ro2gNeBUFBP25t7zBLAJVpWVDRxGp6J7oE= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.45/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= @@ -1105,6 +1107,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.40 h1:ZHESn github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.40/go.mod h1:ROVq1WJulfJonhjNE6olW+xEBHPxqgAoYhpMZ7gFHO8= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.42 h1:UccqwoaGyksPVmFyCFOWLCpLJqpcLFvG/9KnZne2zR8= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.42/go.mod h1:w5V5Vo3d+7UVFIEq3crWPb7tElu2TaG23u+Fq/eo26w= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.45 h1:/hXcPg/N0Al6zn2EusGdskdeiyqSTRM9RbYqkiYCghs= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.45/go.mod h1:OsZGSifDqW2ch5CBg35hkIeDFYCLBDUIgCrBB28lzPs= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJPnZ9GvA677cTB6ELBR6B68wCR2QY1sNoGQc4= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199/go.mod h1:nnY91/H3j/Gu7V/oCA6Zeg8T5D3q36EUdBh4EjmHwqY= github.com/tencentyun/cos-go-sdk-v5 v0.7.66 h1:O4O6EsozBoDjxWbltr3iULgkI7WPj/BFNlYTXDuE64E= diff --git a/tencentcloud/provider.md b/tencentcloud/provider.md index 91e1b1a06c..faa0661a26 100644 --- a/tencentcloud/provider.md +++ b/tencentcloud/provider.md @@ -2295,6 +2295,8 @@ tencentcloud_wedata_run_sql_script_operation tencentcloud_wedata_stop_sql_script_run_operation tencentcloud_wedata_project tencentcloud_wedata_project_member +tencentcloud_wedata_resource_group +tencentcloud_wedata_resource_group_to_project_attachment Cloud Firewall(CFW) Data Source diff --git a/tencentcloud/services/wedata/resource_tc_wedata_resource_group.md b/tencentcloud/services/wedata/resource_tc_wedata_resource_group.md index 3d432240f2..d3ce6b5eb1 100644 --- a/tencentcloud/services/wedata/resource_tc_wedata_resource_group.md +++ b/tencentcloud/services/wedata/resource_tc_wedata_resource_group.md @@ -1,5 +1,7 @@ Provides a resource to create a WeData resource group +~> **NOTE:** If an SKDe Error message appears when executing the `terraform destroy` command, please contact Tencent Cloud WeData for consultation. + Example Usage ```hcl @@ -26,5 +28,9 @@ resource "tencentcloud_wedata_resource_group" "example" { subnet = "subnet-fz7rw5zq" resource_region = "ap-beijing-fsi" description = "description." + + lifecycle { + ignore_changes = [ description, resource_region ] + } } ``` diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go index cd3cd16471..a0a95aa4ce 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go @@ -265,7 +265,7 @@ func CompleteCommonParams(request Request, region string, requestClient string) params["Action"] = request.GetAction() params["Timestamp"] = strconv.FormatInt(time.Now().Unix(), 10) params["Nonce"] = strconv.Itoa(rand.Int()) - params["RequestClient"] = "SDK_GO_1.1.42" + params["RequestClient"] = "SDK_GO_1.1.45" if requestClient != "" { params["RequestClient"] += ": " + requestClient } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/client.go index 364cd81d22..96642250bd 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/client.go @@ -2829,7 +2829,7 @@ func NewGetTaskResponse() (response *GetTaskResponse) { } // GetTask -// 创建任务接口 +// 获取任务详情接口 // // 可能返回的错误码: // FAILEDOPERATION = "FailedOperation" @@ -2841,7 +2841,7 @@ func (c *Client) GetTask(request *GetTaskRequest) (response *GetTaskResponse, er } // GetTask -// 创建任务接口 +// 获取任务详情接口 // // 可能返回的错误码: // FAILEDOPERATION = "FailedOperation" @@ -6267,7 +6267,7 @@ func NewUpdateTaskResponse() (response *UpdateTaskResponse) { } // UpdateTask -// 创建任务接口 +// 更新任务接口 // // 可能返回的错误码: // FAILEDOPERATION = "FailedOperation" @@ -6279,7 +6279,7 @@ func (c *Client) UpdateTask(request *UpdateTaskRequest) (response *UpdateTaskRes } // UpdateTask -// 创建任务接口 +// 更新任务接口 // // 可能返回的错误码: // FAILEDOPERATION = "FailedOperation" @@ -6379,7 +6379,7 @@ func NewUpdateWorkflowFolderResponse() (response *UpdateWorkflowFolderResponse) } // UpdateWorkflowFolder -// 创建文件夹 +// 更新工作流文件夹 // // 可能返回的错误码: // FAILEDOPERATION = "FailedOperation" @@ -6395,7 +6395,7 @@ func (c *Client) UpdateWorkflowFolder(request *UpdateWorkflowFolderRequest) (res } // UpdateWorkflowFolder -// 创建文件夹 +// 更新工作流文件夹 // // 可能返回的错误码: // FAILEDOPERATION = "FailedOperation" diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/models.go index 4acd9a4cdd..a1c34f7a86 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806/models.go @@ -233,6 +233,9 @@ type AlarmRuleDetail struct { // 离线集成对账告警配置信息 // 注意:此字段可能返回 null,表示取不到有效值。 ReconciliationExtInfo []*ReconciliationStrategyInfo `json:"ReconciliationExtInfo,omitnil,omitempty" name:"ReconciliationExtInfo"` + + // 监控对象的白名单配置 + MonitorWhiteTasks []*MonitorWhiteTask `json:"MonitorWhiteTasks,omitnil,omitempty" name:"MonitorWhiteTasks"` } type AlarmWayWebHook struct { @@ -10259,6 +10262,14 @@ type ModifyAlarmRuleResult struct { Status *bool `json:"Status,omitnil,omitempty" name:"Status"` } +type MonitorWhiteTask struct { + // 配置白名单的对应的工作流/项目的id + MonitorObjectId *string `json:"MonitorObjectId,omitnil,omitempty" name:"MonitorObjectId"` + + // 白名单任务列表 + TaskIds []*string `json:"TaskIds,omitnil,omitempty" name:"TaskIds"` +} + type NotebookSessionInfo struct { // 会话ID NotebookSessionId *string `json:"NotebookSessionId,omitnil,omitempty" name:"NotebookSessionId"` diff --git a/vendor/modules.txt b/vendor/modules.txt index ac45f0cbd9..e20e887586 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1170,7 +1170,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016 -# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.42 +# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.45 ## explicit; go 1.11 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors @@ -1359,7 +1359,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1170 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125 -# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.42 +# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.1.45 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20210820 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20250806 diff --git a/website/docs/r/wedata_resource_group.html.markdown b/website/docs/r/wedata_resource_group.html.markdown new file mode 100644 index 0000000000..5ea3b619d0 --- /dev/null +++ b/website/docs/r/wedata_resource_group.html.markdown @@ -0,0 +1,121 @@ +--- +subcategory: "Wedata" +layout: "tencentcloud" +page_title: "TencentCloud: tencentcloud_wedata_resource_group" +sidebar_current: "docs-tencentcloud-resource-wedata_resource_group" +description: |- + Provides a resource to create a WeData resource group +--- + +# tencentcloud_wedata_resource_group + +Provides a resource to create a WeData resource group + +~> **NOTE:** If an SKDe Error message appears when executing the `terraform destroy` command, please contact Tencent Cloud WeData for consultation. + +## Example Usage + +```hcl +resource "tencentcloud_wedata_resource_group" "example" { + name = "tf_example" + type { + resource_group_type = "Integration" + integration { + real_time_data_sync { + specification = "i32c" + number = 1 + } + + offline_data_sync { + specification = "integrated" + number = 2 + } + } + } + + auto_renew_enabled = false + purchase_period = 1 + vpc_id = "vpc-ds5rpnxh" + subnet = "subnet-fz7rw5zq" + resource_region = "ap-beijing-fsi" + description = "description." + + lifecycle { + ignore_changes = [description, resource_region] + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `auto_renew_enabled` - (Required, Bool) Whether auto-renewal is enabled. +* `name` - (Required, String, ForceNew) Resource group name. The name for creating a general resource group must start with a letter, can contain letters, numbers, underscores (_), and up to 64 characters. +* `purchase_period` - (Required, Int) Purchase duration, in months. +* `resource_region` - (Required, String, ForceNew) Resource purchase region. +* `subnet` - (Required, String, ForceNew) Subnet. +* `type` - (Required, List, ForceNew) Information about the activated resource group. +* `vpc_id` - (Required, String, ForceNew) VPC ID. +* `associated_project_id` - (Optional, String, ForceNew) Associated project space project ID. +* `description` - (Optional, String, ForceNew) Resource group description. + +The `data_service` object of `type` supports the following: + +* `number` - (Required, Int) Quantity. +* `specification` - (Required, String) Resource group specification. + +The `integration` object of `type` supports the following: + +* `offline_data_sync` - (Optional, List) Offline integration resource group. + +- integrated (Offline data synchronization - 8C16G) +- i16 (Offline data synchronization - 8C32G). +* `real_time_data_sync` - (Optional, List) Real-time integration resource group. + +- i32c (Real-time data synchronization - 16C64G). + +The `offline_data_sync` object of `integration` supports the following: + +* `number` - (Required, Int) Quantity. +* `specification` - (Required, String) Resource group specification. + +The `real_time_data_sync` object of `integration` supports the following: + +* `number` - (Required, Int) Quantity. +* `specification` - (Required, String) Resource group specification. + +The `schedule` object of `type` supports the following: + +* `number` - (Required, Int) Quantity. +* `specification` - (Required, String) Resource group specification. + +The `type` object supports the following: + +* `resource_group_type` - (Required, String) Resource group type. + +- Schedule --- Scheduling resource group +- Integration --- Integration resource group +- DataService -- Data service resource group. +* `data_service` - (Optional, List) Data service resource group (Integration, scheduling, and data service resource groups cannot be purchased simultaneously). + +- ds_t (Test specification) +- ds_s (Basic specification) +- ds_m (Popular specification) +- ds_l (Professional specification). +* `integration` - (Optional, List) Integration resource group, subdivided into real-time resource group and offline resource group (Integration, scheduling, and data service resource groups cannot be purchased simultaneously). +* `schedule` - (Optional, List) Scheduling resource group (Integration, scheduling, and data service resource groups cannot be purchased simultaneously). + +- s_test (Test specification) +- s_small (Basic specification) +- s_medium (Popular specification) +- s_large (Professional specification). + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - ID of the resource. +* `resource_group_id` - Resource group ID. + + diff --git a/website/docs/r/wedata_resource_group_to_project_attachment.html.markdown b/website/docs/r/wedata_resource_group_to_project_attachment.html.markdown new file mode 100644 index 0000000000..d3cad8ccf1 --- /dev/null +++ b/website/docs/r/wedata_resource_group_to_project_attachment.html.markdown @@ -0,0 +1,45 @@ +--- +subcategory: "Wedata" +layout: "tencentcloud" +page_title: "TencentCloud: tencentcloud_wedata_resource_group_to_project_attachment" +sidebar_current: "docs-tencentcloud-resource-wedata_resource_group_to_project_attachment" +description: |- + Provides a resource to create a WeData resource group to project attachment +--- + +# tencentcloud_wedata_resource_group_to_project_attachment + +Provides a resource to create a WeData resource group to project attachment + +## Example Usage + +```hcl +resource "tencentcloud_wedata_resource_group_to_project_attachment" "example" { + resource_group_id = "20250909161820129828" + project_id = "2983848457986924544" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `project_id` - (Required, String, ForceNew) Project ID. +* `resource_group_id` - (Required, String, ForceNew) Resource group ID. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - ID of the resource. + + + +## Import + +WeData resource group to project attachment can be imported using the resourceGroupId#projectId, e.g. + +``` +terraform import tencentcloud_wedata_resource_group_to_project_attachment.example 20250909161820129828#2983848457986924544 +``` + diff --git a/website/tencentcloud.erb b/website/tencentcloud.erb index 0c1829d857..e5b6043f44 100644 --- a/website/tencentcloud.erb +++ b/website/tencentcloud.erb @@ -7194,6 +7194,12 @@