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

Merge pull request #7074 from hashicorp/fix_3329 

vmware-iso (esxi) Add check that "format" is not being set when remote_type is empty.
This commit is contained in:
Megan Marsh 2019-02-28 15:30:54 -08:00 committed by GitHub
parent 424a6a3a7e dbfc1b5aff
commit 0371e2a1b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/vmware/iso/builder_test.go
View File

@ -171,6 +171,7 @@ func TestBuilderPrepare_RemoteType(t *testing.T) {
// Good
config["remote_type"] = ""
config["format"] = ""
config["remote_host"] = ""
config["remote_password"] = ""
config["remote_private_key_file"] = ""
@ -245,6 +246,11 @@ func TestBuilderPrepare_Format(t *testing.T) {
for _, format := range goodFormats {
// Good
config["format"] = format
config["remote_type"] = "esx5"
config["remote_host"] = "hosty.hostface"
config["remote_password"] = "password"
config["skip_validate_credentials"] = true
b = Builder{}
warns, err = b.Prepare(config)
if len(warns) > 0 {

7
builder/vmware/iso/config.go
View File

@ -167,7 +167,12 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
}
}
if c.Format == "" {
if c.Format != "" {
if c.RemoteType != "esx5" {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("format is only valid when RemoteType=esx5"))
}
} else {
c.Format = "ovf"
}

7
builder/vmware/vmx/config.go
View File

@ -98,7 +98,12 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
errs = packer.MultiErrorAppend(errs, err)
}
if c.Format == "" {
if c.Format != "" {
if c.RemoteType != "esx5" {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("format is only valid when RemoteType=esx5"))
}
} else {
c.Format = "ovf"
}