Merge pull request #45 from balena-io/update-go

update to Go v1.11.5

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     working_directory: /go/src/github.com/balena-io/sshproxy
     docker:
-      - image: golang:1.11.4
+      - image: golang:1.11.5
     steps:
       - checkout
       - run:

balena/auth.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/balena-io/pinejs-client-go"
+	pinejs "github.com/balena-io/pinejs-client-go"
 	"golang.org/x/crypto/ssh"
 )
 

balena/main.go

@@ -30,7 +30,7 @@ import (
 	"syscall"
 
 	"github.com/balena-io/sshproxy"
-	"github.com/getsentry/raven-go"
+	raven "github.com/getsentry/raven-go"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"golang.org/x/crypto/ssh"

sshproxy.go

@@ -151,13 +151,13 @@ func (s *Server) upgradeConnection(conn net.Conn) {
 		}
 		return
 	}
-	if (s.verbosity >= 2) {
+	if s.verbosity >= 2 {
 		log.Printf("New SSH connection from %s (%s)", conn.RemoteAddr(), sshConn.ClientVersion())
 	}
 
 	defer func() {
 		conn.Close()
-		if (s.verbosity >= 2) {
+		if s.verbosity >= 2 {
 			log.Printf("Closed connection to %s", conn.RemoteAddr())
 		}
 	}()
@@ -169,7 +169,7 @@ func (s *Server) upgradeConnection(conn net.Conn) {
 func (s *Server) handleChannels(chans <-chan ssh.NewChannel, conn *ssh.ServerConn) {
 	var wg sync.WaitGroup
 	for newChannel := range chans {
-		if (s.verbosity >= 2) {
+		if s.verbosity >= 2 {
 			log.Printf("New SSH channel from %s", conn.RemoteAddr())
 		}
 		if chanType := newChannel.ChannelType(); chanType != "session" {
@@ -181,7 +181,7 @@ func (s *Server) handleChannels(chans <-chan ssh.NewChannel, conn *ssh.ServerCon
 
 		channel, reqs, err := newChannel.Accept()
 		if err != nil {
-			if (s.verbosity >= 1) {
+			if s.verbosity >= 1 {
 				log.Printf("Could not accept channel request (%s)", err)
 			}
 			continue