[code review]

1. fix review for retry

Author: brickzzhang

tencentcloud/data_source_tc_cynosdb_clusters.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	cynosdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -163,57 +164,56 @@ func dataSourceTencentCloudCynosdbClustersRead(d *schema.ResourceData, meta inte
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 
-	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		clusters, e := cynosdbService.DescribeClusters(ctx, params)
-		if e != nil {
-			return retryError(e)
+	var clusters []*cynosdb.CynosdbCluster
+	var err error
+	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		clusters, err = cynosdbService.DescribeClusters(ctx, params)
+		if err != nil {
+			return retryError(err)
 		}
-		ids := make([]string, 0, len(clusters))
-		clusterList := make([]map[string]interface{}, 0, len(clusters))
-		for _, cluster := range clusters {
-			if clusterType != "" && clusterType != *cluster.DbType {
-				continue
-			}
-			mapping := map[string]interface{}{
-				"cluster_id":      cluster.ClusterId,
-				"cluster_name":    cluster.ClusterName,
-				"cluster_limit":   cluster.StorageLimit,
-				"db_type":         cluster.DbType,
-				"available_zone":  cluster.Zone,
-				"project_id":      cluster.ProjectID,
-				"create_time":     cluster.CreateTime,
-				"cluster_status":  cluster.Status,
-				"auto_renew_flag": cluster.RenewFlag,
-				"port":            cluster.Vport,
-				"vpc_id":          cluster.VpcId,
-				"subnet_id":       cluster.SubnetId,
-				"db_version":      cluster.DbVersion,
-				"charge_type":     CYNOSDB_CHARGE_TYPE[*cluster.PayMode],
-			}
-
-			clusterList = append(clusterList, mapping)
-			ids = append(ids, *cluster.ClusterId)
-		}
-
-		d.SetId(helper.DataResourceIdsHash(ids))
-		if e = d.Set("cluster_list", clusterList); e != nil {
-			log.Printf("[CRITAL]%s provider set cluster list fail, reason:%s\n ", logId, e.Error())
-			return resource.NonRetryableError(e)
-		}
-
-		output, ok := d.GetOk("result_output_file")
-		if ok && output.(string) != "" {
-			if e := writeToFile(output.(string), clusterList); e != nil {
-				return resource.NonRetryableError(e)
-			}
-		}
-
 		return nil
 	})
 	if err != nil {
 		log.Printf("[CRITAL]%s read cynosdb clusters failed, reason:%s\n ", logId, err.Error())
 		return err
 	}
 
+	ids := make([]string, 0, len(clusters))
+	clusterList := make([]map[string]interface{}, 0, len(clusters))
+	for _, cluster := range clusters {
+		if clusterType != "" && clusterType != *cluster.DbType {
+			continue
+		}
+		mapping := map[string]interface{}{
+			"cluster_id":      cluster.ClusterId,
+			"cluster_name":    cluster.ClusterName,
+			"cluster_limit":   cluster.StorageLimit,
+			"db_type":         cluster.DbType,
+			"available_zone":  cluster.Zone,
+			"project_id":      cluster.ProjectID,
+			"create_time":     cluster.CreateTime,
+			"cluster_status":  cluster.Status,
+			"auto_renew_flag": cluster.RenewFlag,
+			"port":            cluster.Vport,
+			"vpc_id":          cluster.VpcId,
+			"subnet_id":       cluster.SubnetId,
+			"db_version":      cluster.DbVersion,
+			"charge_type":     CYNOSDB_CHARGE_TYPE[*cluster.PayMode],
+		}
+
+		clusterList = append(clusterList, mapping)
+		ids = append(ids, *cluster.ClusterId)
+	}
+
+	d.SetId(helper.DataResourceIdsHash(ids))
+	_ = d.Set("cluster_list", clusterList)
+
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if err = writeToFile(output.(string), clusterList); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }

tencentcloud/extension_cynosdb.go

@@ -101,6 +101,7 @@ func TencentCynosdbClusterBaseInfo() map[string]*schema.Schema {
 		"project_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
+			ForceNew:    true,
 			Default:     0,
 			Description: "ID of the project. `0` by default.",
 		},
@@ -113,16 +114,19 @@ func TencentCynosdbClusterBaseInfo() map[string]*schema.Schema {
 		"vpc_id": {
 			Type:        schema.TypeString,
 			Required:    true,
+			ForceNew:    true,
 			Description: "ID of the VPC.",
 		},
 		"subnet_id": {
 			Type:        schema.TypeString,
 			Required:    true,
+			ForceNew:    true,
 			Description: "ID of the subnet within this VPC.",
 		},
 		"port": {
 			Type:        schema.TypeInt,
 			Optional:    true,
+			ForceNew:    true,
 			Default:     5432,
 			Description: "Port of CynosDB cluster.",
 		},
@@ -141,16 +145,19 @@ func TencentCynosdbClusterBaseInfo() map[string]*schema.Schema {
 		"storage_limit": {
 			Type:        schema.TypeInt,
 			Required:    true,
+			ForceNew:    true,
 			Description: "Storage limit of CynosDB cluster instance, unit in GB.",
 		},
 		"cluster_name": {
 			Type:        schema.TypeString,
 			Required:    true,
+			ForceNew:    true,
 			Description: "Name of CynosDB cluster.",
 		},
 		"password": {
 			Type:        schema.TypeString,
 			Required:    true,
+			ForceNew:    true,
 			Sensitive:   true,
 			Description: "Password of `root` account.",
 		},
@@ -166,12 +173,14 @@ func TencentCynosdbClusterBaseInfo() map[string]*schema.Schema {
 		"prepaid_period": {
 			Type:         schema.TypeInt,
 			Optional:     true,
+			ForceNew:     true,
 			ValidateFunc: validateAllowedIntValue(CYNOSDB_PREPAID_PERIOD),
 			Description:  "The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.",
 		},
 		"auto_renew_flag": {
 			Type:        schema.TypeInt,
 			Optional:    true,
+			ForceNew:    true,
 			Default:     0,
 			Description: "Auto renew flag. Valid values are `0`(MANUAL_RENEW), `1`(AUTO_RENEW). Default value is `0`. Only works for PREPAID cluster.",
 		},

tencentcloud/resource_tc_cynosdb_cluster.go

@@ -397,17 +397,6 @@ func resourceTencentCloudCynosdbClusterUpdate(d *schema.ResourceData, meta inter
 		region         = client.Region
 	)
 
-	// check unsupported field modification
-	unsupported := []string{
-		"project_id", "vpc_id", "subnet_id", "port", "storage_limit", "cluster_name",
-		"password", "prepaid_period", "auto_renew_flag",
-	}
-	for _, v := range unsupported {
-		if d.HasChange(v) {
-			return fmt.Errorf("[CRITAL] field %s is not allowed to be modified", v)
-		}
-	}
-
 	d.Partial(true)
 
 	if d.HasChange("instance_cpu_core") || d.HasChange("instance_memory_size") {

website/docs/r/cynosdb_cluster.html.markdown

@@ -58,24 +58,24 @@ resource "tencentcloud_cynosdb_cluster" "foo" {
 The following arguments are supported:
 
 * `available_zone` - (Required, ForceNew) The available zone of the CynosDB Cluster.
-* `cluster_name` - (Required) Name of CynosDB cluster.
+* `cluster_name` - (Required, ForceNew) Name of CynosDB cluster.
 * `db_type` - (Required, ForceNew) Type of CynosDB, and available values include `MYSQL`.
 * `db_version` - (Required, ForceNew) Version of CynosDB, which is related to `db_type`. For `MYSQL`, available value is `5.7`.
 * `instance_cpu_core` - (Required) The number of CPU cores of read-write type instance in the CynosDB cluster. Note: modification of this field will take effect immediately, if want to upgrade on maintenance window, please upgrade from console.
 * `instance_memory_size` - (Required) Memory capacity of read-write type instance, unit in GB. Note: modification of this field will take effect immediately, if want to upgrade on maintenance window, please upgrade from console.
-* `password` - (Required) Password of `root` account.
-* `storage_limit` - (Required) Storage limit of CynosDB cluster instance, unit in GB.
-* `subnet_id` - (Required) ID of the subnet within this VPC.
-* `vpc_id` - (Required) ID of the VPC.
-* `auto_renew_flag` - (Optional) Auto renew flag. Valid values are `0`(MANUAL_RENEW), `1`(AUTO_RENEW). Default value is `0`. Only works for PREPAID cluster.
+* `password` - (Required, ForceNew) Password of `root` account.
+* `storage_limit` - (Required, ForceNew) Storage limit of CynosDB cluster instance, unit in GB.
+* `subnet_id` - (Required, ForceNew) ID of the subnet within this VPC.
+* `vpc_id` - (Required, ForceNew) ID of the VPC.
+* `auto_renew_flag` - (Optional, ForceNew) Auto renew flag. Valid values are `0`(MANUAL_RENEW), `1`(AUTO_RENEW). Default value is `0`. Only works for PREPAID cluster.
 * `charge_type` - (Optional, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`.
 * `force_delete` - (Optional) Indicate whether to delete cluster instance directly or not. Default is false. If set true, the cluster and its `All RELATED INSTANCES` will be deleted instead of staying recycle bin. Note: works for both `PREPAID` and `POSTPAID_BY_HOUR` cluster.
 * `instance_maintain_duration` - (Optional) Duration time for maintenance, unit in second. `3600` by default.
 * `instance_maintain_start_time` - (Optional) Offset time from 00:00, unit in second. For example, 03:00am should be `10800`. `10800` by default.
 * `instance_maintain_weekdays` - (Optional) Weekdays for maintenance. `["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]` by default.
-* `port` - (Optional) Port of CynosDB cluster.
-* `prepaid_period` - (Optional) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.
-* `project_id` - (Optional) ID of the project. `0` by default.
+* `port` - (Optional, ForceNew) Port of CynosDB cluster.
+* `prepaid_period` - (Optional, ForceNew) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.
+* `project_id` - (Optional, ForceNew) ID of the project. `0` by default.
 * `ro_group_sg` - (Optional) IDs of security group for `ro_group`.
 * `rw_group_sg` - (Optional) IDs of security group for `rw_group`.
 * `tags` - (Optional) The tags of the CynosDB cluster.