iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-09-21 07:21:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

builder/amazon: guard aginst empty/nil PrivateIpAddress and updated tests.

Browse Source
This commit is contained in:
Rickard von Essen
2016-09-14 00:16:09 +02:00
parent f6f50cd1df
commit 067155c344
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/amazon/common/ssh.go
+1 -1
View File
@@ -34,7 +34,7 @@ func SSHHost(e ec2Describer, private bool) func(multistep.StateBag) (string, err
} else if i.PrivateIpAddress != nil && *i.PrivateIpAddress != "" {
host = *i.PrivateIpAddress
}
} else if private {
} else if private && i.PrivateIpAddress != nil && *i.PrivateIpAddress != "" {
host = *i.PrivateIpAddress
} else if i.PublicDnsName != nil && *i.PublicDnsName != "" {
host = *i.PublicDnsName
builder/amazon/common/ssh_test.go
+4 -4
View File
@@ -28,15 +28,15 @@ func TestSSHHost(t *testing.T) {
wantHost string
}{
{1, "", false, true, publicDNS},
{1, "", true, true, publicDNS},
{1, "", true, true, privateIP},
{1, "vpc-id", false, true, publicIP},
{1, "vpc-id", true, true, privateIP},
{2, "", false, true, publicDNS},
{2, "", true, true, publicDNS},
{2, "", true, true, privateIP},
{2, "vpc-id", false, true, publicIP},
{2, "vpc-id", true, true, privateIP},
{3, "", false, false, ""},
{3, "", true, false, ""},
{2, "", false, true, publicDNS},
{2, "", true, true, privateIP},
{3, "vpc-id", false, false, ""},
{3, "vpc-id", true, false, ""},
}