add

Author: SevenEarth

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.973
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -73,7 +73,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.873
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.859
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts v1.0.762
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.657
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.973
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum v1.0.744
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.807
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.748

go.sum

@@ -970,6 +970,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.970 h1:IsF+
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.970/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971 h1:T5zEH1QM1XX+hJoAe4krnSjrnsTgHv1KfGC4Sos0Y4M=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.973 h1:XtrGe/XEyusLgGiv1DpEg9SRR7sxsSbIgAhMxcEVbjY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.973/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1046,6 +1048,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts v1.0.762 h1:rZDKucV
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts v1.0.762/go.mod h1:QB/XcdVZ8mhRgk90XuXd+2Smfo8emTo0wHIUsygEaKs=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.657 h1:9p/4/qXtnBIYkz5b5mYAhp1XhnIn5jUkxxfllF8hMMM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.657/go.mod h1:CPc7SSKl8I21UmhTf2AVYZqZfy8MbDr/RrMsSqMkOAM=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.971 h1:G8+MTbUpCxB1XambBBCWbhxvSXAd6nSHC0p/gONaCDw=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.971/go.mod h1:dZboVm97Cz4p3ARJAx+08LQOYYNKI8fKCIhJd9xdMLw=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.973 h1:DsSTfkZQ5cPeVwol8zo4kYg57AFFHqEr0fdpke0eRtI=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.973/go.mod h1:Z+EvpolXVYJ8/VbdCLUen73PfwFAqIWHCOV5xrkFnPA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920 h1:Kaab57oHrhiagHURsTNU/XfRFWXXSWxOXoix+YvLHrY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920/go.mod h1:AhvwfhTo0JOz2FG4FcmVVdxJ73NpPAQ7rzjjWoEYFOw=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum v1.0.744 h1:Z6xqpgnVPQfw2Yx/c2z6n30LfNodK4JEgMca1WpfOrY=

tencentcloud/services/crs/resource_tc_redis_instance.go

@@ -161,42 +161,48 @@ func ResourceTencentCloudRedisInstance() *schema.Resource {
 				Optional:    true,
 				Description: "Specify params template id. If not set, will use default template.",
 			},
-
 			"operation_network": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ValidateFunc: tccommon.ValidateAllowedStringValue(REDIS_MODIFY_NETWORK_CONFIG),
 				Description:  "Refers to the category of the pre-modified network, including: `changeVip`: refers to switching the private network, including its intranet IPv4 address and port; `changeVpc`: refers to switching the subnet to which the private network belongs; `changeBaseToVpc`: refers to switching the basic network to a private network; `changeVPort`: refers to only modifying the instance network port.",
 			},
-
 			"recycle": {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				ValidateFunc: tccommon.ValidateAllowedIntValue(REDIS_RECYCLE_TIME),
 				Description:  "Original intranet IPv4 address retention time: unit: day, value range: `0`, `1`, `2`, `3`, `7`, `15`.",
 			},
-
 			"ip": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Computed:    true,
 				Description: "IP address of an instance. When the `operation_network` is `changeVip`, this parameter needs to be configured.",
 			},
-
 			"wait_switch": {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Description: "Switching mode: `1`-maintenance time window switching, `2`-immediate switching, default value `2`.",
 			},
-
+			"product_version": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Specify the product version of the instance. `local`: Local disk version, `cloud`: Cloud disk version, `cdc`: Exclusive cluster version. Default is `local`.",
+			},
+			"redis_cluster_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Exclusive cluster ID. When the `product_version` is set to `cdc`, this parameter must be set.",
+			},
 			"tags": {
 				Type:     schema.TypeMap,
 				Optional: true,
 				//internal version: replace tagComputed begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 				//internal version: replace tagComputed end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 				Description: "Instance tags.",
 			},
-
 			// Computed values
 			"status": {
 				Type:        schema.TypeString,
@@ -267,15 +273,17 @@ func ResourceTencentCloudRedisInstance() *schema.Resource {
 func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	defer tccommon.LogElapsed("resource.tencentcloud_redis_instance.create")()
 
-	logId := tccommon.GetLogId(tccommon.ContextNil)
-	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+	var (
+		logId        = tccommon.GetLogId(tccommon.ContextNil)
+		ctx          = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+		client       = meta.(tccommon.ProviderMeta).GetAPIV3Conn()
+		redisService = RedisService{client: client}
+		tagService   = svctag.NewTagService(client)
+		region       = client.Region
+	)
 
-	client := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
-	redisService := RedisService{client: client}
-	tagService := svctag.NewTagService(client)
 	//internal version: replace clientCreate begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 	//internal version: replace clientCreate end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
-	region := client.Region
 
 	availabilityZone := d.Get("availability_zone").(string)
 	redisName := d.Get("name").(string)
@@ -285,6 +293,7 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 	if v, ok := d.GetOk("redis_shard_num"); ok {
 		redisShardNum = v.(int)
 	}
+
 	redisReplicasNum := d.Get("redis_replicas_num").(int)
 	password := d.Get("password").(string)
 	noAuth := d.Get("no_auth").(bool)
@@ -298,11 +307,18 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 	autoRenewFlag := d.Get("auto_renew_flag").(int)
 	paramsTemplateId := d.Get("params_template_id").(string)
 	operation := d.Get("operation_network").(string)
+	productVersion := d.Get("product_version").(string)
+	redisClusterId := d.Get("redis_cluster_id").(string)
+	if productVersion == "cdc" && redisClusterId == "" {
+		return fmt.Errorf("If `product_version` is set to `cdc`, params `redis_cluster_id` must be set\n.")
+	}
+
 	chargeTypeID := REDIS_CHARGE_TYPE_ID[chargeType]
 	var replicasReadonly bool
 	if v, ok := d.GetOk("replicas_read_only"); ok {
 		replicasReadonly = v.(bool)
 	}
+
 	var chargePeriod uint64 = 1
 	if chargeType == REDIS_CHARGE_TYPE_PREPAID {
 		if period, ok := d.GetOk("prepaid_period"); ok {
@@ -335,6 +351,7 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 	if err != nil {
 		return fmt.Errorf("api[DescribeRedisZoneConfig]fail, return %s", err.Error())
 	}
+
 	var regionItem *redis.RegionConf
 	var zoneItem *redis.ZoneCapacityConf
 	var redisItem *redis.ProductConf
@@ -343,18 +360,22 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 			break
 		}
 	}
+
 	if regionItem == nil {
 		return fmt.Errorf("all redis in this region `%s` be sold out", region)
 	}
+
 	for _, zones := range regionItem.ZoneSet {
 		if *zones.IsSaleout {
 			continue
 		}
+
 		if *zones.ZoneName == availabilityZone {
 			zoneItem = zones
 			break
 		}
 	}
+
 	if zoneItem == nil {
 		return fmt.Errorf("all redis in this zone `%s` be sold out", availabilityZone)
 	}
@@ -365,18 +386,22 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 			break
 		}
 	}
+
 	if redisItem == nil {
 		return fmt.Errorf("redis type_id `%d` be sold out or this type_id is not supports", typeId)
 	}
+
 	var redisShardNums []string
 	var redisReplicasNums []string
 	var numErrors []string
 	for _, v := range redisItem.ShardNum {
 		redisShardNums = append(redisShardNums, *v)
 	}
+
 	for _, v := range redisItem.ReplicaNum {
 		redisReplicasNums = append(redisReplicasNums, *v)
 	}
+
 	if !tccommon.IsContains(redisShardNums, fmt.Sprintf("%d", redisShardNum)) {
 		numErrors = append(numErrors, fmt.Sprintf("redis_shard_num : %s", strings.Join(redisShardNums, ",")))
 	}
@@ -449,7 +474,10 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 		autoRenewFlag,
 		replicasReadonly,
 		paramsTemplateId,
+		productVersion,
+		redisClusterId,
 	)
+
 	//internal version: replace varId begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 	//internal version: replace varId end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 	if err != nil {
@@ -476,6 +504,7 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 		log.Printf("[CRITAL]%s create redis task fail, reason:%s\n", logId, err.Error())
 		return err
 	}
+
 	d.SetId(redisId)
 	//internal version: replace queryAndSetId end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 
@@ -582,6 +611,8 @@ 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)
+	_ = d.Set("product_version", info.)
+	_ = d.Set("redis_cluster_id", info.)
 	slaveReadWeight := *info.SlaveReadWeight
 	if slaveReadWeight == 0 {
 		_ = d.Set("replicas_read_only", false)

tencentcloud/services/crs/service_tencentcloud_redis.go

@@ -263,6 +263,8 @@ func (me *RedisService) CreateInstances(ctx context.Context,
 	autoRenewFlag int,
 	replicasReadonly bool,
 	paramsTemplateId string,
+	productVersion string,
+	redisClusterId string,
 ) (instanceIds []*string, errRet error) {
 
 	logId := tccommon.GetLogId(ctx)
@@ -347,6 +349,12 @@ func (me *RedisService) CreateInstances(ctx context.Context,
 	if paramsTemplateId != "" {
 		request.TemplateId = &paramsTemplateId
 	}
+	if productVersion != "" {
+		request.ProductVersion = &productVersion
+	}
+	if redisClusterId != "" {
+		request.RedisClusterId = &redisClusterId
+	}
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseRedisClient().CreateInstances(request)
 	if err != nil {