Merge pull request #712 from tencentcloudstack/feat/redis-replica-zone-ids

feat: redis - support multi replica az

Author: Kagashino

tencentcloud/data_source_tc_redis_instances.go

@@ -152,6 +152,30 @@ func dataSourceTencentRedisInstances() *schema.Resource {
 							Computed:    true,
 							Description: "The charge type of instance. Valid values are `POSTPAID` and `PREPAID`.",
 						},
+						"node_info": {
+							Type:        schema.TypeList,
+							Computed:    true,
+							Description: "List of instance node information. Currently, information about the node type (master or replica) and node availability zone can be passed in.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"master": {
+										Type:        schema.TypeBool,
+										Computed:    true,
+										Description: "Indicates whether the node is master.",
+									},
+									"id": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "ID of the master or replica node.",
+									},
+									"zone_id": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "ID of the availability zone of the master or replica node.",
+									},
+								},
+							},
+						},
 					},
 				},
 			},
@@ -241,6 +265,7 @@ instanceLoop:
 		instanceDes["redis_replicas_num"] = instance.RedisReplicasNum
 		instanceDes["type_id"] = instance.TypeId
 		instanceDes["charge_type"] = instance.BillingMode
+		instanceDes["node_info"] = instance.NodeInfo
 		instanceList = append(instanceList, instanceDes)
 	}
 

tencentcloud/extension_redis.go

@@ -6,6 +6,7 @@ const (
 	REDIS_VERSION_MASTER_SLAVE_CKV    = 3
 	REDIS_VERSION_CLUSTER_CKV         = 4
 	REDIS_VERSION_STANDALONE_REDIS    = 5
+	REDIS_VERSION_MASTER_SLAVE_REDIS4 = 6
 	REDIS_VERSION_CLUSTER_REDIS       = 7
 	REDIS_VERSION_MASTER_SLAVE_REDIS5 = 8
 	REDIS_VERSION_CLUSTER_REDIS5      = 9
@@ -17,6 +18,7 @@ var REDIS_NAMES = map[int64]string{
 	REDIS_VERSION_CLUSTER_REDIS:       "cluster_redis",
 	REDIS_VERSION_CLUSTER_CKV:         "cluster_ckv",
 	REDIS_VERSION_STANDALONE_REDIS:    "standalone_redis",
+	REDIS_VERSION_MASTER_SLAVE_REDIS4: "master_slave_redis4.0",
 	REDIS_VERSION_MASTER_SLAVE_REDIS5: "master_slave_redis5.0",
 	REDIS_VERSION_CLUSTER_REDIS5:      "cluster_redis5.0",
 }

tencentcloud/provider.go

@@ -930,7 +930,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_monitor_policy_group":                    resourceTencentMonitorPolicyGroup(),
 			"tencentcloud_monitor_binding_object":                  resourceTencentMonitorBindingObject(),
 			"tencentcloud_monitor_binding_receiver":                resourceTencentMonitorBindingAlarmReceiver(),
-			"tencentcloud_monitor_alarm_policy":					resourceTencentMonitorAlarmPolicy(),
+			"tencentcloud_monitor_alarm_policy":                    resourceTencentMonitorAlarmPolicy(),
 			"tencentcloud_mongodb_standby_instance":                resourceTencentCloudMongodbStandbyInstance(),
 			"tencentcloud_elasticsearch_instance":                  resourceTencentCloudElasticsearchInstance(),
 			"tencentcloud_postgresql_instance":                     resourceTencentCloudPostgresqlInstance(),

tencentcloud/resource_tc_monitor_policy_group.go

@@ -67,10 +67,10 @@ import (
 func resourceTencentMonitorPolicyGroup() *schema.Resource {
 	return &schema.Resource{
 		DeprecationMessage: "This resource has been deprecated in Terraform TencentCloud provider version 1.59.18. Please use 'tencentcloud_alarm_policy' instead.",
-		Create: resourceTencentMonitorPolicyGroupCreate,
-		Read:   resourceTencentMonitorPolicyGroupRead,
-		Update: resourceTencentMonitorPolicyGroupUpdate,
-		Delete: resourceTencentMonitorPolicyGroupDelete,
+		Create:             resourceTencentMonitorPolicyGroupCreate,
+		Read:               resourceTencentMonitorPolicyGroupRead,
+		Update:             resourceTencentMonitorPolicyGroupUpdate,
+		Delete:             resourceTencentMonitorPolicyGroupDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},

tencentcloud/resource_tc_redis_instance.go

@@ -19,6 +19,39 @@ resource "tencentcloud_redis_instance" "redis_instance_test_2" {
 }
 ```
 
+Using multi replica zone set
+```
+data "tencentcloud_availability_zones" "az" {
+
+}
+
+variable "redis_replicas_num" {
+  default = 3
+}
+
+resource "tencentcloud_redis_instance" "red1" {
+  availability_zone  = data.tencentcloud_availability_zones.az.zones[0].name
+  charge_type        = "POSTPAID"
+  mem_size           = 1024
+  name               = "test-redis"
+  port               = 6379
+  project_id         = 0
+  redis_replicas_num = var.redis_replicas_num
+  redis_shard_num    = 1
+  security_groups    = [
+    "sg-d765yoec",
+  ]
+  subnet_id          = "subnet-ie01x91v"
+  type_id            = 6
+  vpc_id             = "vpc-k4lrsafc"
+  password = "a12121312334"
+
+  replica_zone_ids = [
+    for i in range(var.redis_replicas_num)
+    : data.tencentcloud_availability_zones.az.zones[i % length(data.tencentcloud_availability_zones.az.zones)].id ]
+}
+```
+
 Import
 
 Redis instance can be imported, e.g.
@@ -95,6 +128,13 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
 				Default:     1,
 				Description: "The number of instance copies. This is not required for standalone and master slave versions.",
 			},
+			"replica_zone_ids": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "ID of replica nodes available zone. This is not required for standalone and master slave versions.",
+				Elem:        &schema.Schema{Type: schema.TypeInt},
+			},
 			"type": {
 				Type:     schema.TypeString,
 				ForceNew: true,
@@ -203,7 +243,6 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
 			"force_delete": {
 				Type:        schema.TypeBool,
 				Optional:    true,
-				Default:     false,
 				Description: "Indicate whether to delete Redis instance directly or not. Default is false. If set true, the instance will be deleted instead of staying recycle bin. Note: only works for `PREPAID` instance.",
 			},
 		},
@@ -320,6 +359,32 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 		requestSecurityGroup = append(requestSecurityGroup, v.(string))
 	}
 
+	service := RedisService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	nodeInfo := make([]*redis.RedisNodeInfo, 0)
+	if raw, ok := d.GetOk("replica_zone_ids"); ok {
+		zoneIds := raw.([]interface{})
+
+		masterZoneId, err := service.getZoneId(availabilityZone)
+		if err != nil {
+			return err
+		}
+
+		// insert master node
+		nodeInfo = append(nodeInfo, &redis.RedisNodeInfo{
+			NodeType: helper.Int64(0),
+			ZoneId:   helper.Int64Uint64(masterZoneId),
+		})
+
+		for _, v := range zoneIds {
+			id := v.(int)
+			nodeInfo = append(nodeInfo, &redis.RedisNodeInfo{
+				NodeType: helper.Int64(1),
+				ZoneId:   helper.IntUint64(id),
+			})
+		}
+	}
+
 	instanceIds, err := redisService.CreateInstances(ctx,
 		availabilityZone,
 		typeId,
@@ -335,6 +400,7 @@ func resourceTencentCloudRedisInstanceCreate(d *schema.ResourceData, meta interf
 		redisReplicasNum,
 		chargeTypeID,
 		chargePeriod,
+		nodeInfo,
 	)
 
 	if err != nil {
@@ -429,8 +495,9 @@ func resourceTencentCloudRedisInstanceRead(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	//not set field type_id
-	if d.Get("type_id").(int) == 0 {
+	// not set field type_id
+	// process import case
+	if d.Get("type_id").(int) == 0 && d.Get("type").(string) != "" {
 		typeName := REDIS_NAMES[*info.Type]
 		if typeName == "" {
 			err = fmt.Errorf("redis read unkwnow type %d", *info.Type)
@@ -442,14 +509,8 @@ func resourceTencentCloudRedisInstanceRead(d *schema.ResourceData, meta interfac
 		_ = d.Set("type_id", info.Type)
 	}
 
-	if d.Get("redis_shard_num").(int) != 0 {
-		_ = d.Set("redis_shard_num", info.RedisShardNum)
-	}
-
-	if d.Get("redis_replicas_num").(int) != 0 {
-		_ = d.Set("redis_replicas_num", info.RedisReplicasNum)
-	}
-
+	_ = d.Set("redis_shard_num", info.RedisShardNum)
+	_ = d.Set("redis_replicas_num", info.RedisReplicasNum)
 	_ = d.Set("availability_zone", zoneName)
 	_ = d.Set("mem_size", info.RedisShardSize)
 	_ = d.Set("vpc_id", info.UniqVpcId)
@@ -468,6 +529,21 @@ func resourceTencentCloudRedisInstanceRead(d *schema.ResourceData, meta interfac
 		}
 	}
 
+	if info.NodeSet != nil {
+		var zoneIds []uint64
+		for i := range info.NodeSet {
+			nodeInfo := info.NodeSet[i]
+			if *nodeInfo.NodeType == 0 {
+				continue
+			}
+			zoneIds = append(zoneIds, *nodeInfo.ZoneId)
+		}
+
+		if err := d.Set("replica_zone_ids", zoneIds); err != nil {
+			log.Printf("[WARN] replica_zone_ids set error: %s", err.Error())
+		}
+	}
+
 	tcClient := meta.(*TencentCloudClient).apiV3Conn
 	tagService := &TagService{client: tcClient}
 	tags, err := tagService.DescribeResourceTags(ctx, "redis", "instance", tcClient.Region, d.Id())

tencentcloud/service_tencentcloud_redis.go

@@ -37,6 +37,7 @@ type TencentCloudRedisDetail struct {
 	CreateTime       string
 	Tags             map[string]string
 	BillingMode      string
+	NodeInfo         []map[string]interface{}
 }
 
 func (me *RedisService) fullZoneId() (errRet error) {
@@ -196,6 +197,23 @@ needMoreItems:
 		if item.RedisShardNum != nil {
 			instance.RedisShardNum = *item.RedisShardNum
 		}
+
+		if item.NodeSet != nil {
+			nodeInfos := make([]map[string]interface{}, 0, len(item.NodeSet))
+			for i := range item.NodeSet {
+				dMap := make(map[string]interface{})
+				nodeInfo := item.NodeSet[i]
+				if *nodeInfo.NodeType == 0 {
+					dMap["master"] = true
+				} else {
+					dMap["master"] = false
+				}
+				dMap["id"] = *nodeInfo.NodeId
+				dMap["zone_id"] = *nodeInfo.ZoneId
+				nodeInfos = append(nodeInfos, dMap)
+			}
+			instance.NodeInfo = nodeInfos
+		}
 		instance.Tags = make(map[string]string, len(item.InstanceTags))
 		for _, tag := range item.InstanceTags {
 			if tag.TagKey == nil {
@@ -226,7 +244,7 @@ func (me *RedisService) CreateInstances(ctx context.Context,
 	memSize, projectId, port int64,
 	securityGroups []string,
 	redisShardNum,
-	redisReplicasNum int, chargeTypeID int64, chargePeriod uint64) (instanceIds []*string, errRet error) {
+	redisReplicasNum int, chargeTypeID int64, chargePeriod uint64, nodeInfo []*redis.RedisNodeInfo) (instanceIds []*string, errRet error) {
 
 	logId := getLogId(ctx)
 	request := redis.NewCreateInstancesRequest()
@@ -293,6 +311,11 @@ func (me *RedisService) CreateInstances(ctx context.Context,
 			request.SecurityGroupIdList = append(request.SecurityGroupIdList, &securityGroups[v])
 		}
 	}
+
+	if len(nodeInfo) > 0 {
+		request.NodeSet = nodeInfo
+	}
+
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseRedisClient().CreateInstances(request)
 	if err != nil {

website/docs/d/redis_instances.html.markdown

@@ -44,6 +44,10 @@ In addition to all arguments above, the following attributes are exported:
   * `ip` - IP address of an instance.
   * `mem_size` - Memory size in MB.
   * `name` - Name of a redis instance.
+  * `node_info` - List of instance node information. Currently, information about the node type (master or replica) and node availability zone can be passed in.
+    * `id` - ID of the master or replica node.
+    * `master` - Indicates whether the node is master.
+    * `zone_id` - ID of the availability zone of the master or replica node.
   * `port` - The port used to access a redis instance.
   * `project_id` - ID of the project to which a redis instance belongs.
   * `redis_id` - ID of a redis instance.

website/docs/r/redis_instance.html.markdown

@@ -29,6 +29,40 @@ resource "tencentcloud_redis_instance" "redis_instance_test_2" {
 }
 ```
 
+Using multi replica zone set
+
+```hcl
+data "tencentcloud_availability_zones" "az" {
+
+}
+
+variable "redis_replicas_num" {
+  default = 3
+}
+
+resource "tencentcloud_redis_instance" "red1" {
+  availability_zone  = data.tencentcloud_availability_zones.az.zones[0].name
+  charge_type        = "POSTPAID"
+  mem_size           = 1024
+  name               = "test-redis"
+  port               = 6379
+  project_id         = 0
+  redis_replicas_num = var.redis_replicas_num
+  redis_shard_num    = 1
+  security_groups = [
+    "sg-d765yoec",
+  ]
+  subnet_id = "subnet-ie01x91v"
+  type_id   = 6
+  vpc_id    = "vpc-k4lrsafc"
+  password  = "a12121312334"
+
+  replica_zone_ids = [
+    for i in range(var.redis_replicas_num)
+  : data.tencentcloud_availability_zones.az.zones[i % length(data.tencentcloud_availability_zones.az.zones)].id]
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -44,11 +78,12 @@ The following arguments are supported:
 * `project_id` - (Optional) Specifies which project the instance should belong to.
 * `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.
 * `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.
 * `type_id` - (Optional, ForceNew) Instance type. Available values reference data source `tencentcloud_redis_zone_config` or [document](https://intl.cloud.tencent.com/document/product/239/32069).
-* `type` - (Optional, ForceNew, **Deprecated**) It has been deprecated from version 1.33.1. Please use 'type_id' instead. Instance type. Available values: `cluster_ckv`,`cluster_redis5.0`,`cluster_redis`,`master_slave_ckv`,`master_slave_redis5.0`,`master_slave_redis`,`standalone_redis`, specific region support specific types, need to refer data `tencentcloud_redis_zone_config`.
+* `type` - (Optional, ForceNew, **Deprecated**) It has been deprecated from version 1.33.1. Please use 'type_id' instead. Instance type. Available values: `cluster_ckv`,`cluster_redis5.0`,`cluster_redis`,`master_slave_ckv`,`master_slave_redis4.0`,`master_slave_redis5.0`,`master_slave_redis`,`standalone_redis`, specific region support specific types, need to refer data `tencentcloud_redis_zone_config`.
 * `vpc_id` - (Optional, ForceNew) ID of the vpc with which the instance is to be associated.
 
 ## Attributes Reference