Merge pull request #1702 from tencentcloudstack/feat/support_ipv6

support ipv6

Author: gitmkn

.changelog/1702.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_eip: support update `internet_charge_type`
+```
+
+```release-note:new-resource
+tencentcloud_ipv6_address_bandwidth
+```

tencentcloud/provider.go

@@ -701,6 +701,7 @@ Virtual Private Cloud(VPC)
     tencentcloud_ha_vip_eip_attachment
 	tencentcloud_vpc_bandwidth_package
 	tencentcloud_vpc_bandwidth_package_attachment
+	tencentcloud_ipv6_address_bandwidth
 
 Private Link(PLS)
   Resource
@@ -1483,6 +1484,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_vpc_acl_attachment":                          resourceTencentCloudVpcAclAttachment(),
 			"tencentcloud_vpc_bandwidth_package":                       resourceTencentCloudVpcBandwidthPackage(),
 			"tencentcloud_vpc_bandwidth_package_attachment":            resourceTencentCloudVpcBandwidthPackageAttachment(),
+			"tencentcloud_ipv6_address_bandwidth":                      resourceTencentCloudIpv6AddressBandwidth(),
 			"tencentcloud_subnet":                                      resourceTencentCloudVpcSubnet(),
 			"tencentcloud_route_entry":                                 resourceTencentCloudRouteEntry(),
 			"tencentcloud_route_table_entry":                           resourceTencentCloudVpcRouteEntry(),

tencentcloud/resource_tc_eip.go

@@ -80,7 +80,6 @@ func resourceTencentCloudEip() *schema.Resource {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Computed:    true,
-				ForceNew:    true,
 				Description: "The charge type of eip. Valid values: `BANDWIDTH_PACKAGE`, `BANDWIDTH_POSTPAID_BY_HOUR`, `BANDWIDTH_PREPAID_BY_MONTH` and `TRAFFIC_POSTPAID_BY_HOUR`.",
 			},
 
@@ -338,6 +337,30 @@ func resourceTencentCloudEipUpdate(d *schema.ResourceData, meta interface{}) err
 		d.SetPartial("name")
 	}
 
+	if d.HasChange("internet_charge_type") {
+		var (
+			chargeType   string
+			bandWidthOut int
+		)
+
+		if v, ok := d.GetOk("internet_charge_type"); ok {
+			chargeType = v.(string)
+		}
+		if v, ok := d.GetOk("internet_max_bandwidth_out"); ok {
+			bandWidthOut = v.(int)
+		}
+
+		period := d.Get("prepaid_period").(int)
+		renewFlag := d.Get("auto_renew_flag").(int)
+
+		if chargeType != "" && bandWidthOut != 0 {
+			err := vpcService.ModifyEipInternetChargeType(ctx, eipId, chargeType, bandWidthOut, period, renewFlag)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	if d.HasChange("internet_max_bandwidth_out") {
 		if v, ok := d.GetOk("internet_max_bandwidth_out"); ok {
 			bandwidthOut := v.(int)

tencentcloud/resource_tc_ipv6_address_bandwidth.go

@@ -0,0 +1,245 @@
+/*
+Provides a resource to create a ipv6_address_bandwidth
+
+Example Usage
+
+```hcl
+resource "tencentcloud_ipv6_address_bandwidth" "ipv6_address_bandwidth" {
+  ipv6_address                = "2402:4e00:1019:9400:0:9905:a90b:2ef0"
+  internet_max_bandwidth_out = 6
+  internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+#  bandwidth_package_id       = "bwp-34rfgt56"
+}
+```
+
+*/
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func resourceTencentCloudIpv6AddressBandwidth() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudIpv6AddressBandwidthCreate,
+		Read:   resourceTencentCloudIpv6AddressBandwidthRead,
+		Update: resourceTencentCloudIpv6AddressBandwidthUpdate,
+		Delete: resourceTencentCloudIpv6AddressBandwidthDelete,
+		// it can support import because
+		//Importer: &schema.ResourceImporter{
+		//	State: schema.ImportStatePassthrough,
+		//},
+		Schema: map[string]*schema.Schema{
+			"ipv6_address": {
+				Required:    true,
+				Type:        schema.TypeString,
+				ForceNew:    true,
+				Description: "IPV6 address that needs to be enabled for public network access.",
+			},
+
+			"internet_max_bandwidth_out": {
+				Optional:    true,
+				Type:        schema.TypeInt,
+				Default:     1,
+				Description: "Bandwidth, in Mbps. The default is 1Mbps.",
+			},
+
+			"internet_charge_type": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "Network billing mode. IPV6 currently supports: `TRAFFIC_POSTPAID_BY_HOUR`, for standard account types; `BANDWIDTH_PACKAGE`, for traditional account types. The default network billing mode is: `TRAFFIC_POSTPAID_BY_HOUR`.",
+			},
+
+			"bandwidth_package_id": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "The bandwidth package id, the Legacy account and the ipv6 address to apply for the bandwidth package charge type need to be passed in.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudIpv6AddressBandwidthCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_ipv6_address_bandwidth.create")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	var (
+		request      = vpc.NewAllocateIp6AddressesBandwidthRequest()
+		response     = vpc.NewAllocateIp6AddressesBandwidthResponse()
+		ip6AddressId string
+	)
+	if v, ok := d.GetOk("ipv6_address"); ok {
+		ip6AddressId := helper.String(v.(string))
+		request.Ip6Addresses = []*string{ip6AddressId}
+	}
+
+	if v, ok := d.GetOkExists("internet_max_bandwidth_out"); ok {
+		request.InternetMaxBandwidthOut = helper.IntInt64(v.(int))
+	}
+
+	if v, ok := d.GetOk("internet_charge_type"); ok {
+		request.InternetChargeType = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("bandwidth_package_id"); ok {
+		request.BandwidthPackageId = helper.String(v.(string))
+	}
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().AllocateIp6AddressesBandwidth(request)
+		if e != nil {
+			return retryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		response = result
+		return nil
+	})
+	if err != nil {
+		log.Printf("[CRITAL]%s create vpc ipv6Address failed, reason:%+v", logId, err)
+		return err
+	}
+
+	taskId := *response.Response.TaskId
+	d.SetId(ip6AddressId)
+
+	ip6AddressId = *response.Response.AddressSet[0]
+	d.SetId(ip6AddressId)
+
+	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	conf := BuildStateChangeConf([]string{}, []string{"SUCCESS"}, 1*readRetryTimeout, time.Second, service.VpcIpv6AddressStateRefreshFunc(taskId, []string{}))
+
+	if _, e := conf.WaitForState(); e != nil {
+		return e
+	}
+
+	return resourceTencentCloudIpv6AddressBandwidthRead(d, meta)
+}
+
+func resourceTencentCloudIpv6AddressBandwidthRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_ipv6_address_bandwidth.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	ipv6AddressId := d.Id()
+
+	ipv6Address, err := service.DescribeVpcIpv6AddressById(ctx, ipv6AddressId)
+	if err != nil {
+		return err
+	}
+
+	if ipv6Address == nil {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `VpcIpv6Address` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
+	}
+
+	_ = d.Set("ipv6_address", ipv6Address.AddressIp)
+
+	if ipv6Address.Bandwidth != nil {
+		_ = d.Set("internet_max_bandwidth_out", ipv6Address.Bandwidth)
+	}
+
+	if ipv6Address.InternetChargeType != nil {
+		_ = d.Set("internet_charge_type", ipv6Address.InternetChargeType)
+	}
+
+	//if ipv6Address.BandwidthPackageId != nil {
+	//	_ = d.Set("bandwidth_package_id", ipv6Address.BandwidthPackageId)
+	//}
+
+	return nil
+}
+
+func resourceTencentCloudIpv6AddressBandwidthUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_ipv6_address_bandwidth.update")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	request := vpc.NewModifyIp6AddressesBandwidthRequest()
+
+	ipv6AddressId := d.Id()
+
+	request.Ip6AddressIds = []*string{&ipv6AddressId}
+
+	immutableArgs := []string{"internet_charge_type", "bandwidth_package_id"}
+
+	for _, v := range immutableArgs {
+		if d.HasChange(v) {
+			return fmt.Errorf("argument `%s` cannot be changed", v)
+		}
+	}
+
+	needChange := false
+
+	if d.HasChange("internet_max_bandwidth_out") {
+		needChange = true
+		if v, ok := d.GetOkExists("internet_max_bandwidth_out"); ok {
+			request.InternetMaxBandwidthOut = helper.IntInt64(v.(int))
+		}
+	}
+
+	if needChange {
+		var taskId string
+
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().ModifyIp6AddressesBandwidth(request)
+			if e != nil {
+				return retryError(e)
+			} else {
+				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+			}
+			taskId = *result.Response.TaskId
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s update vpc ipv6Address failed, reason:%+v", logId, err)
+			return err
+		}
+
+		service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+		conf := BuildStateChangeConf([]string{}, []string{"SUCCESS"}, 1*readRetryTimeout, time.Second, service.VpcIpv6AddressStateRefreshFunc(taskId, []string{}))
+
+		if _, e := conf.WaitForState(); e != nil {
+			return e
+		}
+
+	}
+
+	return resourceTencentCloudIpv6AddressBandwidthRead(d, meta)
+}
+
+func resourceTencentCloudIpv6AddressBandwidthDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_ipv6_address_bandwidth.delete")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
+	ipv6AddressId := d.Id()
+
+	if err := service.DeleteVpcIpv6AddressById(ctx, ipv6AddressId); err != nil {
+		return err
+	}
+
+	return nil
+}

tencentcloud/resource_tc_ipv6_address_bandwidth_test.go

@@ -0,0 +1,50 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+)
+
+func TestAccTencentCloudIpv6AddressBandwidthResource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccIpv6AddressBandwidth,
+				Check:  resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_ipv6_address_bandwidth.ipv6_address", "id")),
+			},
+			{
+				Config: testAccIpv6AddressBandwidthUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_ipv6_address_bandwidth.ipv6_address", "id")),
+					resource.TestCheckResourceAttr("tencentcloud_ipv6_address_bandwidth.ipv6_address", "internet_max_bandwidth_out", "8"),
+				),
+			},
+		},
+	})
+}
+
+const testAccIpv6AddressBandwidth = `
+
+resource "tencentcloud_ipv6_address_bandwidth" "ipv6_address" {
+  ipv6_address               = "2402:4e00:1019:9400:0:9905:a90b:2ef0"
+  internet_max_bandwidth_out = 6
+  internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+}
+
+`
+
+const testAccIpv6AddressBandwidthUpdate = `
+
+resource "tencentcloud_ipv6_address_bandwidth" "ipv6_address" {
+  ipv6_address               = "2402:4e00:1019:9400:0:9905:a90b:2ef0"
+  internet_max_bandwidth_out = 8
+  internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+}
+
+`

tencentcloud/resource_tc_kubernetes_backup_storage_location_test.go

@@ -3,12 +3,13 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
-	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 	"log"
 	"math/rand"
 	"testing"
 	"time"
 
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"