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

Merge pull request #3091 from ryanuber/f-googlecompute-imagename 

builder/googlecompute: fix image name defaults
This commit is contained in:
Chris Bednarski 2016-01-19 11:23:03 -08:00
parent 76c49f6ed0 7732cf45a0
commit 7396bb2090
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/googlecompute/config.go
View File

@ -81,6 +81,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
if err != nil { if err != nil {
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
fmt.Errorf("Unable to parse image name: %s ", err)) fmt.Errorf("Unable to parse image name: %s ", err))
} else {
c.ImageName = img c.ImageName = img
} }
} }

3
builder/googlecompute/config_test.go
View File

@ -160,6 +160,9 @@ func TestConfigDefaults(t *testing.T) {
func TestImageName(t *testing.T) { func TestImageName(t *testing.T) {
c, _, _ := NewConfig(testConfig(t)) c, _, _ := NewConfig(testConfig(t))
if !strings.HasPrefix(c.ImageName, "packer-") {
t.Fatalf("ImageName should have 'packer-' prefix, found %s", c.ImageName)
}
if strings.Contains(c.ImageName, "{{timestamp}}") { if strings.Contains(c.ImageName, "{{timestamp}}") {
t.Errorf("ImageName should be interpolated; found %s", c.ImageName) t.Errorf("ImageName should be interpolated; found %s", c.ImageName)
} }