Merge pull request #1499 from tencentcloudstack/feat/eip_support_bgp_id

eip support set bgp id

Author: gitmkn

.changelog/1499.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_eip: support set `BandwidthPackageId`
+```

tencentcloud/resource_tc_eip.go

@@ -5,7 +5,10 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_eip" "foo" {
-  name = "awesome_gateway_ip"
+  name                 = "awesome_gateway_ip"
+  bandwidth_package_id = "bwp-jtvzuky6"
+  internet_charge_type = "BANDWIDTH_PACKAGE"
+  type                 = "EIP"
 }
 ```
 
@@ -91,7 +94,11 @@ func resourceTencentCloudEip() *schema.Resource {
 				Optional:    true,
 				Description: "The tags of eip.",
 			},
-
+			"bandwidth_package_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "ID of bandwidth package, it will set when `internet_charge_type` is `BANDWIDTH_PACKAGE`.",
+			},
 			// computed
 			"public_ip": {
 				Type:        schema.TypeString,
@@ -143,6 +150,9 @@ func resourceTencentCloudEipCreate(d *schema.ResourceData, meta interface{}) err
 			request.Tags = append(request.Tags, &tag)
 		}
 	}
+	if v, ok := d.GetOk("bandwidth_package_id"); ok {
+		request.BandwidthPackageId = helper.String(v.(string))
+	}
 
 	eipId := ""
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -243,12 +253,20 @@ func resourceTencentCloudEipRead(d *schema.ResourceData, meta interface{}) error
 		return err
 	}
 
+	bgp, err := vpcService.DescribeVpcBandwidthPackageByEip(ctx, eipId)
+	if err != nil {
+		log.Printf("[CRITAL]%s describe eip tags failed: %+v", logId, err)
+		return err
+	}
 	_ = d.Set("name", eip.AddressName)
 	_ = d.Set("type", eip.AddressType)
 	_ = d.Set("public_ip", eip.AddressIp)
 	_ = d.Set("status", eip.AddressStatus)
 	_ = d.Set("internet_charge_type", eip.InternetChargeType)
 	_ = d.Set("tags", tags)
+	if bgp != nil {
+		_ = d.Set("bandwidth_package_id", bgp.BandwidthPackageId)
+	}
 	return nil
 }
 
@@ -267,6 +285,15 @@ func resourceTencentCloudEipUpdate(d *schema.ResourceData, meta interface{}) err
 
 	d.Partial(true)
 
+	unsupportedUpdateFields := []string{
+		"bandwidth_package_id",
+	}
+	for _, field := range unsupportedUpdateFields {
+		if d.HasChange(field) {
+			return fmt.Errorf("tencentcloud_eip update on %s is not support yet", field)
+		}
+	}
+
 	if d.HasChange("name") {
 		name := d.Get("name").(string)
 		err := vpcService.ModifyEipName(ctx, eipId, name)

tencentcloud/service_tencentcloud_vpc.go

@@ -5726,3 +5726,41 @@ func (me *VpcService) DeleteVpcEndPointServiceWhiteListById(ctx context.Context,
 
 	return
 }
+
+func (me *VpcService) DescribeVpcBandwidthPackageByEip(ctx context.Context, eipId string) (resource *vpc.BandwidthPackage, errRet error) {
+	var (
+		logId   = getLogId(ctx)
+		request = vpc.NewDescribeBandwidthPackagesRequest()
+	)
+
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+				logId, "query object", request.ToJsonString(), errRet.Error())
+		}
+	}()
+
+	request.Filters = append(
+		request.Filters,
+		&vpc.Filter{
+			Name:   helper.String("resource.resource-id"),
+			Values: []*string{&eipId},
+		},
+	)
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseVpcClient().DescribeBandwidthPackages(request)
+	if err != nil {
+		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+			logId, request.GetAction(), request.ToJsonString(), err.Error())
+		errRet = err
+		return
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	if response != nil && len(response.Response.BandwidthPackageSet) > 0 {
+		resource = response.Response.BandwidthPackageSet[0]
+	}
+
+	return
+}

website/docs/r/eip.html.markdown

@@ -15,7 +15,10 @@ Provides an EIP resource.
 
 ```hcl
 resource "tencentcloud_eip" "foo" {
-  name = "awesome_gateway_ip"
+  name                 = "awesome_gateway_ip"
+  bandwidth_package_id = "bwp-jtvzuky6"
+  internet_charge_type = "BANDWIDTH_PACKAGE"
+  type                 = "EIP"
 }
 ```
 
@@ -25,6 +28,7 @@ The following arguments are supported:
 
 * `anycast_zone` - (Optional, String, ForceNew) The zone of anycast. Valid value: `ANYCAST_ZONE_GLOBAL` and `ANYCAST_ZONE_OVERSEAS`.
 * `applicable_for_clb` - (Optional, Bool, **Deprecated**) It has been deprecated from version 1.27.0. Indicates whether the anycast eip can be associated to a CLB.
+* `bandwidth_package_id` - (Optional, String) ID of bandwidth package, it will set when `internet_charge_type` is `BANDWIDTH_PACKAGE`.
 * `internet_charge_type` - (Optional, String, ForceNew) The charge type of eip. Valid values: `BANDWIDTH_PACKAGE`, `BANDWIDTH_POSTPAID_BY_HOUR`, `BANDWIDTH_PREPAID_BY_MONTH` and `TRAFFIC_POSTPAID_BY_HOUR`.
 * `internet_max_bandwidth_out` - (Optional, Int) The bandwidth limit of EIP, unit is Mbps.
 * `internet_service_provider` - (Optional, String, ForceNew) Internet service provider of eip. Valid value: `BGP`, `CMCC`, `CTCC` and `CUCC`.