fix(vpc): [124155676] tencentcloud_vpc_bandwidth_package support modify internet_max_bandwidth

.changelog/3367.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_vpc_bandwidth_package: support modify `internet_max_bandwidth`
+```

tencentcloud/services/vpc/resource_tc_vpc_bandwidth_package.go

@@ -17,8 +17,8 @@ import (
 
 func ResourceTencentCloudVpcBandwidthPackage() *schema.Resource {
 	return &schema.Resource{
-		Read:   resourceTencentCloudVpcBandwidthPackageRead,
 		Create: resourceTencentCloudVpcBandwidthPackageCreate,
+		Read:   resourceTencentCloudVpcBandwidthPackageRead,
 		Update: resourceTencentCloudVpcBandwidthPackageUpdate,
 		Delete: resourceTencentCloudVpcBandwidthPackageDelete,
 		Importer: &schema.ResourceImporter{
@@ -78,12 +78,13 @@ func ResourceTencentCloudVpcBandwidthPackage() *schema.Resource {
 }
 
 func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta interface{}) error {
-	defer tccommon.LogElapsed("resource.tencentcloud_bwp_bandwidth_package.create")()
+	defer tccommon.LogElapsed("resource.tencentcloud_vpc_bandwidth_package.create")()
 	defer tccommon.InconsistentCheck(d, meta)()
 
-	logId := tccommon.GetLogId(tccommon.ContextNil)
-
 	var (
+		logId    = tccommon.GetLogId(tccommon.ContextNil)
+		ctx      = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+		service  = VpcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
 		request  = vpc.NewCreateBandwidthPackageRequest()
 		response *vpc.CreateBandwidthPackageResponse
 	)
@@ -100,7 +101,7 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
 		request.BandwidthPackageName = helper.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("internet_max_bandwidth"); ok {
+	if v, ok := d.GetOkExists("internet_max_bandwidth"); ok {
 		request.InternetMaxBandwidth = helper.IntInt64(v.(int))
 	}
 
@@ -110,6 +111,7 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
 				Key:   helper.String(tagKey),
 				Value: helper.String(tagValue),
 			}
+
 			request.Tags = append(request.Tags, &tag)
 		}
 	}
@@ -127,24 +129,29 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
 		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())
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
+
+		if result == nil || result.Response == nil {
+			return resource.NonRetryableError(fmt.Errorf("Create vpc bandwidthPackage failed, Response is nil."))
+		}
+
 		response = result
 		return nil
 	})
 
 	if err != nil {
-		log.Printf("[CRITAL]%s create bwp bandwidthPackage failed, reason:%+v", logId, err)
+		log.Printf("[CRITAL]%s create vpc bandwidthPackage failed, reason:%+v", logId, err)
 		return err
 	}
 
-	bandwidthPackageId := *response.Response.BandwidthPackageId
+	if response.Response.BandwidthPackageId == nil {
+		return fmt.Errorf("BandwidthPackageId is nil.")
+	}
 
+	bandwidthPackageId := *response.Response.BandwidthPackageId
 	d.SetId(bandwidthPackageId)
 
-	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
-
 	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
 		tagService := svctag.NewTagService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
 		region := meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region
@@ -154,20 +161,24 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
 		}
 	}
 
-	service := VpcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+	// wait
 	err = resource.Retry(3*tccommon.ReadRetryTimeout, func() *resource.RetryError {
 		instance, errRet := service.DescribeVpcBandwidthPackage(ctx, bandwidthPackageId)
 		if errRet != nil {
 			return tccommon.RetryError(errRet, tccommon.InternalError)
 		}
+
 		if instance == nil {
 			return resource.RetryableError(fmt.Errorf("vpc bandwidthPackage instance is being created, retry..."))
 		}
+
 		if *instance.Status == "CREATED" {
 			return nil
 		}
+
 		return resource.RetryableError(fmt.Errorf("vpc bandwidthPackage instance status is %v, retry...", *instance.Status))
 	})
+
 	if err != nil {
 		return err
 	}
@@ -176,27 +187,25 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
 }
 
 func resourceTencentCloudVpcBandwidthPackageRead(d *schema.ResourceData, meta interface{}) error {
-	defer tccommon.LogElapsed("resource.tencentcloud_bwp_bandwidth_package.read")()
+	defer tccommon.LogElapsed("resource.tencentcloud_vpc_bandwidth_package.read")()
+	defer tccommon.LogElapsed("resource.tencentcloud_vpc_bandwidth_package.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()}
-
-	bandwidthPackageId := d.Id()
+	var (
+		logId              = tccommon.GetLogId(tccommon.ContextNil)
+		ctx                = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+		service            = VpcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+		bandwidthPackageId = d.Id()
+	)
 
 	bandwidthPackage, err := service.DescribeVpcBandwidthPackage(ctx, bandwidthPackageId)
-
 	if err != nil {
 		return err
 	}
 
 	if bandwidthPackage == nil {
 		d.SetId("")
-		log.Printf("[WARN]%s resource `tencentcloud_vpc_bandwidth_package` [%s] not found, please check if it has been deleted.",
-			logId, bandwidthPackageId,
-		)
+		log.Printf("[WARN]%s resource `tencentcloud_vpc_bandwidth_package` [%s] not found, please check if it has been deleted.", logId, bandwidthPackageId)
 		return nil
 	}
 
@@ -226,6 +235,7 @@ func resourceTencentCloudVpcBandwidthPackageRead(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
+
 	_ = d.Set("tags", tags)
 
 	return nil
@@ -235,14 +245,14 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta
 	defer tccommon.LogElapsed("resource.tencentcloud_vpc_bandwidth_package.update")()
 	defer tccommon.InconsistentCheck(d, meta)()
 
-	logId := tccommon.GetLogId(tccommon.ContextNil)
-	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
-
-	bandwidthPackageId := d.Id()
+	var (
+		logId              = tccommon.GetLogId(tccommon.ContextNil)
+		ctx                = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+		bandwidthPackageId = d.Id()
+	)
 
 	immutableArgs := []string{
 		"network_type",
-		"internet_max_bandwidth",
 		"egress",
 	}
 
@@ -252,33 +262,56 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta
 		}
 	}
 
-	request := vpc.NewModifyBandwidthPackageAttributeRequest()
-	request.BandwidthPackageId = &bandwidthPackageId
-
-	if v, ok := d.GetOk("bandwidth_package_name"); ok {
-		request.BandwidthPackageName = helper.String(v.(string))
-	}
+	if d.HasChange("bandwidth_package_name") || d.HasChange("charge_type") {
+		request := vpc.NewModifyBandwidthPackageAttributeRequest()
+		request.BandwidthPackageId = &bandwidthPackageId
+		if v, ok := d.GetOk("bandwidth_package_name"); ok {
+			request.BandwidthPackageName = helper.String(v.(string))
+		}
 
-	if d.HasChange("charge_type") {
 		if v, ok := d.GetOk("charge_type"); ok {
 			request.ChargeType = helper.String(v.(string))
 		}
+
+		err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+			result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyBandwidthPackageAttribute(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 Modify vpc bandwidthPackage attribute failed, reason:%+v", logId, err)
+			return err
+		}
 	}
 
-	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyBandwidthPackageAttribute(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())
+	if d.HasChange("internet_max_bandwidth") {
+		request := vpc.NewModifyBandwidthPackageBandwidthRequest()
+		request.BandwidthPackageId = &bandwidthPackageId
+		if v, ok := d.GetOkExists("internet_max_bandwidth"); ok {
+			request.InternetMaxBandwidth = helper.IntInt64(v.(int))
 		}
-		return nil
-	})
 
-	if err != nil {
-		log.Printf("[CRITAL]%s create vpc bandwidthPackage failed, reason:%+v", logId, err)
-		return err
+		err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+			result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyBandwidthPackageBandwidth(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 Modify vpc bandwidthPackage bandWidth failed, reason:%+v", logId, err)
+			return err
+		}
 	}
 
 	if d.HasChange("tags") {
@@ -296,15 +329,15 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta
 }
 
 func resourceTencentCloudVpcBandwidthPackageDelete(d *schema.ResourceData, meta interface{}) error {
-	defer tccommon.LogElapsed("resource.tencentcloud_bwp_bandwidth_package.delete")()
+	defer tccommon.LogElapsed("resource.tencentcloud_vpc_bandwidth_package.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()}
-
-	bandwidthPackageId := d.Id()
+	var (
+		logId              = tccommon.GetLogId(tccommon.ContextNil)
+		ctx                = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
+		service            = VpcService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+		bandwidthPackageId = d.Id()
+	)
 
 	if err := service.DeleteVpcBandwidthPackageById(ctx, bandwidthPackageId); err != nil {
 		return err

tencentcloud/services/vpc/resource_tc_vpc_bandwidth_package.md

@@ -1,4 +1,4 @@
-Provides a resource to create a vpc bandwidth_package
+Provides a resource to create a VPC bandwidth package
 
 Example Usage
 
@@ -7,23 +7,23 @@ resource "tencentcloud_vpc_bandwidth_package" "example" {
   network_type           = "BGP"
   charge_type            = "TOP5_POSTPAID_BY_MONTH"
   bandwidth_package_name = "tf-example"
-  tags                   = {
-    "createdBy" = "terraform"
+  tags = {
+    createdBy = "Terraform"
   }
 }
 ```
 
 PrePaid Bandwidth Package
 
 ```hcl
-resource "tencentcloud_vpc_bandwidth_package" "bandwidth_package" {
+resource "tencentcloud_vpc_bandwidth_package" "example" {
   network_type           = "BGP"
   charge_type            = "FIXED_PREPAID_BY_MONTH"
-  bandwidth_package_name = "test-001"
+  bandwidth_package_name = "tf-example"
   time_span              = 3
   internet_max_bandwidth = 100
-  tags                   = {
-    "createdBy" = "terraform"
+  tags = {
+    createdBy = "Terraform"
   }
 }
 ````
@@ -38,7 +38,7 @@ resource "tencentcloud_vpc_bandwidth_package" "example" {
   internet_max_bandwidth = 400
   egress                 = "center_egress2"
   tags                   = {
-    "createdBy" = "terraform"
+    createdBy = "Terraform"
   }
 }
 ```
@@ -47,5 +47,5 @@ Import
 
 vpc bandwidth_package can be imported using the id, e.g.
 ```
-$ terraform import tencentcloud_vpc_bandwidth_package.bandwidth_package bandwidthPackage_id
+$ terraform import tencentcloud_vpc_bandwidth_package.example bwp-hq8h7qpy
 ```