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

Fix potential nil pointer errors in ported code

Browse Source 
This commit adds extra nil checks for some pointers which were not
necessary when using goamz
This commit is contained in:
James Nugent 2015-04-15 12:13:06 -07:00
parent 33b4f5cc0a
commit 65a9347b1e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/amazon/common/ssh.go
View File

@ -17,13 +17,13 @@ func SSHAddress(e *ec2.EC2, port int, private bool) func(multistep.StateBag) (st
for j := 0; j < 2; j++ {
var host string
i := state.Get("instance").(*ec2.Instance)
if *i.VPCID != "" {
if *i.PublicIPAddress != "" && !private {
if i.VPCID != nil && *i.VPCID != "" {
if i.PublicIPAddress != nil && *i.PublicIPAddress != "" && !private {
host = *i.PublicIPAddress
} else {
host = *i.PrivateIPAddress
}
} else if *i.PublicDNSName != "" {
} else if i.PublicDNSName != nil && *i.PublicDNSName != "" {
host = *i.PublicDNSName
}

6
builder/amazon/common/step_run_source_instance.go
View File

@ -261,15 +261,15 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
}
if s.Debug {
if *s.instance.PublicDNSName != "" {
if s.instance.PublicDNSName != nil && *s.instance.PublicDNSName != "" {
ui.Message(fmt.Sprintf("Public DNS: %s", *s.instance.PublicDNSName))
}
if *s.instance.PublicIPAddress != "" {
if s.instance.PublicIPAddress != nil && *s.instance.PublicIPAddress != "" {
ui.Message(fmt.Sprintf("Public IP: %s", *s.instance.PublicIPAddress))
}
if *s.instance.PrivateIPAddress != "" {
if s.instance.PrivateIPAddress != nil && *s.instance.PrivateIPAddress != "" {
ui.Message(fmt.Sprintf("Private IP: %s", *s.instance.PrivateIPAddress))
}
}