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

address review feedback

This commit is contained in:
Miles Crabill 2019-09-16 13:50:43 -07:00
parent 328baced05
commit 2bff60bac8
No known key found for this signature in database
GPG Key ID: 931A9CF57AEAC02D
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/googlecompute/config.go
View File

@ -144,17 +144,15 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
} }
// used for ImageName and ImageFamily // used for ImageName and ImageFamily
imageErrorText := "Invalid image %s: The first character must be a lowercase letter, and all following characters must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash" imageErrorText := "Invalid image %s %q: The first character must be a lowercase letter, and all following characters must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash"
if len(c.ImageName) > 63 { if len(c.ImageName) > 63 {
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
errors.New("Invalid image name: Must not be longer than 63 characters")) errors.New("Invalid image name: Must not be longer than 63 characters"))
} }
// replaces invalid characters with hyphens
c.ImageName = templateCleanImageName(c.ImageName)
if !validImageName.MatchString(c.ImageName) { if !validImageName.MatchString(c.ImageName) {
errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "name"))) errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "name", c.ImageName)))
} }
if len(c.ImageFamily) > 63 { if len(c.ImageFamily) > 63 {
@ -164,7 +162,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
if c.ImageFamily != "" { if c.ImageFamily != "" {
if !validImageName.MatchString(c.ImageFamily) { if !validImageName.MatchString(c.ImageFamily) {
errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "family"))) errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf(imageErrorText, "family", c.ImageFamily)))
} }
} }

4
builder/googlecompute/config_test.go
View File

@ -157,10 +157,10 @@ func TestConfigPrepare(t *testing.T) {
true, true,
}, },
{ {
// underscore will be replaced // underscore is not allowed
"image_name", "image_name",
"foo_bar", "foo_bar",
false, true,
}, },
{ {
// too long // too long