redis support change sg (#1336)

* redis support change sg

* update changelog

Author: hellertang

.changelog/1328.txt

@@ -1,4 +1,4 @@
-```release-note:enhancement
-resource/tencentcloud_tcm_mesh: support service mash creating/updating
-resource/tencentcloud_tcm_cluster_attachment: support for service mesh binding/unbinding of clusters
+```release-note:new-resource
+tencentcloud_tcm_mesh
+tencentcloud_tcm_cluster_attachment
 ```

.changelog/1336.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_redis_instance: support update `security_groups`
+```

tencentcloud/basic_test.go

@@ -256,6 +256,10 @@ variable "subnet_id" {
   default = "` + defaultSubnetId + `"
 }
 
+variable "sg_id" {
+  default = "` + defaultSecurityGroup + `"
+}
+
 variable "subnet_cidr" {
   default = "` + defaultSubnetCidr + `"
 }

tencentcloud/resource_tc_redis_instance.go

@@ -196,7 +196,6 @@ func resourceTencentCloudRedisInstance() *schema.Resource {
 			"security_groups": {
 				Type:     schema.TypeSet,
 				Optional: true,
-				ForceNew: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set: func(v interface{}) int {
 					return hashcode.String(v.(string))
@@ -681,7 +680,6 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
 		if err != nil {
 			return err
 		}
-		d.SetPartial("name")
 	}
 
 	// MemSize, ShardNum and ReplicaNum can only change one for each upgrade invoke
@@ -796,7 +794,6 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
 			log.Printf("[CRITAL]%s redis change password fail, reason:%s\n", logId, err.Error())
 			return err
 		}
-		d.SetPartial("password")
 	}
 
 	if d.HasChange("params_template_id") {
@@ -822,7 +819,18 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
 		if err != nil {
 			return err
 		}
-		d.SetPartial("project_id")
+	}
+
+	if d.HasChanges("security_groups") {
+		sgs := d.Get("security_groups").(*schema.Set).List()
+		var sgIds []*string
+		for _, sgId := range sgs {
+			sgIds = append(sgIds, helper.String(sgId.(string)))
+		}
+		err := redisService.ModifyDBInstanceSecurityGroups(ctx, "redis", d.Id(), sgIds)
+		if err != nil {
+			return err
+		}
 	}
 
 	if d.HasChange("tags") {
@@ -833,8 +841,6 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
 		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
 			return err
 		}
-
-		d.SetPartial("tags")
 	}
 
 	d.Partial(false)

tencentcloud/resource_tc_redis_instance_test.go

@@ -191,7 +191,7 @@ func TestAccTencentCloudRedisInstanceBasic(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccRedisInstanceUpdateMemSizeAndPassword(),
+				Config: testAccRedisInstanceUpdateMemSizeAndPasswordAndSg(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccTencentCloudRedisInstanceExists("tencentcloud_redis_instance.redis_instance_test"),
 					resource.TestCheckResourceAttrSet("tencentcloud_redis_instance.redis_instance_test", "ip"),
@@ -549,7 +549,7 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
 }`
 }
 
-func testAccRedisInstanceUpdateMemSizeAndPassword() string {
+func testAccRedisInstanceUpdateMemSizeAndPasswordAndSg() string {
 	return defaultVpcVariable + `
 resource "tencentcloud_redis_instance" "redis_instance_test" {
   availability_zone = "ap-guangzhou-3"
@@ -562,6 +562,7 @@ resource "tencentcloud_redis_instance" "redis_instance_test" {
   redis_replicas_num = 1
   vpc_id 			 = var.vpc_id
   subnet_id			 = var.subnet_id
+  security_groups    = [var.sg_id]
 
   tags = {
     "abc" = "abc"

tencentcloud/service_tencentcloud_redis.go

@@ -598,7 +598,6 @@ func (me *RedisService) ModifyInstanceProjectId(ctx context.Context, redisId str
 	}
 	errRet = err
 	return
-
 }
 
 func (me *RedisService) DescribeInstanceSecurityGroup(ctx context.Context, redisId string) (sg []string, errRet error) {

website/docs/r/redis_instance.html.markdown

@@ -87,7 +87,7 @@ The following arguments are supported:
 * `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.
-* `security_groups` - (Optional, Set: [`String`], ForceNew) ID of security group. If both vpc_id and subnet_id are not set, this argument should not be set either.
+* `security_groups` - (Optional, Set: [`String`]) ID of security group. If both vpc_id and subnet_id are not set, this argument should not be set either.
 * `subnet_id` - (Optional, String, ForceNew) Specifies which subnet the instance should belong to.
 * `tags` - (Optional, Map) Instance tags.
 * `type_id` - (Optional, Int, ForceNew) Instance type. Available values reference data source `tencentcloud_redis_zone_config` or [document](https://intl.cloud.tencent.com/document/product/239/32069).