Merge pull request #38 from gruntwork-io/ssh-timeout

Set connection timeouts

Author: brikis98

http/http_helper.go

@@ -13,7 +13,12 @@ import (
 func HttpGet(url string, logger *log.Logger) (int, string, error) {
 	logger.Println("Making an HTTP GET call to URL", url)
 
-	resp, err := http.Get(url)
+	client := http.Client{
+		// By default, Go does not impose a timeout, so an HTTP connection attempt can hang for a LONG time.
+		Timeout: 10 * time.Second,
+	}
+
+	resp, err := client.Get(url)
 	if err != nil {
 		return -1, "", err
 	}

ssh/ssh.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"golang.org/x/crypto/ssh"
 	"net"
+	"time"
 )
 
 type Host struct {
@@ -166,6 +167,8 @@ func createSshClientConfig(hostOptions *SshConnectionOptions) *ssh.ClientConfig
 		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
 			return nil
 		},
+		// By default, Go does not impose a timeout, so a SSH connection attempt can hang for a LONG time.
+		Timeout: 10 * time.Second,
 	}
 	clientConfig.SetDefaults()
 	return clientConfig