feat: Non-multi-AZ supports modifying the number of replicas (#1969)

* feat: Non-multi-AZ supports modifying the number of replicas

* feat: add changelog

---------

Co-authored-by: anonymous <anonymous@mail.org>

Author: gitmkn

.changelog/1969.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_redis_instance: Non-multi-AZ supports modifying the number of replicas
+```

tencentcloud/basic_test.go

@@ -1032,6 +1032,15 @@ const (
 	defaultCrsGroupId        = "crs-rpl-orfiwmn5"
 )
 
+const DefaultCrsVar = `
+variable "vpc_id" {
+  default = "` + defaultCrsVpcId + `"
+}
+variable "subnet_id" {
+  default = "` + defaultCrsSubnetId + `"
+}
+`
+
 // End of CRS
 
 const (

tencentcloud/resource_tc_redis_instance.go

@@ -128,7 +128,7 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Default:     1,
-				Description: "The number of instance copies. This is not required for standalone and master slave versions and must equal to count of `replica_zone_ids`.",
+				Description: "The number of instance copies. This is not required for standalone and master slave versions and must equal to count of `replica_zone_ids`, Non-multi-AZ does not require `replica_zone_ids`.",
 			},
 			"replica_zone_ids": {
 				Type:        schema.TypeList,
@@ -1157,6 +1157,28 @@ func resourceRedisNodeSetModify(ctx context.Context, service *RedisService, d *s
 		}
 	}
 
+	// Non-Multi-AZ modification redis_replicas_num
+	if d.HasChange("redis_replicas_num") && len(oz) == 0 && len(nz) == 0 {
+		_, replica := d.GetChange("redis_replicas_num")
+		redisReplicasNum := replica.(int)
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			_, err := service.UpgradeInstance(ctx, id, memSize, shardNum, redisReplicasNum, nil)
+			if err != nil {
+				// Upgrade memory will cause instance lock and cannot acknowledge by polling status, wait until lock release
+				return retryError(err, redis.FAILEDOPERATION_UNKNOWN, redis.FAILEDOPERATION_SYSTEMERROR)
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+
+		err = service.CheckRedisUpdateOk(ctx, id)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 

tencentcloud/resource_tc_redis_instance_test.go

@@ -311,6 +311,31 @@ func TestAccTencentCloudRedisInstance_Cluster(t *testing.T) {
 	})
 }
 
+// go test -i; go test -test.run TestAccTencentCloudRedisInstance_ReplicasNum -v
+func TestAccTencentCloudRedisInstance_ReplicasNum(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccTencentCloudRedisInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccRedisReplicasNum,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccTencentCloudRedisInstanceExists("tencentcloud_redis_instance.redis_instance_replicas"),
+					resource.TestCheckResourceAttr("tencentcloud_redis_instance.redis_instance_replicas", "redis_replicas_num", "1"),
+				),
+			},
+			{
+				Config: testAccRedisReplicasNumUp,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccTencentCloudRedisInstanceExists("tencentcloud_redis_instance.redis_instance_replicas"),
+					resource.TestCheckResourceAttr("tencentcloud_redis_instance.redis_instance_replicas", "redis_replicas_num", "2"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccTencentCloudRedisInstance_Prepaid(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
@@ -744,3 +769,46 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
 }
 `
 }
+
+const testAccRedisReplicasNum = DefaultCrsVar + `
+resource "tencentcloud_redis_instance" "redis_instance_replicas" {
+    auto_renew_flag    = 0
+    availability_zone  = "ap-guangzhou-6"
+    charge_type        = "POSTPAID"
+	password           = "test12345789"
+    mem_size           = 4096
+    name               = "terraform_test_replicas"
+    port               = 6379
+    project_id         = 0
+    redis_replicas_num = 1
+    redis_shard_num    = 3
+    replicas_read_only = false
+    security_groups    = [
+        "sg-edmur627",
+    ]
+    subnet_id          = var.subnet_id
+    type_id            = 7
+    vpc_id             = var.vpc_id
+}`
+
+const testAccRedisReplicasNumUp = DefaultCrsVar + `
+resource "tencentcloud_redis_instance" "redis_instance_replicas" {
+    auto_renew_flag    = 0
+    availability_zone  = "ap-guangzhou-6"
+    charge_type        = "POSTPAID"
+	password           = "test12345789"
+    mem_size           = 4096
+    name               = "terraform_test_replicas"
+    port               = 6379
+    project_id         = 0
+    redis_replicas_num = 2
+    redis_shard_num    = 3
+    replicas_read_only = false
+    security_groups    = [
+        "sg-edmur627",
+    ]
+    subnet_id          = var.subnet_id
+    tags               = {}
+    type_id            = 7
+    vpc_id             = var.vpc_id
+}`

website/docs/r/redis_instance.html.markdown

@@ -86,7 +86,7 @@ The following arguments are supported:
 * `prepaid_period` - (Optional, Int) The tenancy (time unit is month) of the prepaid instance, NOTE: it only works when charge_type is set to `PREPAID`. Valid values are `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`.
 * `project_id` - (Optional, Int) Specifies which project the instance should belong to.
 * `recycle` - (Optional, Int) Original intranet IPv4 address retention time: unit: day, value range: `0`, `1`, `2`, `3`, `7`, `15`.
-* `redis_replicas_num` - (Optional, Int) The number of instance copies. This is not required for standalone and master slave versions and must equal to count of `replica_zone_ids`.
+* `redis_replicas_num` - (Optional, Int) The number of instance copies. This is not required for standalone and master slave versions and must equal to count of `replica_zone_ids`, Non-multi-AZ does not require `replica_zone_ids`.
 * `redis_shard_num` - (Optional, Int) The number of instance shard, default is 1. This is not required for standalone and master slave versions.
 * `replica_zone_ids` - (Optional, List: [`Int`]) ID of replica nodes available zone. This is not required for standalone and master slave versions. NOTE: Removing some of the same zone of replicas (e.g. removing 100001 of [100001, 100001, 100002]) will pick the first hit to remove.
 * `replicas_read_only` - (Optional, Bool) 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.

website/tencentcloud.erb

@@ -2947,22 +2947,22 @@
                                     <a href="/docs/providers/tencentcloud/d/tse_access_address.html">tencentcloud_tse_access_address</a>
                                 </li>
                                 <li>
-                                    <a href="/docs/providers/tencentcloud/d/tse_nacos_replicas.html">tencentcloud_tse_nacos_replicas</a>
+                                    <a href="/docs/providers/tencentcloud/d/tse_gateway_canary_rules.html">tencentcloud_tse_gateway_canary_rules</a>
                                 </li>
                                 <li>
-                                    <a href="/docs/providers/tencentcloud/d/tse_zookeeper_replicas.html">tencentcloud_tse_zookeeper_replicas</a>
+                                    <a href="/docs/providers/tencentcloud/d/tse_gateway_nodes.html">tencentcloud_tse_gateway_nodes</a>
                                 </li>
                                 <li>
-                                    <a href="/docs/providers/tencentcloud/d/tse_zookeeper_server_interfaces.html">tencentcloud_tse_zookeeper_server_interfaces</a>
+                                    <a href="/docs/providers/tencentcloud/d/tse_nacos_replicas.html">tencentcloud_tse_nacos_replicas</a>
                                 </li>
                                 <li>
                                     <a href="/docs/providers/tencentcloud/d/tse_nacos_server_interfaces.html">tencentcloud_tse_nacos_server_interfaces</a>
                                 </li>
                                 <li>
-                                    <a href="/docs/providers/tencentcloud/d/tse_gateway_nodes.html">tencentcloud_tse_gateway_nodes</a>
+                                    <a href="/docs/providers/tencentcloud/d/tse_zookeeper_replicas.html">tencentcloud_tse_zookeeper_replicas</a>
                                 </li>
                                 <li>
-                                    <a href="/docs/providers/tencentcloud/d/tse_gateway_canary_rules.html">tencentcloud_tse_gateway_canary_rules</a>
+                                    <a href="/docs/providers/tencentcloud/d/tse_zookeeper_server_interfaces.html">tencentcloud_tse_zookeeper_server_interfaces</a>
                                 </li>
                             </ul>
                         </li>