Merge pull request #1872 from tencentcloudstack/feat/supoort-dcdb-other-operation

Feat/supoort dcdb rest of operation

Author: lyu571

.changelog/1872.txt

@@ -0,0 +1,15 @@
+```release-note:enhancement
+resource/tencentcloud_dcdb_hourdb_instance: support `rs_access_strategy`, `vip` and `vipv6` field.
+```
+
+```release-note:new-resource
+tencentcloud_dcdb_flush_binlog_operation
+```
+
+```release-note:new-resource
+tencentcloud_dcdb_switch_db_instance_ha_operation
+```
+
+```release-note:new-resource
+tencentcloud_dcdb_instance_config
+```

go.mod

@@ -38,14 +38,14 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.659
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.663
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.672
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.673
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.572
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.652
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.633
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.670
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.673
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.539
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628

go.sum

@@ -1117,9 +1117,12 @@ 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
+	tencentcloud_dcdb_flush_binlog_operation
+	tencentcloud_dcdb_switch_db_instance_ha_operation
 
 Short Message Service(SMS)
   Resource
@@ -2442,9 +2445,12 @@ 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_dcdb_flush_binlog_operation":                resourceTencentCloudDcdbFlushBinlogOperation(),
+			"tencentcloud_dcdb_switch_db_instance_ha_operation":       resourceTencentCloudDcdbSwitchDbInstanceHaOperation(),
 			"tencentcloud_cat_task_set":                               resourceTencentCloudCatTaskSet(),
 			"tencentcloud_mariadb_dedicatedcluster_db_instance":       resourceTencentCloudMariadbDedicatedclusterDbInstance(),
 			"tencentcloud_mariadb_instance":                           resourceTencentCloudMariadbInstance(),

tencentcloud/provider.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_account_privileges.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": {
@@ -173,6 +173,26 @@ func resourceTencentCloudDcdbDbInstance() *schema.Resource {
 				Description: "Whether to open the extranet access.",
 			},
 
+			"vip": {
+				Optional:    true,
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "The field is required to specify VIP.",
+			},
+
+			"vipv6": {
+				Optional:    true,
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "The field is required to specify VIPv6.",
+			},
+
+			"vport": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Intranet port.",
+			},
+
 			"resource_tags": {
 				Optional:    true,
 				Type:        schema.TypeList,
@@ -196,7 +216,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": {
@@ -228,7 +248,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": {
@@ -255,6 +275,8 @@ func resourceTencentCloudDcdbDbInstanceCreate(d *schema.ResourceData, meta inter
 		response      = dcdb.NewCreateDCDBInstanceResponse()
 		instanceId    string
 		dcnInstanceId string
+		vpcId         string
+		subnetId      string
 		ipv6Flag      int
 		service       = DcdbService{client: meta.(*TencentCloudClient).apiV3Conn}
 	)
@@ -442,6 +464,29 @@ func resourceTencentCloudDcdbDbInstanceCreate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	var (
+		vip   string
+		vipv6 string
+	)
+
+	if v, ok := d.GetOk("vip"); ok {
+		vip = v.(string)
+	}
+	if v, ok := d.GetOk("vipv6"); ok {
+		vipv6 = v.(string)
+	}
+
+	if vip != "" || vipv6 != "" {
+		if vpcId == "" || subnetId == "" {
+			return fmt.Errorf("`vpc_id` and `subnet_id` cannot be empty when setting `vip` or `vipv6` fields!")
+		}
+
+		err := service.SetNetworkVip(ctx, instanceId, vpcId, subnetId, vip, vipv6)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceTencentCloudDcdbDbInstanceRead(d, meta)
 }
 
@@ -469,10 +514,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)
 	// }
@@ -584,7 +625,7 @@ func resourceTencentCloudDcdbDbInstanceRead(d *schema.ResourceData, meta interfa
 		_ = d.Set("auto_renew_flag", dbInstance.AutoRenewFlag)
 	}
 
-	if sg, err := service.DescribeDcdbSecurityGroup(ctx, instanceId); sg != nil {
+	if sg, err := service.DescribeDcdbSecurityGroup(ctx, instanceId); err == nil {
 		sgIds := []*string{}
 		for _, sg := range sg.Groups {
 			sgIds = append(sgIds, sg.SecurityGroupId)
@@ -604,7 +645,7 @@ func resourceTencentCloudDcdbDbInstanceRead(d *schema.ResourceData, meta interfa
 	}
 
 	// set dcn id and region
-	if dcns, err := service.DescribeDcnDetailById(ctx, instanceId); dcns != nil {
+	if dcns, err := service.DescribeDcnDetailById(ctx, instanceId); err == nil {
 		for _, dcn := range dcns {
 			var master *dcdb.DcnDetailItem
 			if *dcn.DcnFlag == DCDB_DCN_FLAG_MASTER {
@@ -617,6 +658,25 @@ func resourceTencentCloudDcdbDbInstanceRead(d *schema.ResourceData, meta interfa
 		return err
 	}
 
+	// set vip, vipv6 and vport
+	if detail, err := service.DescribeDcdbDbInstanceDetailById(ctx, instanceId); err == nil {
+		if detail != nil {
+			_ = 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
+	}
+
 	return nil
 }
 
@@ -688,7 +748,6 @@ func resourceTencentCloudDcdbDbInstanceUpdate(d *schema.ResourceData, meta inter
 		return fmt.Errorf("`shard_count` do not support change now.")
 	}
 
-	// if d.HasChange("extranet_access") {
 	if v, ok := d.GetOkExists("extranet_access"); ok && v != nil {
 		flag := v.(bool)
 		var ipv6Flag int
@@ -701,7 +760,6 @@ func resourceTencentCloudDcdbDbInstanceUpdate(d *schema.ResourceData, meta inter
 		}
 		time.Sleep(2 * time.Second)
 	}
-	// }
 
 	if d.HasChange("project_id") {
 		if projectId, ok := d.GetOk("project_id"); ok {
@@ -726,12 +784,37 @@ func resourceTencentCloudDcdbDbInstanceUpdate(d *schema.ResourceData, meta inter
 		}
 		time.Sleep(2 * time.Second)
 	}
-	if d.HasChange("vpc_id") {
-		return fmt.Errorf("`vpc_id` do not support change now.")
-	}
-	if d.HasChange("subnet_id") {
-		return fmt.Errorf("`subnet_id` do not support change now.")
+
+	if d.HasChange("vpc_id") || d.HasChange("subnet_id") || d.HasChange("vip") || d.HasChange("vipv6") {
+		var (
+			vip      string
+			vipv6    string
+			vpcId    string
+			subnetId string
+		)
+		if v, ok := d.GetOk("vip"); ok {
+			vip = v.(string)
+		}
+		if v, ok := d.GetOk("vipv6"); ok {
+			vipv6 = v.(string)
+		}
+		if v, ok := d.GetOk("vpc_id"); ok {
+			vpcId = v.(string)
+		}
+		if v, ok := d.GetOk("subnet_id"); ok {
+			subnetId = v.(string)
+		}
+
+		if vpcId == "" || subnetId == "" {
+			return fmt.Errorf("`vpc_id` and `subnet_id` cannot be empty when updating network configs!")
+		}
+
+		err := service.SetNetworkVip(ctx, instanceId, vpcId, subnetId, vip, vipv6)
+		if err != nil {
+			return err
+		}
 	}
+
 	if d.HasChange("db_version_id") {
 		return fmt.Errorf("`db_version_id` do not support change now.")
 	}