fix: modify cvm

Author: gitmkn

.changelog/3157.txt

@@ -11,5 +11,5 @@ resource/tencentcloud_instance: update doc
 ```
 
 ```release-note:enhancement
-resource/tencentcloud_instance_set: Added field `private_ip_addresses`
+resource/tencentcloud_instance_set: Added a new field `private_ip_addresses` to support specifying multiple IPs to create instances
 ```

tencentcloud/services/cvm/resource_tc_instance_set.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"log"
+	"sort"
 	"strconv"
 	"time"
 
@@ -147,7 +148,7 @@ func ResourceTencentCloudInstanceSet() *schema.Resource {
 				Description: "The private IP to be assigned to this instance, must be in the provided subnet and available. Cannot be set at the same time as `private_ip_addresses`.",
 			},
 			"private_ip_addresses": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Optional: true,
 				Computed: true,
@@ -436,9 +437,20 @@ func doResourceTencentCloudInstanceSetCreate(d *schema.ResourceData, meta interf
 				address := ip.(string)
 				addressList = append(addressList, &address)
 			}
+			sort.SliceStable(addressList, func(i, j int) bool {
+				return *addressList[i] < *addressList[j]
+			})
 			request.VirtualPrivateCloud.PrivateIpAddresses = addressList
 		}
 
+		if v, ok := d.GetOk("private_ip_addresses"); ok {
+			addressListSet := v.(*schema.Set).List()
+			for i := range addressListSet {
+				addressList := addressListSet[i].(string)
+				request.VirtualPrivateCloud.PrivateIpAddresses = append(request.VirtualPrivateCloud.PrivateIpAddresses, &addressList)
+			}
+		}
+
 	}
 
 	if v, ok := d.GetOk("security_groups"); ok {
@@ -591,9 +603,6 @@ func doResourceTencentCloudInstanceSetRead(d *schema.ResourceData, meta interfac
 	if len(instance.PrivateIpAddresses) > 0 {
 		_ = d.Set("private_ip", instance.PrivateIpAddresses[0])
 	}
-	if len(instance.PrivateIpAddresses) > 0 {
-		_ = d.Set("private_ip_addresses", instance.PrivateIpAddresses)
-	}
 	if len(instance.PublicIpAddresses) > 0 {
 		_ = d.Set("public_ip", instance.PublicIpAddresses[0])
 	}
@@ -606,6 +615,14 @@ func doResourceTencentCloudInstanceSetRead(d *schema.ResourceData, meta interfac
 		_ = d.Set("keep_image_login", *instance.LoginSettings.KeepImageLogin == CVM_IMAGE_LOGIN)
 	}
 
+	privateIpAddresses := []*string{}
+	for _, v := range instanceSet {
+		if len(v.PrivateIpAddresses) > 0 {
+			privateIpAddresses = append(privateIpAddresses, v.PrivateIpAddresses...)
+		}
+	}
+	_ = d.Set("private_ip_addresses", privateIpAddresses)
+
 	return nil
 }
 

website/docs/r/instance_set.html.markdown

@@ -96,7 +96,7 @@ The following arguments are supported:
 * `key_name` - (Optional, String) The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifying will cause the instance reset.
 * `password` - (Optional, String) Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifying will cause the instance reset.
 * `placement_group_id` - (Optional, String, ForceNew) The ID of a placement group.
-* `private_ip_addresses` - (Optional, List: [`String`]) Private network subnet IP array, which can be used when creating an instance or modifying instance vpc attributes. Currently, only batch creation of multiple instances supports passing in multiple IPs of the same subnet. Cannot be set at the same time as `private_ip`.
+* `private_ip_addresses` - (Optional, Set: [`String`]) Private network subnet IP array, which can be used when creating an instance or modifying instance vpc attributes. Currently, only batch creation of multiple instances supports passing in multiple IPs of the same subnet. Cannot be set at the same time as `private_ip`.
 * `private_ip` - (Optional, String) The private IP to be assigned to this instance, must be in the provided subnet and available. Cannot be set at the same time as `private_ip_addresses`.
 * `project_id` - (Optional, Int) The project the instance belongs to, default to 0.
 * `security_groups` - (Optional, Set: [`String`]) A list of security group IDs to associate with.