feat: vpc support

Author: gitmkn

tencentcloud/provider.go

@@ -611,7 +611,7 @@ Virtual Private Cloud(VPC)
     tencentcloud_ha_vip
     tencentcloud_ha_vip_eip_attachment
 	tencentcloud_vpc_bandwidth_package
-	tencentcloud_vpc_bandwidth_package_resources
+	tencentcloud_vpc_bandwidth_package_attachment
 
 VPN
   Data Source
@@ -1259,10 +1259,10 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_teo_custom_error_page":                    resourceTencentCloudTeoCustomErrorPage(),
 			// "tencentcloud_teo_host_certificate":                     resourceTencentCloudTeoHostCertificate(),
 			// "tencentcloud_teo_default_certificate":                  resourceTencentCloudTeoDefaultCertificate(),
-			"tencentcloud_tcm_mesh":                        resourceTencentCloudTcmMesh(),
-			"tencentcloud_tcm_cluster_attachment":          resourceTencentCloudTcmClusterAttachment(),
-			"tencentcloud_vpc_bandwidth_package":           resourceTencentCloudVpcBandwidthPackage(),
-			"tencentcloud_vpc_bandwidth_package_resources": resourceTencentCloudVpcBandwidthPackageResources(),
+			"tencentcloud_tcm_mesh":                         resourceTencentCloudTcmMesh(),
+			"tencentcloud_tcm_cluster_attachment":           resourceTencentCloudTcmClusterAttachment(),
+			"tencentcloud_vpc_bandwidth_package":            resourceTencentCloudVpcBandwidthPackage(),
+			"tencentcloud_vpc_bandwidth_package_attachment": resourceTencentCloudVpcBandwidthPackageAttachment(),
 		},
 
 		ConfigureFunc: providerConfigure,

tencentcloud/resource_tc_vpc_bandwidth_package.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	bwp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -78,8 +78,8 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
 	logId := getLogId(contextNil)
 
 	var (
-		request  = bwp.NewCreateBandwidthPackageRequest()
-		response *bwp.CreateBandwidthPackageResponse
+		request  = vpc.NewCreateBandwidthPackageRequest()
+		response *vpc.CreateBandwidthPackageResponse
 	)
 
 	if v, ok := d.GetOk("network_type"); ok {
@@ -188,22 +188,68 @@ func resourceTencentCloudVpcBandwidthPackageRead(d *schema.ResourceData, meta in
 }
 
 func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_bwp_bandwidth_package.update")()
+	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package.update")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
+	request := vpc.NewModifyBandwidthPackageAttributeRequest()
+
+	bandwidthPackageId := d.Id()
+
+	request.BandwidthPackageId = &bandwidthPackageId
+
 	if d.HasChange("network_type") {
+
 		return fmt.Errorf("`network_type` do not support change now.")
+
+	}
+
+	if d.HasChange("bandwidth_package_count") {
+
+		return fmt.Errorf("`bandwidth_package_count` do not support change now.")
+
+	}
+
+	if d.HasChange("internet_max_bandwidth") {
+
+		return fmt.Errorf("`internet_max_bandwidth` do not support change now.")
+
+	}
+
+	if d.HasChange("protocol") {
+
+		return fmt.Errorf("`protocol` do not support change now.")
+
 	}
 
 	if d.HasChange("charge_type") {
-		return fmt.Errorf("`charge_type` do not support change now.")
+		if v, ok := d.GetOk("charge_type"); ok {
+			request.ChargeType = helper.String(v.(string))
+		}
 	}
 
 	if d.HasChange("bandwidth_package_name") {
-		return fmt.Errorf("`bandwidth_package_name` do not support change now.")
+		if v, ok := d.GetOk("bandwidth_package_name"); ok {
+			request.BandwidthPackageName = helper.String(v.(string))
+		}
+	}
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().ModifyBandwidthPackageAttribute(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())
+		}
+		return nil
+	})
+
+	if err != nil {
+		log.Printf("[CRITAL]%s create vpc bandwidthPackage failed, reason:%+v", logId, err)
+		return err
 	}
 
 	if d.HasChange("tags") {

tencentcloud/resource_tc_vpc_bandwidth_package_resources.go renamed to tencentcloud/resource_tc_vpc_bandwidth_package_attachment.go

@@ -1,17 +1,23 @@
 /*
-Provides a resource to create a vpc bandwidth_package_resources
+Provides a resource to create a vpc bandwidth_package_attachment
 
 Example Usage
 
 ```hcl
-resource "tencentcloud_vpc_bandwidth_package_resources" "bandwidth_package_resources" {
+resource "tencentcloud_vpc_bandwidth_package_attachment" "bandwidth_package_attachment" {
   resource_ids          = "lb-dv1ai6ma"
   bandwidth_package_id  = "bwp-atmf0p9g"
   network_type          = "BGP"
   resource_type         = "LoadBalance"
   protocol              = ""
 }
 
+```
+Import
+
+vpc bandwidth_package_attachment can be imported using the id, e.g.
+```
+$ terraform import tencentcloud_vpc_bandwidth_package_attachment.bandwidth_package_attachment bandwidthPackageAttachment_id
 ```
 */
 package tencentcloud
@@ -28,67 +34,62 @@ import (
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
-func resourceTencentCloudVpcBandwidthPackageResources() *schema.Resource {
+func resourceTencentCloudVpcBandwidthPackageAttachment() *schema.Resource {
 	return &schema.Resource{
-		Read:   resourceTencentCloudVpcBandwidthPackageResourcesRead,
-		Create: resourceTencentCloudVpcBandwidthPackageResourcesCreate,
-		Delete: resourceTencentCloudVpcBandwidthPackageResourcesDelete,
+		Read:   resourceTencentCloudVpcBandwidthPackageAttachmentRead,
+		Create: resourceTencentCloudVpcBandwidthPackageAttachmentCreate,
+		Delete: resourceTencentCloudVpcBandwidthPackageAttachmentDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
 		Schema: map[string]*schema.Schema{
-			"resource_ids": {
+			"resource_id": {
 				Type:        schema.TypeString,
 				Required:    true,
-				ForceNew:    true,
 				Description: "The unique ID of the resource, currently supports EIP resources and LB resources, such as `eip-xxxx`, `lb-xxxx`.",
 			},
 
 			"bandwidth_package_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Bandwidth package unique ID, in the form of `bwp-xxxx`.",
 			},
 
 			"network_type": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Bandwidth packet type, currently supports `BGP` type, indicating that the internal resource is BGP IP.",
 			},
 
 			"resource_type": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Resource types, including `Address`, `LoadBalance`.",
 			},
 
 			"protocol": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Bandwidth packet protocol type. Currently `ipv4` and `ipv6` protocol types are supported.",
 			},
 		},
 	}
 }
 
-func resourceTencentCloudVpcBandwidthPackageResourcesCreate(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package_resources.create")()
+func resourceTencentCloudVpcBandwidthPackageAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package_attachment.create")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
 
 	var (
 		request            = vpc.NewAddBandwidthPackageResourcesRequest()
-		resourceId         string
+		response           *vpc.AddBandwidthPackageResourcesResponse
 		bandwidthPackageId string
-		resourceType       string
+		resourceId         string
 	)
 
-	if v, ok := d.GetOk("resource_ids"); ok {
+	if v, ok := d.GetOk("resource_id"); ok {
 		resourceId = v.(string)
 		request.ResourceIds = append(request.ResourceIds, helper.String(v.(string)))
 	}
@@ -99,11 +100,12 @@ func resourceTencentCloudVpcBandwidthPackageResourcesCreate(d *schema.ResourceDa
 	}
 
 	if v, ok := d.GetOk("network_type"); ok {
+
 		request.NetworkType = helper.String(v.(string))
 	}
 
 	if v, ok := d.GetOk("resource_type"); ok {
-		resourceType = v.(string)
+
 		request.ResourceType = helper.String(v.(string))
 	}
 
@@ -120,87 +122,84 @@ func resourceTencentCloudVpcBandwidthPackageResourcesCreate(d *schema.ResourceDa
 			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 bandwidthPackageResources failed, reason:%+v", logId, err)
+		log.Printf("[CRITAL]%s create vpc bandwidthPackageAttachment failed, reason:%+v", logId, err)
 		return err
 	}
 
-	d.SetId(strings.Join([]string{bandwidthPackageId, resourceId, resourceType}, FILED_SP))
-	return resourceTencentCloudVpcBandwidthPackageResourcesRead(d, meta)
+	d.SetId(bandwidthPackageId + FILED_SP + resourceId)
+	return resourceTencentCloudVpcBandwidthPackageAttachmentRead(d, meta)
 }
 
-func resourceTencentCloudVpcBandwidthPackageResourcesRead(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package_resources.read")()
+func resourceTencentCloudVpcBandwidthPackageAttachmentRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package_attachment.read")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
 
-	ids := strings.Split(d.Id(), FILED_SP)
-	if len(ids) != 3 {
-		return fmt.Errorf("id is broken, id is %s", d.Id())
+	idSplit := strings.Split(d.Id(), FILED_SP)
+	if len(idSplit) != 2 {
+		return fmt.Errorf("id is broken,%s", d.Id())
 	}
+	bandwidthPackageId := idSplit[0]
+	resourceId := idSplit[1]
 
-	bandwidthPackageId := ids[0]
-	resourceId := ids[1]
-	resourceType := ids[2]
-
-	bandwidthPackageResources, err := service.DescribeVpcBandwidthPackageResources(ctx, bandwidthPackageId, resourceId, resourceType)
+	bandwidthPackageAttachment, err := service.DescribeVpcBandwidthPackageAttachment(ctx, bandwidthPackageId, resourceId)
 
 	if err != nil {
 		return err
 	}
 
-	if bandwidthPackageResources == nil {
+	if bandwidthPackageAttachment == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `bandwidthPackageResources` %s does not exist", resourceId)
+		return fmt.Errorf("resource `bandwidthPackageAttachment` %s does not exist", bandwidthPackageId)
 	}
 
 	_ = d.Set("bandwidth_package_id", bandwidthPackageId)
 
-	if bandwidthPackageResources.ResourceId != nil {
-		_ = d.Set("resource_ids", bandwidthPackageResources.ResourceId)
+	if bandwidthPackageAttachment.ResourceId != nil {
+		_ = d.Set("resource_id", bandwidthPackageAttachment.ResourceId)
 	}
 
-	//if bandwidthPackageResources.NetworkType != nil {
-	//	_ = d.Set("network_type", bandwidthPackageResources.NetworkType)
+	//if bandwidthPackageAttachment.NetworkType != nil {
+	//	_ = d.Set("network_type", bandwidthPackageAttachment.NetworkType)
 	//}
 
-	if bandwidthPackageResources.ResourceType != nil {
-		_ = d.Set("resource_type", bandwidthPackageResources.ResourceType)
+	if bandwidthPackageAttachment.ResourceType != nil {
+		_ = d.Set("resource_type", bandwidthPackageAttachment.ResourceType)
 	}
 
-	//if bandwidthPackageResources.Protocol != nil {
-	//	_ = d.Set("protocol", bandwidthPackageResources.Protocol)
+	//if bandwidthPackageAttachment.Protocol != nil {
+	//	_ = d.Set("protocol", bandwidthPackageAttachment.Protocol)
 	//}
 
 	return nil
 }
 
-func resourceTencentCloudVpcBandwidthPackageResourcesDelete(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package_resources.delete")()
+func resourceTencentCloudVpcBandwidthPackageAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_vpc_bandwidth_package_attachment.delete")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
 
-	ids := strings.Split(d.Id(), FILED_SP)
-	if len(ids) != 3 {
-		return fmt.Errorf("id is broken, id is %s", d.Id())
+	idSplit := strings.Split(d.Id(), FILED_SP)
+	if len(idSplit) != 2 {
+		return fmt.Errorf("id is broken,%s", d.Id())
 	}
+	bandwidthPackageId := idSplit[0]
+	resourceId := idSplit[1]
 
-	bandwidthPackageId := ids[0]
-	resourceId := ids[1]
-	resourceType := ids[2]
-
-	if err := service.DeleteVpcBandwidthPackageResourcesById(ctx, bandwidthPackageId, resourceId, resourceType); err != nil {
+	if err := service.DeleteVpcBandwidthPackageAttachmentById(ctx, bandwidthPackageId, resourceId); err != nil {
 		return err
 	}