add tencentcloud_dcdb_instance_config

Author: lyu571

.changelog/1872.txt

@@ -9,3 +9,7 @@ tencentcloud_dcdb_flush_binlog_operation
 ```release-note:new-resource
 tencentcloud_dcdb_switch_db_instance_ha_operation
 ```
+
+```release-note:new-resource
+tencentcloud_dcdb_instance_config
+```

tencentcloud/provider.go

@@ -1115,6 +1115,7 @@ TDSQL for MySQL(DCDB)
 	tencentcloud_dcdb_db_parameters
 	tencentcloud_dcdb_db_sync_mode_config
 	tencentcloud_dcdb_encrypt_attributes_config
+	tencentcloud_dcdb_instance_config
 	tencentcloud_dcdb_cancel_dcn_job_operation
 	tencentcloud_dcdb_activate_hour_instance_operation
 	tencentcloud_dcdb_isolate_hour_instance_operation
@@ -2431,6 +2432,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_dcdb_db_parameters":                         resourceTencentCloudDcdbDbParameters(),
 			"tencentcloud_dcdb_encrypt_attributes_config":             resourceTencentCloudDcdbEncryptAttributesConfig(),
 			"tencentcloud_dcdb_db_sync_mode_config":                   resourceTencentCloudDcdbDbSyncModeConfig(),
+			"tencentcloud_dcdb_instance_config":                       resourceTencentCloudDcdbInstanceConfig(),
 			"tencentcloud_dcdb_activate_hour_instance_operation":      resourceTencentCloudDcdbActivateHourInstanceOperation(),
 			"tencentcloud_dcdb_isolate_hour_instance_operation":       resourceTencentCloudDcdbIsolateHourInstanceOperation(),
 			"tencentcloud_dcdb_cancel_dcn_job_operation":              resourceTencentCloudDcdbCancelDcnJobOperation(),

tencentcloud/resource_tc_dcdb_account_privileges.go

@@ -90,14 +90,14 @@ func resourceTencentCloudDcdbAccountPrivileges() *schema.Resource {
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
-				Description: ""Global permissions. Among them, the optional value of the permission in GlobalPrivileges is:""SELECT, INSERT, UPDATE, DELETE, CREATE, PROCESS, DROP, REFERENCES, INDEX, ALTER, SHOW DATABASES,""CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER.""Note that if this parameter is not passed, it means that the existing permissions are reserved. If it needs to be cleared, pass an empty array in this field.".",
+				Description: "Global permissions. Among them, the optional value of the permission in GlobalPrivileges is: SELECT, INSERT, UPDATE, DELETE, CREATE, PROCESS, DROP, REFERENCES, INDEX, ALTER, SHOW DATABASES,  CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER.  Note that if this parameter is not passed, it means that the existing permissions are reserved. If it needs to be cleared, pass an empty array in this field.",
 			},
 
 			"database_privileges": {
 				Optional:    true,
 				Type:        schema.TypeList,
 				MaxItems:    1,
-				Description: ""Database permissions. Optional values for the Privileges permission are:""SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES,""LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER.""Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.".",
+				Description: "Database permissions. Optional values for the Privileges permission are: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES,  LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER.  Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"privileges": {
@@ -121,7 +121,7 @@ func resourceTencentCloudDcdbAccountPrivileges() *schema.Resource {
 				Optional:    true,
 				Type:        schema.TypeList,
 				MaxItems:    1,
-				Description: ""Permissions for tables in the database. Optional values for the Privileges permission are:""SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER.""Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.".",
+				Description: "Permissions for tables in the database. Optional values for the Privileges permission are: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER. Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"database": {
@@ -150,7 +150,7 @@ func resourceTencentCloudDcdbAccountPrivileges() *schema.Resource {
 				Optional:    true,
 				Type:        schema.TypeList,
 				MaxItems:    1,
-				Description: ""Permissions for columns in database tables. Optional values for the Privileges permission are:""SELECT, INSERT, UPDATE, REFERENCES.""Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.".",
+				Description: "Permissions for columns in database tables. Optional values for the Privileges permission are:  SELECT, INSERT, UPDATE, REFERENCES.  Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"database": {
@@ -184,7 +184,7 @@ func resourceTencentCloudDcdbAccountPrivileges() *schema.Resource {
 				Optional:    true,
 				Type:        schema.TypeList,
 				MaxItems:    1,
-				Description: ""Permissions for database views. Optional values for the Privileges permission are:""SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER.""Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.".",
+				Description: "Permissions for database views. Optional values for the Privileges permission are:  SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER.  Note that if this parameter is not passed, the existing privileges are reserved. If you need to clear them, please pass an empty array in the complex type Privileges field.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"database": {

tencentcloud/resource_tc_dcdb_db_instance.go

@@ -77,7 +77,7 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
-				Description: ""The availability zone distribution of shard nodes can be filled with up to two availability zones. When the shard specification is one master and two slaves, two of the nodes are in the first availability zone.""Note that the current availability zone that can be sold needs to be pulled through the DescribeDCDBSaleInfo interface.".",
+				Description: "The availability zone distribution of shard nodes can be filled with up to two availability zones. When the shard specification is one master and two slaves, two of the nodes are in the first availability zone.Note that the current availability zone that can be sold needs to be pulled through the DescribeDCDBSaleInfo interface.",
 			},
 
 			"period": {
@@ -89,19 +89,19 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
 			"shard_memory": {
 				Required:    true,
 				Type:        schema.TypeInt,
-				Description: ""Shard memory size, unit: GB, can pass DescribeShardSpec""Query the instance specification to obtain.".",
+				Description: "Shard memory size, unit: GB, can pass DescribeShardSpec Query the instance specification to obtain.",
 			},
 
 			"shard_storage": {
 				Required:    true,
 				Type:        schema.TypeInt,
-				Description: ""Shard storage size, unit: GB, can pass DescribeShardSpec""Query the instance specification to obtain.".",
+				Description: " Shard storage size, unit: GB, can pass DescribeShardSpec  Query the instance specification to obtain.",
 			},
 
 			"shard_node_count": {
 				Required:    true,
 				Type:        schema.TypeInt,
-				Description: ""Number of single shard nodes, can pass DescribeShardSpec""Query the instance specification to obtain.".",
+				Description: " Number of single shard nodes, can pass DescribeShardSpec  Query the instance specification to obtain.",
 			},
 
 			"shard_count": {
@@ -137,7 +137,7 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
 			"db_version_id": {
 				Optional:    true,
 				Type:        schema.TypeString,
-				Description: ""Database engine version, currently available: 8.0.18, 10.1.9, 5.7.17.""8.0.18 - MySQL 8.0.18;""10.1.9 - Mariadb 10.1.9;""5.7.17 - Percona 5.7.17""If not filled, the default is 5.7.17, which means Percona 5.7.17.".",
+				Description: " Database engine version, currently available: 8.0.18, 10.1.9, 5.7.17.  8.0.18 - MySQL 8.0.18;  10.1.9 - Mariadb 10.1.9;  5.7.17 - Percona 5.7.17  If not filled, the default is 5.7.17, which means Percona 5.7.17.",
 			},
 
 			"auto_voucher": {
@@ -222,7 +222,7 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
 			"init_params": {
 				Optional:    true,
 				Type:        schema.TypeList,
-				Description: ""parameter list. The optional values of this interface are:""character_set_server (character set, must be passed),""lower_case_table_names (table name is case sensitive, must be passed, 0 - sensitive; 1 - insensitive),""innodb_page_size (innodb data page, default 16K),""sync_mode ( Synchronous mode: 0 - asynchronous; 1 - strong synchronous; 2 - strong synchronous degenerate. The default is strong synchronous degenerate)".",
+				Description: " parameter list. The optional values of this interface are:  character_set_server (character set, must be passed),  lower_case_table_names (table name is case sensitive, must be passed, 0 - sensitive; 1 - insensitive),  innodb_page_size (innodb data page, default 16K),  sync_mode ( Synchronous mode: 0 - asynchronous; 1 - strong synchronous; 2 - strong synchronous degenerate. The default is strong synchronous degenerate) .",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"param": {
@@ -254,7 +254,7 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
 			"auto_renew_flag": {
 				Optional:    true,
 				Type:        schema.TypeInt,
-				Description: ""Automatic renewal flag, 0 means the default state (the user has not set it, that is, the initial state is manual renewal, and the user has activated the prepaid non-stop privilege and will also perform automatic renewal).""1 means automatic renewal, 2 means no automatic renewal (user setting).""if the business has no concept of renewal or automatic renewal is not required, it needs to be set to 0.".",
+				Description: " Automatic renewal flag, 0 means the default state (the user has not set it, that is, the initial state is manual renewal, and the user has activated the prepaid non-stop privilege and will also perform automatic renewal).  1 means automatic renewal, 2 means no automatic renewal (user setting).  if the business has no concept of renewal or automatic renewal is not required, it needs to be set to 0.",
 			},
 
 			"security_group_ids": {
@@ -528,10 +528,6 @@ func resourceTencentCloudDcdbDbInstanceRead(d *schema.ResourceData, meta interfa
 
 	dbInstance := ret.Instances[0]
 
-	if dbInstance.Zone != nil {
-		_ = d.Set("zones", []*string{dbInstance.Zone})
-	}
-
 	// if dbInstance.Period != nil {
 	// 	_ = d.Set("period", dbInstance.Period)
 	// }
@@ -683,6 +679,14 @@ func resourceTencentCloudDcdbDbInstanceRead(d *schema.ResourceData, meta interfa
 			_ = d.Set("vip", detail.Vip)
 			_ = d.Set("vipv6", detail.Vip6)
 			_ = d.Set("vport", detail.Vport)
+
+			if detail.MasterZone != nil {
+				zones := []*string{detail.MasterZone}
+				if detail.SlaveZones != nil {
+					zones = append(zones, detail.SlaveZones...)
+				}
+				_ = d.Set("zones", zones)
+			}
 		}
 	} else {
 		return err

tencentcloud/resource_tc_dcdb_hourdb_instance.go

@@ -95,7 +95,7 @@ func resourceTencentCloudDcdbHourdbInstance() *schema.Resource {
 			"subnet_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "subnet id, it's required when vpcId is set.",
+				Description: "subnet id, its required when vpcId is set.",
 			},
 
 			"db_version_id": {
@@ -427,9 +427,6 @@ func resourceTencentCloudDcdbHourdbInstanceRead(d *schema.ResourceData, meta int
 	}
 
 	hourdbInstance := hourdbInstances.Instances[0]
-	if hourdbInstance.Zone != nil {
-		_ = d.Set("zones", []*string{hourdbInstance.Zone})
-	}
 
 	if hourdbInstance.ShardDetail[0] != nil { // Memory and Storage is params for one shard
 		shard := hourdbInstance.ShardDetail[0]
@@ -533,6 +530,14 @@ func resourceTencentCloudDcdbHourdbInstanceRead(d *schema.ResourceData, meta int
 			_ = d.Set("vip", detail.Vip)
 			_ = d.Set("vipv6", detail.Vip6)
 			_ = d.Set("vport", detail.Vport)
+
+			if detail.MasterZone != nil {
+				zones := []*string{detail.MasterZone}
+				if detail.SlaveZones != nil {
+					zones = append(zones, detail.SlaveZones...)
+				}
+				_ = d.Set("zones", zones)
+			}
 		}
 	} else {
 		return err

tencentcloud/resource_tc_dcdb_instance_config.go

@@ -0,0 +1,134 @@
+/*
+Provides a resource to create a dcdb instance_config
+
+Example Usage
+
+```hcl
+resource "tencentcloud_dcdb_instance_config" "instance_config" {
+  instance_id = ""
+  rs_access_strategy =
+}
+```
+
+Import
+
+dcdb instance_config can be imported using the id, e.g.
+
+```
+terraform import tencentcloud_dcdb_instance_config.instance_config instance_config_id
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func resourceTencentCloudDcdbInstanceConfig() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudDcdbInstanceConfigCreate,
+		Read:   resourceTencentCloudDcdbInstanceConfigRead,
+		Update: resourceTencentCloudDcdbInstanceConfigUpdate,
+		Delete: resourceTencentCloudDcdbInstanceConfigDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Schema: map[string]*schema.Schema{
+			"instance_id": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "Instance ID.",
+			},
+
+			"rs_access_strategy": {
+				Required:    true,
+				Type:        schema.TypeInt,
+				Description: "RS nearest access mode, 0-no policy, 1-nearest access.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudDcdbInstanceConfigCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_dcdb_instance_config.create")()
+	defer inconsistentCheck(d, meta)()
+
+	var instanceId string
+	if v, ok := d.GetOk("instance_id"); ok {
+		instanceId = v.(string)
+	}
+	d.SetId(instanceId)
+
+	return resourceTencentCloudDcdbInstanceConfigUpdate(d, meta)
+}
+
+func resourceTencentCloudDcdbInstanceConfigRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_dcdb_instance_config.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := DcdbService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	instanceId := d.Id()
+
+	detail, err := service.DescribeDcdbDbInstanceDetailById(ctx, instanceId)
+	if err != nil {
+		return err
+	}
+
+	if detail == nil {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `DcdbInstanceConfig` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
+	}
+
+	_ = d.Set("instance_id", instanceId)
+
+	if detail.RsAccessStrategy != nil {
+		_ = d.Set("rs_access_strategy", detail.RsAccessStrategy)
+	}
+
+	return nil
+}
+
+func resourceTencentCloudDcdbInstanceConfigUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_dcdb_instance_config.update")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	var (
+		service    = DcdbService{client: meta.(*TencentCloudClient).apiV3Conn}
+		rsStrategy int
+	)
+
+	instanceId := d.Id()
+	if d.HasChange("rs_access_strategy") {
+		if v, ok := d.GetOk("rs_access_strategy"); ok {
+			rsStrategy = v.(int)
+		}
+	}
+
+	err := service.SetRealServerAccessStrategy(ctx, instanceId, rsStrategy)
+
+	if err != nil {
+		log.Printf("[CRITAL]%s update dcdb instanceConfig failed, reason:%+v", logId, err)
+		return err
+	}
+
+	return resourceTencentCloudDcdbInstanceConfigRead(d, meta)
+}
+
+func resourceTencentCloudDcdbInstanceConfigDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_dcdb_instance_config.delete")()
+	defer inconsistentCheck(d, meta)()
+
+	return nil
+}

tencentcloud/resource_tc_dcdb_instance_config_test.go

@@ -0,0 +1,56 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccTencentCloudDcdbInstanceConfigResource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDcdbInstanceConfig,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_dcdb_instance_config.instance_config", "id"),
+					resource.TestCheckResourceAttr("tencentcloud_dcdb_instance_config.instance_config", "rs_access_strategy", "0"),
+				),
+			},
+			{
+				Config: testAccDcdbInstanceConfig_update,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_dcdb_instance_config.instance_config", "id"),
+					resource.TestCheckResourceAttr("tencentcloud_dcdb_instance_config.instance_config", "rs_access_strategy", "1"),
+				),
+			},
+			{
+				ResourceName:      "tencentcloud_dcdb_instance_config.instance_config",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+const testAccDcdbInstanceConfig = CommonPresetDcdb + `
+
+resource "tencentcloud_dcdb_instance_config" "instance_config" {
+  instance_id = "tdsqlshard-970m7tfv"
+  rs_access_strategy = 0
+}
+
+`
+
+const testAccDcdbInstanceConfig_update = CommonPresetDcdb + `
+
+resource "tencentcloud_dcdb_instance_config" "instance_config" {
+  instance_id = "tdsqlshard-970m7tfv"
+  rs_access_strategy = 1
+}
+
+`