iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9619 from piggona/master 

builder/tencent: add key source_image_name to get source image by name when creating image.#9548
This commit is contained in:
Megan Marsh 2020-07-22 10:29:30 -07:00 committed by GitHub
parent f9df185ef1 22b49c1a92
commit ec5a2b87af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/tencentcloud/cvm/builder.hcl2spec.go
View File

@ -31,7 +31,8 @@ type FlatConfig struct {
ImageCopyRegions []string `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"`
ImageShareAccounts []string `mapstructure:"image_share_accounts" required:"false" cty:"image_share_accounts" hcl:"image_share_accounts"`
AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
SourceImageId *string `mapstructure:"source_image_id" required:"true" cty:"source_image_id" hcl:"source_image_id"`
SourceImageId *string `mapstructure:"source_image_id" required:"false" cty:"source_image_id" hcl:"source_image_id"`
SourceImageName *string `mapstructure:"source_image_name" required:"false" cty:"source_image_name" hcl:"source_image_name"`
InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
InstanceName *string `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"`
DiskType *string `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"`
@ -136,6 +137,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
"image_share_accounts": &hcldec.AttrSpec{Name: "image_share_accounts", Type: cty.List(cty.String), Required: false},
"associate_public_ip_address": &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
"source_image_id": &hcldec.AttrSpec{Name: "source_image_id", Type: cty.String, Required: false},
"source_image_name": &hcldec.AttrSpec{Name: "source_image_name", Type: cty.String, Required: false},
"instance_type": &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
"instance_name": &hcldec.AttrSpec{Name: "instance_name", Type: cty.String, Required: false},
"disk_type": &hcldec.AttrSpec{Name: "disk_type", Type: cty.String, Required: false},

11
builder/tencentcloud/cvm/run_config.go
View File

@ -27,7 +27,10 @@ type TencentCloudRunConfig struct {
AssociatePublicIpAddress bool `mapstructure:"associate_public_ip_address" required:"false"`
// The base image id of Image you want to create
// your customized image from.
SourceImageId string `mapstructure:"source_image_id" required:"true"`
SourceImageId string `mapstructure:"source_image_id" required:"false"`
// The base image name of Image you want to create your
// customized image from.Conflict with SourceImageId.
SourceImageName string `mapstructure:"source_image_name" required:"false"`
// The instance type your cvm will be launched by.
// You should reference Instace Type
// for parameter taking.
@ -108,11 +111,11 @@ func (cf *TencentCloudRunConfig) Prepare(ctx *interpolate.Context) []error {
}
errs := cf.Comm.Prepare(ctx)
if cf.SourceImageId == "" {
errs = append(errs, errors.New("source_image_id must be specified"))
if cf.SourceImageId == "" && cf.SourceImageName == "" {
errs = append(errs, errors.New("source_image_id or source_image_name must be specified"))
}
if !CheckResourceIdFormat("img", cf.SourceImageId) {
if cf.SourceImageId != "" && !CheckResourceIdFormat("img", cf.SourceImageId) {
errs = append(errs, errors.New("source_image_id wrong format"))
}

33
builder/tencentcloud/cvm/step_check_source_image.go
View File

@ -3,6 +3,7 @@ package cvm
import (
"context"
"fmt"
"regexp"
"github.com/hashicorp/packer/helper/multistep"
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
@ -13,16 +14,27 @@ type stepCheckSourceImage struct {
}
func (s *stepCheckSourceImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
var (
imageNameRegex *regexp.Regexp
err error
)
config := state.Get("config").(*Config)
client := state.Get("cvm_client").(*cvm.Client)
Say(state, config.SourceImageId, "Trying to check source image")
req := cvm.NewDescribeImagesRequest()
req.ImageIds = []*string{&config.SourceImageId}
req.InstanceType = &config.InstanceType
if config.SourceImageId != "" {
req.ImageIds = []*string{&config.SourceImageId}
} else {
imageNameRegex, err = regexp.Compile(config.SourceImageName)
if err != nil {
return Halt(state, fmt.Errorf("regex compilation error"), "Bad input")
}
}
var resp *cvm.DescribeImagesResponse
err := Retry(ctx, func(ctx context.Context) error {
err = Retry(ctx, func(ctx context.Context) error {
var err error
resp, err = client.DescribeImages(req)
return err
@ -32,9 +44,20 @@ func (s *stepCheckSourceImage) Run(ctx context.Context, state multistep.StateBag
}
if *resp.Response.TotalCount > 0 {
state.Put("source_image", resp.Response.ImageSet[0])
Message(state, *resp.Response.ImageSet[0].ImageName, "Image found")
return multistep.ActionContinue
images := resp.Response.ImageSet
if imageNameRegex != nil {
for _, image := range images {
if imageNameRegex.MatchString(*image.ImageName) {
state.Put("source_image", image)
Message(state, *image.ImageName, "Image found")
return multistep.ActionContinue
}
}
} else {
state.Put("source_image", images[0])
Message(state, *resp.Response.ImageSet[0].ImageName, "Image found")
return multistep.ActionContinue
}
}
return Halt(state, fmt.Errorf("No image found under current instance_type(%s) restriction", config.InstanceType), "")

6
website/pages/partials/builder/tencentcloud/cvm/TencentCloudRunConfig-not-required.mdx
View File

@ -3,6 +3,12 @@
- `associate_public_ip_address` (bool) - Whether allocate public ip to your cvm.
Default value is false.
- `source_image_id` (string) - The base image id of Image you want to create
your customized image from.
- `source_image_name` (string) - The base image name of Image you want to create your
customized image from.Conflict with SourceImageId.
- `instance_name` (string) - Instance name.
- `disk_type` (string) - Root disk type your cvm will be launched by. you could

3
website/pages/partials/builder/tencentcloud/cvm/TencentCloudRunConfig-required.mdx
View File

@ -1,8 +1,5 @@
<!-- Code generated from the comments of the TencentCloudRunConfig struct in builder/tencentcloud/cvm/run_config.go; DO NOT EDIT MANUALLY -->
- `source_image_id` (string) - The base image id of Image you want to create
your customized image from.
- `instance_type` (string) - The instance type your cvm will be launched by.
You should reference Instace Type
for parameter taking.