add internet_charge_type and bandwidth_package_id support (#49)

* add internet_charge_type and bandwidth_package_id support

* update go mod

* fixed config validation

Author: likexian

builder/tencentcloud/cvm/builder.go

@@ -115,7 +115,9 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			DiskSize:                 b.config.DiskSize,
 			DataDisks:                b.config.DataDisks,
 			HostName:                 b.config.HostName,
+			InternetChargeType:       b.config.InternetChargeType,
 			InternetMaxBandwidthOut:  b.config.InternetMaxBandwidthOut,
+			BandwidthPackageId:       b.config.BandwidthPackageId,
 			AssociatePublicIpAddress: b.config.AssociatePublicIpAddress,
 			Tags:                     b.config.RunTags,
 		},

builder/tencentcloud/cvm/builder.hcl2spec.go

@@ -39,7 +39,8 @@ func WaitForInstance(ctx context.Context, client *cvm.Client, instanceId string,
 			return fmt.Errorf("instance(%s) not exist", instanceId)
 		}
 		if *resp.Response.InstanceSet[0].InstanceState == status &&
-			(resp.Response.InstanceSet[0].LatestOperationState == nil || *resp.Response.InstanceSet[0].LatestOperationState != "OPERATING") {
+			(resp.Response.InstanceSet[0].LatestOperationState == nil ||
+				*resp.Response.InstanceSet[0].LatestOperationState != "OPERATING") {
 			break
 		}
 		time.Sleep(DefaultWaitForInterval * time.Second)

builder/tencentcloud/cvm/common.go

@@ -69,11 +69,14 @@ type TencentCloudRunConfig struct {
 	CidrBlock string `mapstructure:"cidr_block" required:"false"` // 10.0.0.0/16(default), 172.16.0.0/12, 192.168.0.0/16
 	// Specify cider block of the subnet you will create if
 	// subnet_id not set
-	SubnectCidrBlock   string `mapstructure:"subnect_cidr_block" required:"false"`
-	InternetChargeType string `mapstructure:"internet_charge_type"`
+	SubnectCidrBlock string `mapstructure:"subnect_cidr_block" required:"false"`
+	// Internet charge type of cvm, values can be TRAFFIC_POSTPAID_BY_HOUR, BANDWIDTH_POSTPAID_BY_HOUR, BANDWIDTH_PACKAGE
+	InternetChargeType string `mapstructure:"internet_charge_type" required:"false"`
 	// Max bandwidth out your cvm will be launched by(in MB).
 	// values can be set between 1 ~ 100.
 	InternetMaxBandwidthOut int64 `mapstructure:"internet_max_bandwidth_out" required:"false"`
+	// When internet_charge_type is BANDWIDTH_PACKAGE, bandwidth_package_id is required
+	BandwidthPackageId string `mapstructure:"bandwidth_package_id" required:"false"`
 	// Specify securitygroup your cvm will be launched by.
 	SecurityGroupId string `mapstructure:"security_group_id" required:"false"`
 	// Specify security name you will create if security_group_id not set.
@@ -171,6 +174,24 @@ func (cf *TencentCloudRunConfig) Prepare(ctx *interpolate.Context) []error {
 		cf.DiskSize = 50
 	}
 
+	if cf.InternetChargeType == "" {
+		cf.InternetChargeType = "TRAFFIC_POSTPAID_BY_HOUR"
+	}
+
+	validChargeTypes := map[string]int{
+		"TRAFFIC_POSTPAID_BY_HOUR":   0,
+		"BANDWIDTH_POSTPAID_BY_HOUR": 0,
+		"BANDWIDTH_PACKAGE":          0,
+	}
+	if _, ok := validChargeTypes[cf.InternetChargeType]; !ok {
+		errs = append(errs, fmt.Errorf("specified internet_charge_type(%s) is invalid.", cf.InternetChargeType))
+	}
+
+	if cf.InternetChargeType == "BANDWIDTH_PACKAGE" && cf.BandwidthPackageId == "" {
+		errs = append(errs,
+			fmt.Errorf("bandwidth_package_id is required when internet_charge_type is BANDWIDTH_PACKAGE"))
+	}
+
 	if cf.AssociatePublicIpAddress && cf.InternetMaxBandwidthOut <= 0 {
 		cf.InternetMaxBandwidthOut = 1
 	}

builder/tencentcloud/cvm/run_config.go

@@ -37,7 +37,8 @@ func (s *stepConfigSubnet) Run(ctx context.Context, state multistep.StateBag) mu
 		if *resp.Response.TotalCount > 0 {
 			s.isCreate = false
 			if *resp.Response.SubnetSet[0].VpcId != vpcId {
-				return Halt(state, fmt.Errorf("The specified subnet(%s) does not belong to the specified vpc(%s)", s.SubnetId, vpcId), "")
+				return Halt(state, fmt.Errorf("The specified subnet(%s) does not belong to the specified vpc(%s)",
+					s.SubnetId, vpcId), "")
 			}
 			state.Put("subnet_id", *resp.Response.SubnetSet[0].SubnetId)
 			Message(state, *resp.Response.SubnetSet[0].SubnetName, "Subnet found")

builder/tencentcloud/cvm/step_config_subnet.go

@@ -8,6 +8,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
@@ -21,7 +22,9 @@ type stepRunInstance struct {
 	DiskType                 string
 	DiskSize                 int64
 	HostName                 string
+	InternetChargeType       string
 	InternetMaxBandwidthOut  int64
+	BandwidthPackageId       string
 	AssociatePublicIpAddress bool
 	Tags                     map[string]string
 	DataDisks                []tencentCloudDataDisk
@@ -103,11 +106,14 @@ func (s *stepRunInstance) Run(ctx context.Context, state multistep.StateBag) mul
 		VpcId:    &vpc_id,
 		SubnetId: &subnet_id,
 	}
-	TRAFFIC_POSTPAID_BY_HOUR := "TRAFFIC_POSTPAID_BY_HOUR"
 	if s.AssociatePublicIpAddress {
 		req.InternetAccessible = &cvm.InternetAccessible{
-			InternetChargeType:      &TRAFFIC_POSTPAID_BY_HOUR,
+			InternetChargeType:      &s.InternetChargeType,
 			InternetMaxBandwidthOut: &s.InternetMaxBandwidthOut,
+			PublicIpAssigned:        common.BoolPtr(true),
+		}
+		if s.BandwidthPackageId != "" {
+			req.InternetAccessible.BandwidthPackageId = &s.BandwidthPackageId
 		}
 	}
 	req.InstanceName = &s.InstanceName
@@ -125,6 +131,8 @@ func (s *stepRunInstance) Run(ctx context.Context, state multistep.StateBag) mul
 	req.UserData = &userData
 	var tags []*cvm.Tag
 	for k, v := range s.Tags {
+		k := k
+		v := v
 		tags = append(tags, &cvm.Tag{
 			Key:   &k,
 			Value: &v,

builder/tencentcloud/cvm/step_run_instance.go

@@ -63,6 +63,7 @@ func (s *stepShareImage) Cleanup(state multistep.StateBag) {
 	req.Permission = common.StringPtr("CANCEL")
 	accounts := make([]*string, 0, len(s.ShareAccounts))
 	for _, account := range s.ShareAccounts {
+		account := account
 		accounts = append(accounts, &account)
 	}
 	req.AccountIds = accounts

builder/tencentcloud/cvm/step_share_image.go

@@ -45,11 +45,13 @@
 - `subnect_cidr_block` (string) - Specify cider block of the subnet you will create if
   subnet_id not set
 
-- `internet_charge_type` (string) - Internet Charge Type
+- `internet_charge_type` (string) - Internet charge type of cvm, values can be TRAFFIC_POSTPAID_BY_HOUR, BANDWIDTH_POSTPAID_BY_HOUR, BANDWIDTH_PACKAGE
 
 - `internet_max_bandwidth_out` (int64) - Max bandwidth out your cvm will be launched by(in MB).
   values can be set between 1 ~ 100.
 
+- `bandwidth_package_id` (string) - When internet_charge_type is BANDWIDTH_PACKAGE, bandwidth_package_id is required
+
 - `security_group_id` (string) - Specify securitygroup your cvm will be launched by.
 
 - `security_group_name` (string) - Specify security name you will create if security_group_id not set.

docs-partials/builder/tencentcloud/cvm/TencentCloudRunConfig-not-required.mdx

@@ -6,9 +6,9 @@ require (
 	github.com/hashicorp/hcl/v2 v2.10.1
 	github.com/hashicorp/packer-plugin-sdk v0.2.7
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.233
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.233
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.233
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.273
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.273
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.273
 	github.com/zclconf/go-cty v1.9.1
 )