Skip to content

feat(controlcenter): [119069726] add new operation #2803

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.

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 4 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/2803.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
tencentcloud_batch_apply_account_baselines
```
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ require (
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
github.com/tdakkota/asciicheck v0.2.0 // indirect
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwdoris v1.0.993 // indirect
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 // indirect
github.com/tetafro/godot v1.4.11 // indirect
github.com/tidwall/gjson v1.17.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.991 h1:0Xg2
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.991/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993 h1:+iJMmF0q1MPyhLs0+J7CcJ47w/vq6ICsCxnV4gc0dKw=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993/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
21 changes: 18 additions & 3 deletions tencentcloud/connectivity/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
controlcenter "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter/v20230110"
csip "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip/v20221121"
cvmv20170312 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
cwp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp/v20180228"
Expand Down Expand Up @@ -202,9 +203,10 @@ type TencentCloudClient struct {
regionConn *region.Client
//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.
//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.
tkev20220501Conn *tkev20220501.Client
cdcConn *cdc.Client
cdwdorisConn *cdwdoris.Client
tkev20220501Conn *tkev20220501.Client
cdcConn *cdc.Client
cdwdorisConn *cdwdoris.Client
controlcenterConn *controlcenter.Client
//omit nil client
omitNilConn *common.Client
}
Expand Down Expand Up @@ -1698,3 +1700,16 @@ func (me *TencentCloudClient) UseCdwdorisV20211228Client() *cdwdoris.Client {

return me.cdwdorisConn
}

// UseControlcenter return CONTROLCENTER client for service
func (me *TencentCloudClient) UseControlcenterV20230110Client() *controlcenter.Client {
if me.controlcenterConn != nil {
return me.controlcenterConn
}
cpf := me.NewClientProfile(300)
cpf.Language = "zh-CN"
me.controlcenterConn, _ = controlcenter.NewClient(me.Credential, me.Region, cpf)
me.controlcenterConn.WithHttpTransport(&LogRoundTripper{})

return me.controlcenterConn
}
2 changes: 2 additions & 0 deletions tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import (
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/clb"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cls"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/common"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/controlcenter"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cos"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/crs"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/csip"
Expand Down Expand Up @@ -2120,6 +2121,7 @@ func Provider() *schema.Provider {
"tencentcloud_cdwdoris_instance": cdwdoris.ResourceTencentCloudCdwdorisInstance(),
"tencentcloud_cdwdoris_workload_group": cdwdoris.ResourceTencentCloudCdwdorisWorkloadGroup(),
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
},

ConfigureFunc: providerConfigure,
Expand Down
4 changes: 4 additions & 0 deletions tencentcloud/provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -2178,3 +2178,7 @@ CdwDoris
Resource
tencentcloud_cdwdoris_instance
tencentcloud_cdwdoris_workload_group

ControlCenter
Resource
tencentcloud_batch_apply_account_baselines

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Provides a resource to create a controlcenter batch apply account baselines

Example Usage

```hcl
resource "tencentcloud_batch_apply_account_baselines" "example" {
member_uin_list = [
10037652245,
10037652240,
]

baseline_config_items {
identifier = "TCC-AF_SHARE_IMAGE"
configuration = "{\"Images\":[{\"Region\":\"ap-guangzhou\",\"ImageId\":\"img-mcdsiqrx\",\"ImageName\":\"demo1\"}, {\"Region\":\"ap-guangzhou\",\"ImageId\":\"img-esxgkots\",\"ImageName\":\"demo2\"}]}"
}
}
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package controlcenter_test

import (
"testing"

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

tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
)

// go test -i; go test -test.run TestAccTencentCloudNeedFixBatchApplyAccountBaselinesResource_basic -v
func TestAccTencentCloudNeedFixBatchApplyAccountBaselinesResource_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
tcacctest.AccPreCheck(t)
},
Providers: tcacctest.AccProviders,
Steps: []resource.TestStep{
{
Config: testAccBatchApplyAccountBaselines,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_batch_apply_account_baselines.example", "id"),
),
},
},
})
}

const testAccBatchApplyAccountBaselines = `
resource "tencentcloud_batch_apply_account_baselines" "example" {
member_uin_list = [
10037652245,
10037652240,
]

baseline_config_items {
identifier = "TCC-AF_SHARE_IMAGE"
configuration = "{\"Images\":[{\"Region\":\"ap-guangzhou\",\"ImageId\":\"img-mcdsiqrx\",\"ImageName\":\"demo1\"}, {\"Region\":\"ap-guangzhou\",\"ImageId\":\"img-esxgkots\",\"ImageName\":\"demo2\"}]}"
}
}
`

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading