Feat/cdwch support (#2377)

* add cdwch resource

* make doc

* update cdwch resource hcl

* add changelog 2377.txt

* xml_config support terraform import

* update markdown

Author: bruceybian

.changelog/2377.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+tencentcloud_clickhouse_keyval_config
+```
+
+```release-note:new-resource
+tencentcloud_clickhouse_xml_config
+```

tencentcloud/cdwch/resource_tc_clickhouse_keyval_config.md

@@ -0,0 +1,21 @@
+Provides a resource to create a clickhouse keyval_config
+
+Example Usage
+
+```hcl
+resource "tencentcloud_clickhouse_keyval_config" "keyval_config" {
+  instance_id = "cdwch-datuhk3z"
+  items {
+    conf_key   = "max_open_files"
+    conf_value = "50000"
+  }
+}
+```
+
+Import
+
+clickhouse config can be imported using the id, e.g.
+
+```
+terraform import tencentcloud_clickhouse_keyval_config.config cdwch-datuhk3z#max_open_files#50000
+```

tencentcloud/cdwch/resource_tc_clickhouse_xml_config.md

@@ -0,0 +1,22 @@
+Provides a resource to create a clickhouse xml_config
+
+Example Usage
+
+```hcl
+resource "tencentcloud_clickhouse_xml_config" "xml_config" {
+  instance_id = "cdwch-datuhk3z"
+  modify_conf_context {
+    file_name      = "metrika.xml"
+    new_conf_value = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHlhbmRleD4KICAgIDx6b29rZWVwZXItc2VydmVycz4KICAgIDwvem9va2VlcGVyLXNlcnZlcnM+CjwveWFuZGV4Pgo="
+    file_path      = "/etc/clickhouse-server"
+  }
+}
+```
+
+Import
+
+clickhouse xml_config can be imported using the id, e.g.
+
+```
+terraform import tencentcloud_clickhouse_xml_config.xml_config cdwch-datuhk3z#metrika.xml
+```

tencentcloud/provider.go

@@ -1826,6 +1826,8 @@ func Provider() *schema.Provider {
 			"tencentcloud_bi_embed_token_apply":                                resourceTencentCloudBiEmbedTokenApply(),
 			"tencentcloud_bi_embed_interval_apply":                             resourceTencentCloudBiEmbedIntervalApply(),
 			"tencentcloud_cdwpg_instance":                                      resourceTencentCloudCdwpgInstance(),
+			"tencentcloud_clickhouse_keyval_config":                            resourceTencentCloudClickhouseKeyvalConfig(),
+			"tencentcloud_clickhouse_xml_config":                               resourceTencentCloudClickhouseXmlConfig(),
 		},
 
 		ConfigureFunc: providerConfigure,

tencentcloud/provider.md

@@ -1922,6 +1922,8 @@ ClickHouse(CDWCH)
     tencentcloud_clickhouse_delete_backup_data
     tencentcloud_clickhouse_account
     tencentcloud_clickhouse_account_permission
+    tencentcloud_clickhouse_keyval_config 
+    tencentcloud_clickhouse_xml_config
 
 Tag
   Resource

tencentcloud/resource_tc_clickhouse_keyval_config.go

@@ -0,0 +1,282 @@
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"strings"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	cdwch "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch/v20200915"
+)
+
+func resourceTencentCloudClickhouseKeyvalConfig() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudClickhouseKeyvalConfigCreate,
+		Read:   resourceTencentCloudClickhouseKeyvalConfigRead,
+		Update: resourceTencentCloudClickhouseKeyvalConfigUpdate,
+		Delete: resourceTencentCloudClickhouseKeyvalConfigDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Schema: map[string]*schema.Schema{
+			"instance_id": {
+				Required:    true,
+				ForceNew:    true,
+				Type:        schema.TypeString,
+				Description: "Instance ID.",
+			},
+
+			"items": {
+				Required:    true,
+				Type:        schema.TypeList,
+				MaxItems:    1,
+				Description: "configuration list.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"conf_key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Instance config key.",
+						},
+						"conf_value": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Instance config value.",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func resourceTencentCloudClickhouseKeyvalConfigCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clickhouse_keyval_config.create")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	request := cdwch.NewModifyInstanceKeyValConfigsRequest()
+
+	var ids []string
+	var instanceId string
+	if v, ok := d.GetOk("instance_id"); ok {
+		instanceId = v.(string)
+	}
+	ids = append(ids, instanceId)
+
+	var addItems []*cdwch.InstanceConfigItem
+	if row, ok := d.GetOk("items"); ok {
+		items := row.([]interface{})
+		for _, v := range items {
+			value := v.(map[string]interface{})
+			configKey := value["conf_key"].(string)
+			configValue := value["conf_value"].(string)
+
+			addItems = append(addItems, &cdwch.InstanceConfigItem{
+				ConfKey:   &configKey,
+				ConfValue: &configValue,
+			})
+			ids = append(ids, configKey, configValue)
+		}
+	}
+
+	request.InstanceId = &instanceId
+	request.AddItems = addItems
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCdwchClient().ModifyInstanceKeyValConfigs(request)
+		if e != nil {
+			return 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 cdwch config failed, reason:%+v", logId, err)
+		return err
+	}
+
+	service := CdwchService{client: meta.(*TencentCloudClient).apiV3Conn}
+	conf := BuildStateChangeConf([]string{}, []string{"Serving"}, 10*readRetryTimeout, time.Second, service.InstanceStateRefreshFunc(instanceId))
+
+	if _, e := conf.WaitForState(); e != nil {
+		return e
+	}
+
+	d.SetId(strings.Join(ids, FILED_SP))
+
+	return resourceTencentCloudClickhouseKeyvalConfigRead(d, meta)
+}
+
+func resourceTencentCloudClickhouseKeyvalConfigRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clickhouse_keyval_config.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := CdwchService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	idSplit := strings.Split(d.Id(), FILED_SP)
+	if len(idSplit) != 3 {
+		return fmt.Errorf("id is broken,%s", d.Id())
+	}
+	instanceId := idSplit[0]
+	configKey := idSplit[1]
+
+	_ = d.Set("instance_id", instanceId)
+
+	config, err := service.DescribeClickhouseKeyvalConfigById(ctx, instanceId)
+	if err != nil {
+		return err
+	}
+	if config == nil {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `ClickhouseKeyvalConfig` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
+	}
+
+	var items []*cdwch.InstanceConfigInfo
+	items = append(items, config.ConfigItems...)
+	items = append(items, config.UnConfigItems...)
+
+	resultMap := make(map[string]*cdwch.InstanceConfigInfo)
+	for _, item := range items {
+		if item.ConfKey != nil {
+			resultMap[*item.ConfKey] = item
+		}
+	}
+
+	var itemsList []interface{}
+	item := resultMap[configKey]
+	if item != nil {
+		itemsMap := map[string]interface{}{}
+		itemsMap["conf_key"] = item.ConfKey
+		itemsMap["conf_value"] = item.ConfValue
+		itemsList = append(itemsList, itemsMap)
+	}
+	_ = d.Set("items", itemsList)
+
+	return nil
+}
+
+func resourceTencentCloudClickhouseKeyvalConfigUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clickhouse_keyval_config.update")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	request := cdwch.NewModifyInstanceKeyValConfigsRequest()
+
+	idSplit := strings.Split(d.Id(), FILED_SP)
+	if len(idSplit) != 3 {
+		return fmt.Errorf("id is broken,%s", d.Id())
+	}
+	instanceId := idSplit[0]
+	configKey := idSplit[1]
+
+	var ids []string
+	ids = append(ids, instanceId)
+
+	var updateItems []*cdwch.InstanceConfigItem
+	if d.HasChange("items") {
+		items := d.Get("items").([]interface{})
+		for _, v := range items {
+			value := v.(map[string]interface{})
+			newConfigKey := value["conf_key"].(string)
+			newConfigValue := value["conf_value"].(string)
+
+			if configKey != newConfigKey {
+				return fmt.Errorf("`conf_key` is not allowed to be modified when updating the configuration list")
+			}
+			updateItems = append(updateItems, &cdwch.InstanceConfigItem{
+				ConfKey:   &newConfigKey,
+				ConfValue: &newConfigValue,
+			})
+			ids = append(ids, newConfigKey, newConfigValue)
+		}
+	}
+
+	request.InstanceId = &instanceId
+	request.UpdateItems = updateItems
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCdwchClient().ModifyInstanceKeyValConfigs(request)
+		if e != nil {
+			return 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 cdwch config failed, reason:%+v", logId, err)
+		return err
+	}
+
+	service := CdwchService{client: meta.(*TencentCloudClient).apiV3Conn}
+	conf := BuildStateChangeConf([]string{}, []string{"Serving"}, 10*readRetryTimeout, time.Second, service.InstanceStateRefreshFunc(instanceId))
+
+	if _, e := conf.WaitForState(); e != nil {
+		return e
+	}
+
+	d.SetId(strings.Join(ids, FILED_SP))
+
+	return resourceTencentCloudClickhouseKeyvalConfigRead(d, meta)
+}
+
+func resourceTencentCloudClickhouseKeyvalConfigDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clickhouse_keyval_config.delete")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	request := cdwch.NewModifyInstanceKeyValConfigsRequest()
+
+	idSplit := strings.Split(d.Id(), FILED_SP)
+	if len(idSplit) != 3 {
+		return fmt.Errorf("id is broken,%s", d.Id())
+	}
+	instanceId := idSplit[0]
+	configKey := idSplit[1]
+	configValue := idSplit[2]
+
+	var delItems []*cdwch.InstanceConfigItem
+	delItems = append(delItems, &cdwch.InstanceConfigItem{
+		ConfKey:   &configKey,
+		ConfValue: &configValue,
+	})
+
+	request.InstanceId = &instanceId
+	request.DelItems = delItems
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCdwchClient().ModifyInstanceKeyValConfigs(request)
+		if e != nil {
+			return 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 cdwch config failed, reason:%+v", logId, err)
+		return err
+	}
+
+	service := CdwchService{client: meta.(*TencentCloudClient).apiV3Conn}
+	conf := BuildStateChangeConf([]string{}, []string{"Serving"}, 10*readRetryTimeout, time.Second, service.InstanceStateRefreshFunc(instanceId))
+
+	if _, e := conf.WaitForState(); e != nil {
+		return e
+	}
+
+	return nil
+}