Fixing null pointer

travis-ci · Jul 15, 2020 · e877b49 · e877b49
1 parent 26d6b53
commit e877b49
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/backend/ec2.go b/backend/ec2.go
@@ -507,7 +507,7 @@ func (p *ec2Provider) Start(ctx gocontext.Context, startAttributes *StartAttribu
 			if instances != nil {
 				instance := instances.Reservations[0].Instances[0]
 				address := *instance.PrivateIpAddress
-				if p.publicIPConnect {
+				if instance.PublicIpAddress != nil && p.publicIPConnect {
 					address = *instance.PublicIpAddress
 				}
 				if address != "" {
@@ -633,7 +633,7 @@ func (i *ec2Instance) uploadScriptSCP(ctx gocontext.Context, script []byte) erro
 
 func (i *ec2Instance) sshConnection(ctx gocontext.Context) (ssh.Connection, error) {
 	ip := *i.instance.PrivateIpAddress
-	if i.provider.publicIPConnect {
+	if i.instance.PublicIpAddress != nil && i.provider.publicIPConnect {
 		ip = *i.instance.PublicIpAddress
 	}
 	return i.sshDialer.Dial(fmt.Sprintf("%s:22", ip), defaultEC2SSHUserName, i.provider.sshDialTimeout)