Skip to content

feat(cdwpg): [122485020]add resource #3239

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
Mar 26, 2025
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
7 changes: 7 additions & 0 deletions .changelog/3239.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:new-resource
tencentcloud_cdwpg_dbconfig
```

```release-note:enhancement
resource/tencentcloud_cdwpg_instance: `count` update is supported
```
1 change: 1 addition & 0 deletions tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -2223,6 +2223,7 @@ func Provider() *schema.Provider {
"tencentcloud_bi_embed_token_apply": bi.ResourceTencentCloudBiEmbedTokenApply(),
"tencentcloud_bi_embed_interval_apply": bi.ResourceTencentCloudBiEmbedIntervalApply(),
"tencentcloud_cdwpg_instance": cdwpg.ResourceTencentCloudCdwpgInstance(),
"tencentcloud_cdwpg_dbconfig": cdwpg.ResourceTencentCloudCdwpgDbconfig(),
"tencentcloud_clickhouse_keyval_config": cdwch.ResourceTencentCloudClickhouseKeyvalConfig(),
"tencentcloud_clickhouse_xml_config": cdwch.ResourceTencentCloudClickhouseXmlConfig(),
"tencentcloud_clb_target_group_attachments": clb.ResourceTencentCloudClbTargetGroupAttachments(),
Expand Down
1 change: 1 addition & 0 deletions tencentcloud/provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -2251,6 +2251,7 @@ tencentcloud_cdwpg_nodes

Resource
tencentcloud_cdwpg_instance
tencentcloud_cdwpg_dbconfig

CSIP
Resource
Expand Down
232 changes: 232 additions & 0 deletions tencentcloud/services/cdwpg/resource_tc_cdwpg_dbconfig.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
package cdwpg

import (
"context"
"fmt"
"log"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
cdwpgv20201230 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwpg/v20201230"

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

func ResourceTencentCloudCdwpgDbconfig() *schema.Resource {
return &schema.Resource{
Create: resourceTencentCloudCdwpgDbconfigCreate,
Read: resourceTencentCloudCdwpgDbconfigRead,
Update: resourceTencentCloudCdwpgDbconfigUpdate,
Delete: resourceTencentCloudCdwpgDbconfigDelete,
Schema: map[string]*schema.Schema{
"instance_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Instance id.",
},
"node_config_params": {
Type: schema.TypeSet,
Optional: true,
Description: "Node config parameters.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"node_type": {
Type: schema.TypeString,
Required: true,
Description: "Node type.",
},
"parameter_name": {
Type: schema.TypeString,
Optional: true,
Description: "Parameter name.",
},
"parameter_value": {
Type: schema.TypeString,
Optional: true,
Description: "Parameter value.",
},
},
},
},
},
}
}

func resourceTencentCloudCdwpgDbconfigCreate(d *schema.ResourceData, meta interface{}) error {
defer tccommon.LogElapsed("resource.tencentcloud_cdwpg_dbconfig.create")()
defer tccommon.InconsistentCheck(d, meta)()

instanceId := d.Get("instance_id").(string)
d.SetId(instanceId)

return resourceTencentCloudCdwpgDbconfigUpdate(d, meta)
}

func resourceTencentCloudCdwpgDbconfigRead(d *schema.ResourceData, meta interface{}) error {
defer tccommon.LogElapsed("resource.tencentcloud_cdwpg_dbconfig.read")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)

ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)

instanceId := d.Id()

var respData []*cdwpgv20201230.ParamItem
paramMap := make(map[string]interface{})
paramMap["InstanceId"] = helper.String(instanceId)
paramMap["NodeTypes"] = helper.Strings([]string{"cn", "dn"})
service := CdwpgService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
result, e := service.DescribeCdwpgDbconfigByFilter(ctx, paramMap)
if e != nil {
return tccommon.RetryError(e)
}
respData = result
return nil
})
if err != nil {
return err
}

nodeConfigParamKeyMap := make(map[string]struct{})
if v, ok := d.GetOk("node_config_params"); ok {
nodeConfigParams := v.(*schema.Set).List()
for _, nodeConfigParam := range nodeConfigParams {
nodeConfigParamMap := nodeConfigParam.(map[string]interface{})
key := fmt.Sprintf("%s-%s", nodeConfigParamMap["node_type"], nodeConfigParamMap["parameter_name"])
nodeConfigParamKeyMap[key] = struct{}{}
}
}
nodeConfigParams := make([]interface{}, 0)
for _, nodeConfigParam := range respData {
nodeType := nodeConfigParam.NodeType
for _, configParam := range nodeConfigParam.Details {
if nodeType != nil && configParam != nil && configParam.ParamName != nil {
key := fmt.Sprintf("%s-%s", *nodeType, *configParam.ParamName)
if _, ok := nodeConfigParamKeyMap[key]; ok {
nodeConfigParams = append(nodeConfigParams, map[string]interface{}{
"node_type": nodeType,
"parameter_name": configParam.ParamName,
"parameter_value": configParam.RunningValue,
})
}
}
}
}
_ = d.Set("instance_id", instanceId)
_ = d.Set("node_config_params", nodeConfigParams)
_ = instanceId
_ = ctx
return nil
}

func resourceTencentCloudCdwpgDbconfigUpdate(d *schema.ResourceData, meta interface{}) error {
defer tccommon.LogElapsed("resource.tencentcloud_cdwpg_dbconfig.update")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)
ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
instanceId := d.Id()

needChange := false
mutableArgs := []string{"node_config_params"}
for _, v := range mutableArgs {
if d.HasChange(v) {
needChange = true
break
}
}

if needChange {
var respData []*cdwpgv20201230.ParamItem
paramMap := make(map[string]interface{})
paramMap["InstanceId"] = helper.String(instanceId)
paramMap["NodeTypes"] = helper.Strings([]string{"cn", "dn"})
service := CdwpgService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
result, e := service.DescribeCdwpgDbconfigByFilter(ctx, paramMap)
if e != nil {
return tccommon.RetryError(e)
}
respData = result
return nil
})
if err != nil {
return err
}

nodeConfigParamMap := make(map[string]string)
for _, item := range respData {
nodeType := item.NodeType
for _, param := range item.Details {
key := fmt.Sprintf("%s-%s", *nodeType, *param.ParamName)
nodeConfigParamMap[key] = *param.RunningValue
}
}

request := cdwpgv20201230.NewModifyDBParametersRequest()
request.InstanceId = helper.String(instanceId)

if v, ok := d.GetOk("node_config_params"); ok {
params := v.(*schema.Set).List()
for _, item := range params {
nodeConfigParamsMap := item.(map[string]interface{})
nodeConfigParams := cdwpgv20201230.NodeConfigParams{}
var nodeType, parameterName, parameterValue string
if v, ok := nodeConfigParamsMap["node_type"]; ok {
nodeType = v.(string)
nodeConfigParams.NodeType = helper.String(v.(string))
}
if v, ok := nodeConfigParamsMap["parameter_name"]; ok {
parameterName = v.(string)
}
if v, ok := nodeConfigParamsMap["parameter_value"]; ok {
parameterValue = v.(string)
}

key := fmt.Sprintf("%s-%s", nodeType, parameterName)

configParams := cdwpgv20201230.ConfigParams{}
configParams.ParameterName = helper.String(parameterName)
configParams.ParameterOldValue = helper.String(nodeConfigParamMap[key])
configParams.ParameterValue = helper.String(parameterValue)
nodeConfigParams.ConfigParams = append(nodeConfigParams.ConfigParams, &configParams)
request.NodeConfigParams = append(request.NodeConfigParams, &nodeConfigParams)
}
}

err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCdwpgV20201230Client().ModifyDBParametersWithContext(ctx, request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}
return nil
})
if err != nil {
log.Printf("[CRITAL]%s update cdwpg dbconfig failed, reason:%+v", logId, err)
return err
}

conf := tccommon.BuildStateChangeConf([]string{}, []string{"Serving"}, 10*tccommon.ReadRetryTimeout, time.Second, service.InstanceStateRefreshFunc(instanceId, []string{}))

if _, e := conf.WaitForState(); e != nil {
return e
}

}

return resourceTencentCloudCdwpgDbconfigRead(d, meta)
}

func resourceTencentCloudCdwpgDbconfigDelete(d *schema.ResourceData, meta interface{}) error {
defer tccommon.LogElapsed("resource.tencentcloud_cdwpg_dbconfig.delete")()
defer tccommon.InconsistentCheck(d, meta)()

return nil
}
14 changes: 14 additions & 0 deletions tencentcloud/services/cdwpg/resource_tc_cdwpg_dbconfig.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Provides a resource to create a cdwpg cdwpg_dbconfig

Example Usage

```hcl
resource "tencentcloud_cdwpg_dbconfig" "cdwpg_dbconfig" {
instance_id = "cdwpg-ua8wkqrt"
node_config_params {
node_type = "cn"
parameter_name = "log_min_duration_statement"
parameter_value = "10001"
}
}
```
36 changes: 36 additions & 0 deletions tencentcloud/services/cdwpg/resource_tc_cdwpg_dbconfig_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package cdwpg_test

import (
"testing"

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

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

func TestAccTencentCloudCdwpgDbconfigResource_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
tcacctest.AccPreCheck(t)
},
Providers: tcacctest.AccProviders,
Steps: []resource.TestStep{
{
Config: testAccCdwpgDbconfig,
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_cdwpg_dbconfig.cdwpg_dbconfig", "id")),
},
},
})
}

const testAccCdwpgDbconfig = `
resource "tencentcloud_cdwpg_dbconfig" "cdwpg_dbconfig" {
instance_id = "cdwpg-ua8wkqrt"
node_config_params {
node_type = "cn"
parameter_name = "log_min_duration_statement"
parameter_value = "10001"
}
}
`
Loading
Loading