support TCE

Author: JinXingYoung

builder/tencentcloud/cvm/access_config.go

@@ -64,6 +64,12 @@ type TencentCloudAccessConfig struct {
 	Zone string `mapstructure:"zone" required:"true"`
 	// Do not check region and zone when validate.
 	SkipValidation bool `mapstructure:"skip_region_validation" required:"false"`
+	// The endpoint you want to reach the cloud endpoint,
+	// if tce cloud you should set a tce cvm endpoint.
+	CvmEndpoint string `mapstructure:"cvm_endpoint" required:"false"`
+	// The endpoint you want to reach the cloud endpoint,
+	// if tce cloud you should set a tce vpc endpoint.
+	VpcEndpoint string `mapstructure:"vpc_endpoint" required:"false"`
 }
 
 func (cf *TencentCloudAccessConfig) Client() (*cvm.Client, *vpc.Client, error) {
@@ -82,11 +88,11 @@ func (cf *TencentCloudAccessConfig) Client() (*cvm.Client, *vpc.Client, error) {
 		return nil, nil, fmt.Errorf("parameter zone must be set")
 	}
 
-	if cvm_client, err = NewCvmClient(cf.SecretId, cf.SecretKey, cf.Region); err != nil {
+	if cvm_client, err = NewCvmClient(cf.SecretId, cf.SecretKey, cf.Region, cf.CvmEndpoint); err != nil {
 		return nil, nil, err
 	}
 
-	if vpc_client, err = NewVpcClient(cf.SecretId, cf.SecretKey, cf.Region); err != nil {
+	if vpc_client, err = NewVpcClient(cf.SecretId, cf.SecretKey, cf.Region, cf.VpcEndpoint); err != nil {
 		return nil, nil, err
 	}
 
@@ -116,6 +122,11 @@ func (cf *TencentCloudAccessConfig) Prepare(ctx *interpolate.Context) []error {
 		errs = append(errs, err)
 	}
 
+	if (cf.CvmEndpoint != "" && cf.VpcEndpoint == "") ||
+		(cf.CvmEndpoint == "" && cf.VpcEndpoint != "") {
+		errs = append(errs, fmt.Errorf("parameter cvm_endpoint and vpc_endpoint must be set simultaneously"))
+	}
+
 	if cf.Region == "" {
 		errs = append(errs, fmt.Errorf("parameter region must be set"))
 	} else if !cf.SkipValidation {
@@ -148,6 +159,10 @@ func (cf *TencentCloudAccessConfig) Config() error {
 }
 
 func (cf *TencentCloudAccessConfig) validateRegion() error {
+	// if set cvm endpoint, do not validate region
+	if cf.CvmEndpoint != "" {
+		return nil
+	}
 	return validRegion(cf.Region)
 }
 

builder/tencentcloud/cvm/builder.hcl2spec.go

@@ -3,6 +3,7 @@ package cvm
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"regexp"
 	"strings"
 	"time"
@@ -105,11 +106,24 @@ func GetImageByName(ctx context.Context, client *cvm.Client, imageName string) (
 }
 
 // NewCvmClient returns a new cvm client
-func NewCvmClient(secretId, secretKey, region string) (client *cvm.Client, err error) {
+func NewCvmClient(secretId, secretKey, region, endpoint string) (client *cvm.Client, err error) {
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.ReqMethod = "POST"
 	cpf.HttpProfile.ReqTimeout = 300
 	cpf.Language = "en-US"
+	if endpoint != "" {
+		var u *url.URL
+		u, err = url.Parse(endpoint)
+		if err != nil {
+			return
+		}
+		if u.Scheme != "" {
+			cpf.HttpProfile.Scheme = u.Scheme
+			cpf.HttpProfile.Endpoint = u.Host
+		} else {
+			cpf.HttpProfile.Endpoint = endpoint
+		}
+	}
 
 	credential := common.NewCredential(secretId, secretKey)
 	client, err = cvm.NewClient(credential, region, cpf)
@@ -118,11 +132,24 @@ func NewCvmClient(secretId, secretKey, region string) (client *cvm.Client, err e
 }
 
 // NewVpcClient returns a new vpc client
-func NewVpcClient(secretId, secretKey, region string) (client *vpc.Client, err error) {
+func NewVpcClient(secretId, secretKey, region, endpoint string) (client *vpc.Client, err error) {
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.ReqMethod = "POST"
 	cpf.HttpProfile.ReqTimeout = 300
 	cpf.Language = "en-US"
+	if endpoint != "" {
+		var u *url.URL
+		u, err = url.Parse(endpoint)
+		if err != nil {
+			return
+		}
+		if u.Scheme != "" {
+			cpf.HttpProfile.Scheme = u.Scheme
+			cpf.HttpProfile.Endpoint = u.Host
+		} else {
+			cpf.HttpProfile.Endpoint = endpoint
+		}
+	}
 
 	credential := common.NewCredential(secretId, secretKey)
 	client, err = vpc.NewClient(credential, region, cpf)

builder/tencentcloud/cvm/common.go

@@ -49,7 +49,7 @@ func (s *stepCopyImage) Run(ctx context.Context, state multistep.StateBag) multi
 	tencentCloudImages := state.Get("tencentcloudimages").(map[string]string)
 
 	for _, region := range req.DestinationRegions {
-		rc, err := NewCvmClient(config.SecretId, config.SecretKey, *region)
+		rc, err := NewCvmClient(config.SecretId, config.SecretKey, *region, config.CvmEndpoint)
 		if err != nil {
 			return Halt(state, err, "Failed to init client")
 		}

builder/tencentcloud/cvm/step_copy_image.go

@@ -0,0 +1,40 @@
+variable "secret_id" {
+  type    = string
+  default = "${env("TENCENTCLOUD_SECRET_ID")}"
+}
+
+variable "secret_key" {
+  type    = string
+  default = "${env("TENCENTCLOUD_SECRET_KEY")}"
+}
+
+variable "cvm_endpoint" {
+  type    = string
+}
+variable "vpc_endpoint" {
+  type    = string
+}
+
+source "tencentcloud-cvm" "autogenerated_1" {
+  associate_public_ip_address = true
+  disk_type                   = "CLOUD_PREMIUM"
+  image_name                  = "PackerTest"
+  instance_type               = "S3.SMALL1"
+  packer_debug                = true
+  region                      = "chongqing"
+  secret_id       = "${var.secret_id}"
+  secret_key      = "${var.secret_key}"
+  cvm_endpoint    = "${var.cvm_endpoint}"
+  vpc_endpoint    = "${var.vpc_endpoint}"
+  source_image_id = "img-95xgn7er"
+  ssh_username    = "root"
+  zone            = "yfm18"
+}
+
+build {
+  sources = ["source.tencentcloud-cvm.autogenerated_1"]
+
+  provisioner "shell" {
+    inline = ["sleep 30"]
+  }
+}

builder/tencentcloud/examples/tce.pkr.hcl

@@ -2,4 +2,10 @@
 
 - `skip_region_validation` (bool) - Do not check region and zone when validate.
 
+- `cvm_endpoint` (string) - The endpoint you want to reach the cloud endpoint,
+  if tce cloud you should set a tce cvm endpoint.
+
+- `vpc_endpoint` (string) - The endpoint you want to reach the cloud endpoint,
+  if tce cloud you should set a tce vpc endpoint.
+
 <!-- End of code generated from the comments of the TencentCloudAccessConfig struct in builder/tencentcloud/cvm/access_config.go; -->

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

@@ -37,7 +37,7 @@ a [communicator](/packer/docs/templates/legacy_json_templates/communicator) can
   for parameter taking.
 
 - `instance_type` (string) - The instance type your cvm will be launched by.
-  You should reference [Instace Type](https://intl.cloud.tencent.com/document/product/213/11518)
+  You should reference [Instance Type](https://intl.cloud.tencent.com/document/product/213/11518)
   for parameter taking.
 
 - `source_image_id` (string) - The base image id of Image you want to create
@@ -125,6 +125,12 @@ a [communicator](/packer/docs/templates/legacy_json_templates/communicator) can
 - `run_tags` (map of strings) - Tags to apply to the instance that is _launched_ to create the image.
   These tags are _not_ applied to the resulting image.
 
+- `cvm_endpoint` (string) - The endpoint you want to reach the cloud endpoint,
+  if tce cloud you should set a tce cvm endpoint.
+
+- `vpc_endpoint` (string) - The endpoint you want to reach the cloud endpoint,
+  if tce cloud you should set a tce vpc endpoint.
+
 ### Communicator Configuration
 
 In addition to the above options, a communicator can be configured
@@ -183,5 +189,5 @@ Here is a basic example for Tencentcloud.
 ```
 
 See the
-[examples/tencentcloud](https://github.com/hashicorp/packer/tree/master/builder/tencentcloud/examples)
+[examples/tencentcloud](https://github.com/hashicorp/packer-plugin-tencentcloud/tree/master/builder/tencentcloud/examples)
 folder in the Packer project for more examples.