fix(eni): [126301231] tencentcloud_eni optmize code logic, add orderly_security_groups (#3464)

* add

* add

* add

* add

* add

* add

* add

Author: SevenEarth

.changelog/3464.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_eni: optmize code logic, add `orderly_security_groups`
+```

tencentcloud/services/vpc/resource_tc_eni.go

@@ -74,12 +74,22 @@ func ResourceTencentCloudEni() *schema.Resource {
 				Description:  "Description of the ENI, maximum length 60.",
 			},
 			"security_groups": {
-				Type:        schema.TypeSet,
-				Optional:    true,
-				Computed:    true,
-				Elem:        &schema.Schema{Type: schema.TypeString},
-				Set:         schema.HashString,
-				Description: "A set of security group IDs.",
+				Type:          schema.TypeSet,
+				Optional:      true,
+				Computed:      true,
+				Elem:          &schema.Schema{Type: schema.TypeString},
+				Set:           schema.HashString,
+				ConflictsWith: []string{"orderly_security_groups"},
+				Deprecated:    "It has been deprecated from version 1.82.15. Use `orderly_security_groups` instead.",
+				Description:   "A set of security group IDs.",
+			},
+			"orderly_security_groups": {
+				Type:          schema.TypeList,
+				Optional:      true,
+				Computed:      true,
+				ConflictsWith: []string{"security_groups"},
+				Elem:          &schema.Schema{Type: schema.TypeString},
+				Description:   "List of security group IDs.",
 			},
 			"ipv4s": {
 				Type:          schema.TypeSet,
@@ -179,6 +189,10 @@ func resourceTencentCloudEniCreate(d *schema.ResourceData, m interface{}) error
 		securityGroups = helper.InterfacesStrings(raw.(*schema.Set).List())
 	}
 
+	if raw, ok := d.GetOk("orderly_security_groups"); ok {
+		securityGroups = helper.InterfacesStrings(raw.([]interface{}))
+	}
+
 	if raw, ok := d.GetOk("ipv4s"); ok {
 		set := raw.(*schema.Set)
 		ipv4s = make([]VpcEniIP, 0, set.Len())
@@ -359,6 +373,7 @@ func resourceTencentCloudEniRead(d *schema.ResourceData, m interface{}) error {
 		sgs = append(sgs, *sg)
 	}
 	_ = d.Set("security_groups", sgs)
+	_ = d.Set("orderly_security_groups", sgs)
 
 	ipv4s := make([]map[string]interface{}, 0, len(eni.PrivateIpAddressSet))
 	for _, ipv4 := range eni.PrivateIpAddressSet {
@@ -423,8 +438,17 @@ func resourceTencentCloudEniUpdate(d *schema.ResourceData, m interface{}) error
 
 	if d.HasChange("security_groups") {
 		updateAttrs = append(updateAttrs, "security_groups")
+		if v, ok := d.GetOk("security_groups"); ok {
+			sgs = helper.InterfacesStrings(v.(*schema.Set).List())
+		}
+	}
+
+	if d.HasChange("orderly_security_groups") {
+		updateAttrs = append(updateAttrs, "orderly_security_groups")
+		if v, ok := d.GetOk("orderly_security_groups"); ok {
+			sgs = helper.InterfacesStrings(v.([]interface{}))
+		}
 	}
-	sgs = helper.InterfacesStrings(d.Get("security_groups").(*schema.Set).List())
 
 	if len(updateAttrs) > 0 {
 		if err := vpcService.ModifyEniAttribute(ctx, id, name, desc, sgs); err != nil {

tencentcloud/services/vpc/resource_tc_eni.md

@@ -46,7 +46,7 @@ resource "tencentcloud_eni" "example" {
   subnet_id       = tencentcloud_subnet.subnet.id
   description     = "eni desc."
   ipv4_count      = 1
-  security_groups = [
+  orderly_security_groups = [
     tencentcloud_security_group.example1.id,
     tencentcloud_security_group.example2.id
   ]
@@ -58,5 +58,5 @@ Import
 ENI can be imported using the id, e.g.
 
 ```
-  $ terraform import tencentcloud_eni.foo eni-qka182br
+  $ terraform import tencentcloud_eni.example eni-qka182br
 ```

website/docs/r/eni.html.markdown

@@ -57,7 +57,7 @@ resource "tencentcloud_eni" "example" {
   subnet_id   = tencentcloud_subnet.subnet.id
   description = "eni desc."
   ipv4_count  = 1
-  security_groups = [
+  orderly_security_groups = [
     tencentcloud_security_group.example1.id,
     tencentcloud_security_group.example2.id
   ]
@@ -74,7 +74,8 @@ The following arguments are supported:
 * `description` - (Optional, String) Description of the ENI, maximum length 60.
 * `ipv4_count` - (Optional, Int) The number of intranet IPv4s. When it is greater than 1, there is only one primary intranet IP. The others are auxiliary intranet IPs, which conflict with `ipv4s`.
 * `ipv4s` - (Optional, Set) Applying for intranet IPv4s collection, conflict with `ipv4_count`. When there are multiple ipv4s, can only be one primary IP, and the maximum length of the array is 30. Each element contains the following attributes:
-* `security_groups` - (Optional, Set: [`String`]) A set of security group IDs.
+* `orderly_security_groups` - (Optional, List: [`String`]) List of security group IDs.
+* `security_groups` - (Optional, Set: [`String`], **Deprecated**) It has been deprecated from version 1.82.15. Use `orderly_security_groups` instead. A set of security group IDs.
 * `tags` - (Optional, Map) Tags of the ENI.
 
 The `ipv4s` object supports the following:
@@ -104,6 +105,6 @@ In addition to all arguments above, the following attributes are exported:
 ENI can be imported using the id, e.g.
 
 ```
-  $ terraform import tencentcloud_eni.foo eni-qka182br
+  $ terraform import tencentcloud_eni.example eni-qka182br
 ```