feat(eni): [116432973] add eni ipv4 address

.changelog/2574.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_eni_ipv4_address
+```

tencentcloud/provider.go

@@ -1051,6 +1051,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_eni_attachment":                                      vpc.ResourceTencentCloudEniAttachment(),
 			"tencentcloud_eni_sg_attachment":                                   vpc.ResourceTencentCloudEniSgAttachment(),
 			"tencentcloud_eni_ipv6_address":                                    vpc.ResourceTencentCloudEniIpv6Address(),
+			"tencentcloud_eni_ipv4_address":                                    vpc.ResourceTencentCloudEniIpv4Address(),
 			"tencentcloud_ccn":                                                 ccn.ResourceTencentCloudCcn(),
 			"tencentcloud_ccn_attachment":                                      ccn.ResourceTencentCloudCcnAttachment(),
 			"tencentcloud_ccn_bandwidth_limit":                                 ccn.ResourceTencentCloudCcnBandwidthLimit(),

tencentcloud/provider.md

@@ -1199,6 +1199,7 @@ Virtual Private Cloud(VPC)
     tencentcloud_eni
     tencentcloud_eni_attachment
     tencentcloud_eni_sg_attachment
+    tencentcloud_eni_ipv4_address
     tencentcloud_eni_ipv6_address
     tencentcloud_vpc
     tencentcloud_vpc_acl

tencentcloud/services/vpc/resource_tc_eni_ipv4_address.go

@@ -0,0 +1,284 @@
+package vpc
+
+import (
+	"context"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func ResourceTencentCloudEniIpv4Address() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudEniIpv4AddressCreate,
+		Read:   resourceTencentCloudEniIpv4AddressRead,
+		Delete: resourceTencentCloudEniIpv4AddressDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Schema: map[string]*schema.Schema{
+			"network_interface_id": {
+				Required:    true,
+				ForceNew:    true,
+				Type:        schema.TypeString,
+				Description: "The ID of the ENI instance, such as `eni-m6dyj72l`.",
+			},
+
+			"private_ip_addresses": {
+				Optional:      true,
+				Type:          schema.TypeSet,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"secondary_private_ip_address_count", "qos_level"},
+				Description:   "The information on private IP addresses, of which you can specify a maximum of 10 at a time. You should provide either this parameter or SecondaryPrivateIpAddressCount, or both.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"private_ip_address": {
+							Type:        schema.TypeString,
+							Required:    true,
+							ForceNew:    true,
+							Description: "Private IP address.",
+						},
+						"primary": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "Whether it is a primary IP.",
+						},
+						"public_ip_address": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "Public IP address.",
+						},
+						"address_id": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "EIP instance ID, such as `eip-11112222`.",
+						},
+						"description": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "Private IP description.",
+						},
+						"is_wan_ip_blocked": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "Whether the public IP is blocked.",
+						},
+						"state": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "IP status: `PENDING`: Creating, `MIGRATING`: Migrating, `DELETING`: Deleting, `AVAILABLE`: Available.",
+						},
+						"qos_level": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: "IP service level. Values: PT` (Gold), `AU` (Silver), `AG `(Bronze) and DEFAULT` (Default).",
+						},
+					},
+				},
+			},
+
+			"secondary_private_ip_address_count": {
+				Optional:      true,
+				Type:          schema.TypeInt,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"private_ip_addresses"},
+				Description:   "The number of newly-applied private IP addresses. You should provide either this parameter or PrivateIpAddresses, or both. The total number of private IP addresses cannot exceed the quota.",
+			},
+
+			"qos_level": {
+				Optional:      true,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"private_ip_addresses"},
+				Type:          schema.TypeString,
+				Description:   "IP service level. It is used together with `SecondaryPrivateIpAddressCount`. Values: PT`(Gold), `AU`(Silver), `AG `(Bronze) and DEFAULT (Default).",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudEniIpv4AddressCreate(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_eni_ipv4_address.create")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	logId := tccommon.GetLogId(tccommon.ContextNil)
+
+	var (
+		request            = vpc.NewAssignPrivateIpAddressesRequest()
+		networkInterfaceId string
+	)
+	if v, ok := d.GetOk("network_interface_id"); ok {
+		networkInterfaceId = v.(string)
+		request.NetworkInterfaceId = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("private_ip_addresses"); ok {
+		for _, item := range v.(*schema.Set).List() {
+			dMap := item.(map[string]interface{})
+			privateIpAddressSpecification := vpc.PrivateIpAddressSpecification{}
+			if v, ok := dMap["private_ip_address"]; ok {
+				privateIpAddressSpecification.PrivateIpAddress = helper.String(v.(string))
+			}
+			if v, ok := dMap["primary"]; ok {
+				privateIpAddressSpecification.Primary = helper.Bool(v.(bool))
+			}
+			if v, ok := dMap["public_ip_address"]; ok && v != "" {
+				privateIpAddressSpecification.PublicIpAddress = helper.String(v.(string))
+			}
+			if v, ok := dMap["address_id"]; ok && v != "" {
+				privateIpAddressSpecification.AddressId = helper.String(v.(string))
+			}
+			if v, ok := dMap["description"]; ok && v != "" {
+				privateIpAddressSpecification.Description = helper.String(v.(string))
+			}
+			if v, ok := dMap["is_wan_ip_blocked"]; ok {
+				privateIpAddressSpecification.IsWanIpBlocked = helper.Bool(v.(bool))
+			}
+			if v, ok := dMap["state"]; ok && v != "" {
+				privateIpAddressSpecification.State = helper.String(v.(string))
+			}
+			if v, ok := dMap["qos_level"]; ok && v != "" {
+				privateIpAddressSpecification.QosLevel = helper.String(v.(string))
+			}
+			request.PrivateIpAddresses = append(request.PrivateIpAddresses, &privateIpAddressSpecification)
+		}
+	}
+
+	if v, ok := d.GetOkExists("secondary_private_ip_address_count"); ok {
+		request.SecondaryPrivateIpAddressCount = helper.IntUint64(v.(int))
+	}
+
+	if v, ok := d.GetOk("qos_level"); ok {
+		request.QosLevel = helper.String(v.(string))
+	}
+
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().AssignPrivateIpAddresses(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		return nil
+	})
+	if err != nil {
+		log.Printf("[CRITAL]%s create vpc eniIpv4Address failed, reason:%+v", logId, err)
+		return err
+	}
+
+	d.SetId(networkInterfaceId)
+
+	return resourceTencentCloudEniIpv4AddressRead(d, meta)
+}
+
+func resourceTencentCloudEniIpv4AddressRead(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_eni_ipv4_address.read")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	logId := tccommon.GetLogId(tccommon.ContextNil)
+
+	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+
+	service := VpcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+
+	networkInterfaceId := d.Id()
+
+	enis, err := service.DescribeEniById(ctx, []string{networkInterfaceId})
+
+	if err != nil {
+		return err
+	}
+
+	if len(enis) < 1 {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `VpcIpv6EniAddress` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
+	}
+
+	eni := enis[0]
+
+	if eni.NetworkInterfaceId != nil {
+		_ = d.Set("network_interface_id", eni.NetworkInterfaceId)
+	}
+
+	ipv4s := make([]map[string]interface{}, 0, len(eni.PrivateIpAddressSet))
+	for _, ipv4 := range eni.PrivateIpAddressSet {
+		if !*ipv4.Primary {
+			ipv4s = append(ipv4s, map[string]interface{}{
+				"private_ip_address": ipv4.PrivateIpAddress,
+				"primary":            ipv4.Primary,
+				"public_ip_address":  ipv4.AddressId,
+				"address_id":         ipv4.AddressId,
+				"description":        ipv4.Description,
+				"is_wan_ip_blocked":  ipv4.IsWanIpBlocked,
+				"state":              ipv4.State,
+				"qos_level":          ipv4.QosLevel,
+			})
+		}
+	}
+
+	_ = d.Set("network_interface_id", networkInterfaceId)
+	_ = d.Set("private_ip_addresses", ipv4s)
+	_ = d.Set("secondary_private_ip_address_count", len(ipv4s))
+	if len(eni.PrivateIpAddressSet) > 0 {
+		_ = d.Set("qos_level", eni.PrivateIpAddressSet[0].QosLevel)
+	}
+
+	return nil
+}
+
+func resourceTencentCloudEniIpv4AddressDelete(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_eni_ipv6_address.delete")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	logId := tccommon.GetLogId(tccommon.ContextNil)
+	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+
+	service := VpcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+	networkInterfaceId := d.Id()
+
+	enis, err := service.DescribeEniById(ctx, []string{networkInterfaceId})
+
+	if err != nil {
+		return err
+	}
+
+	if len(enis) < 1 {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `EniIpv4Address` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
+	}
+
+	eni := enis[0]
+	ipv4s := make([]*string, 0, len(eni.PrivateIpAddressSet))
+	for _, ipv4 := range eni.PrivateIpAddressSet {
+		if !*ipv4.Primary {
+			ipv4s = append(ipv4s, ipv4.PrivateIpAddress)
+		}
+	}
+
+	if err := service.DeleteEniIpv4AddressById(ctx, networkInterfaceId, ipv4s); err != nil {
+		return err
+	}
+
+	return nil
+}

tencentcloud/services/vpc/resource_tc_eni_ipv4_address.md

@@ -0,0 +1,22 @@
+Provides a resource to create a vpc eni_ipv4_address
+
+Example Usage
+
+```hcl
+data "tencentcloud_enis" "eni" {
+  name = "Primary ENI"
+}
+
+resource "tencentcloud_eni_ipv4_address" "eni_ipv4_address" {
+  network_interface_id = data.tencentcloud_enis.eni.enis.0.id
+  secondary_private_ip_address_count = 3
+}
+```
+
+Import
+
+vpc eni_ipv4_address can be imported using the id, e.g.
+
+```
+terraform import tencentcloud_eni_ipv4_address.eni_ipv4_address eni_id
+```

tencentcloud/services/vpc/resource_tc_eni_ipv4_address_test.go

@@ -0,0 +1,53 @@
+package vpc_test
+
+import (
+	"testing"
+
+	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccTencentCloudNeedFixEniIpv4AddressResource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			tcacctest.AccPreCheck(t)
+		},
+
+		Providers: tcacctest.AccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccEniIpv4Address,
+				Check: resource.ComposeTestCheckFunc(
+					//testAccCheckBandwidthPackageAttachmentExists("tencentcloud_vpc_ipv6_eni_address"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "network_interface_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "private_ip_addresses.0.private_ip_address"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "private_ip_addresses.0.primary"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "private_ip_addresses.0.address_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "private_ip_addresses.0.description"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "private_ip_addresses.0.is_wan_ip_blocked"),
+					resource.TestCheckResourceAttrSet("tencentcloud_eni_ipv4_address.eni_ipv4_address", "private_ip_addresses.0.state"),
+				),
+			},
+			{
+				ResourceName:      "tencentcloud_eni_ipv4_address.eni_ipv4_address",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+const testAccEniIpv4Address = `
+
+data "tencentcloud_enis" "eni" {
+  name = "Primary ENI"
+}
+
+resource "tencentcloud_eni_ipv4_address" "eni_ipv4_address" {
+  network_interface_id = data.tencentcloud_enis.eni.enis.0.id
+  secondary_private_ip_address_count = 3
+}
+
+`