fix: clear cvm data_disk & redis support replicas_read_only (#882)

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

tencentcloud/resource_tc_instance.go

@@ -1577,7 +1577,81 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-
+	if v, ok := d.GetOk("data_disks"); ok {
+		dataDisks := v.([]interface{})
+		for _, d := range dataDisks {
+			value := d.(map[string]interface{})
+			diskId := value["data_disk_id"].(string)
+			deleteWithInstance := value["delete_with_instance"].(bool)
+			if deleteWithInstance {
+				cbsService := CbsService{client: meta.(*TencentCloudClient).apiV3Conn}
+				err := resource.Retry(readRetryTimeout*2, func() *resource.RetryError {
+					diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+					if e != nil {
+						return retryError(e, InternalError)
+					}
+					if *diskInfo.DiskState != CBS_STORAGE_STATUS_UNATTACHED {
+						return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+					}
+					return nil
+				})
+				if err != nil {
+					log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+				err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+					e := cbsService.DeleteDiskById(ctx, diskId)
+					if e != nil {
+						return retryError(e, InternalError)
+					}
+					return nil
+				})
+				if err != nil {
+					log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+				err = resource.Retry(readRetryTimeout*2, func() *resource.RetryError {
+					diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+					if e != nil {
+						return retryError(e, InternalError)
+					}
+					if *diskInfo.DiskState == CBS_STORAGE_STATUS_TORECYCLE {
+						return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+					}
+					return nil
+				})
+				if err != nil {
+					log.Printf("[CRITAL]%s read cbs status failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+				err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+					e := cbsService.DeleteDiskById(ctx, diskId)
+					if e != nil {
+						return retryError(e, InternalError)
+					}
+					return nil
+				})
+				if err != nil {
+					log.Printf("[CRITAL]%s delete cbs failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+				err = resource.Retry(readRetryTimeout*2, func() *resource.RetryError {
+					diskInfo, e := cbsService.DescribeDiskById(ctx, diskId)
+					if e != nil {
+						return retryError(e, InternalError)
+					}
+					if diskInfo != nil {
+						return resource.RetryableError(fmt.Errorf("cbs storage status is %s", *diskInfo.DiskState))
+					}
+					return nil
+				})
+				if err != nil {
+					log.Printf("[CRITAL]%s read cbs status failed, reason:%s\n ", logId, err.Error())
+					return err
+				}
+			}
+		}
+	}
 	return nil
 }
 

tencentcloud/resource_tc_redis_instance.go

@@ -165,6 +165,13 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
 				ForceNew:    true,
 				Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.",
 			},
+			"replicas_read_only": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				ForceNew:    true,
+				Default:     false,
+				Description: "Whether copy read-only is supported, Redis 2.8 Standard Edition and CKV Standard Edition do not support replica read-only, turn on replica read-only, the instance will automatically read and write separate, write requests are routed to the primary node, read requests are routed to the replica node, if you need to open replica read-only, the recommended number of replicas >=2.",
+			},
 			"mem_size": {
 				Type:        schema.TypeInt,
 				Required:    true,
@@ -291,6 +298,7 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 	chargeType := d.Get("charge_type").(string)
 	autoRenewFlag := d.Get("auto_renew_flag").(int)
 	chargeTypeID := REDIS_CHARGE_TYPE_ID[chargeType]
+	replicasReadonly := d.Get("replicas_read_only").(bool)
 	var chargePeriod uint64 = 1
 	if chargeType == REDIS_CHARGE_TYPE_PREPAID {
 		if period, ok := d.GetOk("prepaid_period"); ok {
@@ -427,6 +435,7 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 		nodeInfo,
 		noAuth,
 		autoRenewFlag,
+		replicasReadonly,
 	)
 
 	if err != nil {
@@ -546,6 +555,12 @@ func resourceTencentCloudRedisInstanceRead(d *schema.ResourceData, meta interfac
 	_ = d.Set("ip", info.WanIp)
 	_ = d.Set("create_time", info.Createtime)
 	_ = d.Set("auto_renew_flag", info.AutoRenewFlag)
+	slaveReadWeight := *info.SlaveReadWeight
+	if slaveReadWeight == 0 {
+		_ = d.Set("replicas_read_only", false)
+	} else if slaveReadWeight == 100 {
+		_ = d.Set("replicas_read_only", true)
+	}
 
 	// only true or user explicit declared will set for import case.
 	if _, ok := d.GetOk("no_auth"); ok || *info.NoAuth {

tencentcloud/service_tencentcloud_redis.go

@@ -250,6 +250,7 @@ func (me *RedisService) CreateInstances(ctx context.Context,
 	nodeInfo []*redis.RedisNodeInfo,
 	noAuth bool,
 	autoRenewFlag int,
+	replicasReadonly bool,
 ) (instanceIds []*string, errRet error) {
 
 	logId := getLogId(ctx)
@@ -328,6 +329,9 @@ func (me *RedisService) CreateInstances(ctx context.Context,
 	if chargeTypeID == REDIS_CHARGE_TYPE_ID[REDIS_CHARGE_TYPE_PREPAID] {
 		request.AutoRenew = helper.IntUint64(autoRenewFlag)
 	}
+	if replicasReadonly {
+		request.ReplicasReadonly = &replicasReadonly
+	}
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseRedisClient().CreateInstances(request)
 	if err != nil {

website/docs/r/redis_instance.html.markdown

@@ -81,6 +81,7 @@ The following arguments are supported:
 * `redis_replicas_num` - (Optional, ForceNew) The number of instance copies. This is not required for standalone and master slave versions.
 * `redis_shard_num` - (Optional, ForceNew) The number of instance shard. This is not required for standalone and master slave versions.
 * `replica_zone_ids` - (Optional, ForceNew) ID of replica nodes available zone. This is not required for standalone and master slave versions.
+* `replicas_read_only` - (Optional, ForceNew) Whether copy read-only is supported, Redis 2.8 Standard Edition and CKV Standard Edition do not support replica read-only, turn on replica read-only, the instance will automatically read and write separate, write requests are routed to the primary node, read requests are routed to the replica node, if you need to open replica read-only, the recommended number of replicas >=2.
 * `security_groups` - (Optional, ForceNew) ID of security group. If both vpc_id and subnet_id are not set, this argument should not be set either.
 * `subnet_id` - (Optional, ForceNew) Specifies which subnet the instance should belong to.
 * `tags` - (Optional) Instance tags.