diff --git a/.changelog/3574.txt b/.changelog/3574.txt new file mode 100644 index 0000000000..a21a993d41 --- /dev/null +++ b/.changelog/3574.txt @@ -0,0 +1,7 @@ +```release-note:new-resource +tencentcloud_wedata_resource_group +``` + +```release-note:new-resource +tencentcloud_wedata_resource_group_to_project_attachment +``` 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..53e03371fd 100644 --- a/tencentcloud/provider.md +++ b/tencentcloud/provider.md @@ -2295,6 +2295,7 @@ tencentcloud_wedata_run_sql_script_operation tencentcloud_wedata_stop_sql_script_run_operation tencentcloud_wedata_project tencentcloud_wedata_project_member +tencentcloud_wedata_resource_group_to_project_attachment Cloud Firewall(CFW) Data Source diff --git a/tencentcloud/services/wedata/resource_tc_wedata_resource_group.go b/tencentcloud/services/wedata/resource_tc_wedata_resource_group.go index 8e1aafc121..b40d38ea2a 100644 --- a/tencentcloud/services/wedata/resource_tc_wedata_resource_group.go +++ b/tencentcloud/services/wedata/resource_tc_wedata_resource_group.go @@ -374,13 +374,13 @@ func resourceTencentCloudWedataResourceGroupRead(d *schema.ResourceData, meta in _ = d.Set("subnet", items.SubNet) } - if items.Region != nil { - _ = d.Set("resource_region", items.Region) - } + // if items.Region != nil { + // _ = d.Set("resource_region", items.Region) + // } - if items.Description != nil { - _ = d.Set("description", items.Description) - } + // if items.Description != nil { + // _ = d.Set("description", items.Description) + // } if items.Id != nil { _ = d.Set("resource_group_id", items.Id) 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_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..3307f0caa6 100644 --- a/website/tencentcloud.erb +++ b/website/tencentcloud.erb @@ -7194,6 +7194,9 @@
  • tencentcloud_wedata_resource_folder
  • +
  • + tencentcloud_wedata_resource_group_to_project_attachment +
  • tencentcloud_wedata_rule_template