Merge pull request #7786 from zqfan/tencent-rm-img-name-limit

remove image name check in tencentcloud builder
pull/7810/head
Megan Marsh 7 years ago committed by GitHub
commit 350894200e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,7 +2,6 @@ package cvm
import ( import (
"fmt" "fmt"
"regexp"
"github.com/hashicorp/packer/template/interpolate" "github.com/hashicorp/packer/template/interpolate"
) )
@ -26,11 +25,6 @@ func (cf *TencentCloudImageConfig) Prepare(ctx *interpolate.Context) []error {
errs = append(errs, fmt.Errorf("image_name must be set")) errs = append(errs, fmt.Errorf("image_name must be set"))
} else if len(cf.ImageName) > 20 { } else if len(cf.ImageName) > 20 {
errs = append(errs, fmt.Errorf("image_num length should not exceed 20 characters")) errs = append(errs, fmt.Errorf("image_num length should not exceed 20 characters"))
} else {
regex := regexp.MustCompile("^[0-9a-zA-Z\\-]+$")
if !regex.MatchString(cf.ImageName) {
errs = append(errs, fmt.Errorf("image_name can only be composed of letters, numbers and minus sign"))
}
} }
if len(cf.ImageDescription) > 60 { if len(cf.ImageDescription) > 60 {

@ -11,9 +11,9 @@ func TestTencentCloudImageConfig_Prepare(t *testing.T) {
t.Fatalf("shouldn't have err: %v", err) t.Fatalf("shouldn't have err: %v", err)
} }
cf.ImageName = "foo:" cf.ImageName = "foo.:"
if err := cf.Prepare(nil); err == nil { if err := cf.Prepare(nil); err != nil {
t.Fatal("should have error") t.Fatal("shouldn't have error")
} }
cf.ImageName = "foo" cf.ImageName = "foo"

Loading…
Cancel
Save