app-mapper: govet, golint, errcheck fixes

app-mapper/app_provisioner.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"time"
 
+	"github.com/Sirupsen/logrus"
 	docker "github.com/fsouza/go-dockerclient"
 )
 
@@ -62,7 +63,9 @@ func (p *dockerProvisioner) runApp(appID string) (hostname string, err error) {
 	}
 	defer func() {
 		if err != nil {
-			p.destroyApp(appID)
+			if err := p.destroyApp(appID); err != nil {
+				logrus.Warnf("docker provisioner: destroy app %q: %v", appID, err)
+			}
 		}
 	}()
 

app-mapper/authenticator_test.go

@@ -142,7 +142,8 @@ func TestBadServerResponse(t *testing.T) {
 
 	shFunc := func(w http.ResponseWriter, r *http.Request, orgName string) {
 		w.WriteHeader(http.StatusOK)
-		w.Write(responseBody)
+		_, err := w.Write(responseBody)
+		assert.NoError(t, err, "Couldn't write response body")
 	}
 
 	testFunc := func(a authenticator) {

app-mapper/organization_mapper.go

@@ -77,7 +77,9 @@ func (m *dbMapper) runTransaction(runner func(*sqlx.Tx) error) error {
 	}
 
 	if err = runner(tx); err != nil {
-		tx.Rollback()
+		if err2 := tx.Rollback(); err2 != nil {
+			logrus.Warnf("organization mapper: transaction rollback: %v", err2)
+		}
 		return err
 	}
 

app-mapper/proxy.go

@@ -145,7 +145,9 @@ func proxyWS(targetHost string, w http.ResponseWriter, r *http.Request) {
 	var wg sync.WaitGroup
 	cp := func(dst io.Writer, src io.Reader, tag string) {
 		defer wg.Done()
-		io.Copy(dst, src)
+		if _, err := io.Copy(dst, src); err != nil {
+			logrus.Debugf("proxy: websocket: %q io.Copy: %v", tag, err) // EOF is normal
+		}
 		logrus.Debugf("proxy: websocket: %q copier exited", tag)
 	}
 	wg.Add(2)

app-mapper/proxy_test.go

@@ -57,12 +57,11 @@ func testHTTPRequest(t *testing.T, req *http.Request) {
 		//  caches clients, and doesn't explicitly close them)
 		w.Header().Set("Connection", "close")
 		w.WriteHeader(http.StatusOK)
-		w.Write(targetResponse)
+		_, err := w.Write(targetResponse)
+		assert.NoError(t, err, "Couldn't write response body")
 	})
 
-	var recordedOrgName string
 	authenticator := authenticatorFunc(func(r *http.Request, orgName string) (authenticatorResponse, error) {
-		recordedOrgName = orgName
 		return authenticatorResponse{"somePersistentInternalID"}, nil
 	})
 
@@ -300,7 +299,8 @@ func TestUnauthorized(t *testing.T) {
 func TestProxyWebSocket(t *testing.T) {
 	// Use a websocket echo server in the target
 	targetHandler := websocket.Handler(func(ws *websocket.Conn) {
-		io.Copy(ws, ws)
+		_, err := io.Copy(ws, ws)
+		assert.NoError(t, err, "Target handler copy failed")
 	})
 
 	testFunc := func(proxyHost string) {
@@ -315,7 +315,7 @@ func TestProxyWebSocket(t *testing.T) {
 		for i := 0; i < 100; i++ {
 			err = websocket.Message.Send(ws, messageToSend)
 			require.NoError(t, err, "Error sending message")
-			websocket.Message.Receive(ws, &messageToReceive)
+			err = websocket.Message.Receive(ws, &messageToReceive)
 			require.NoError(t, err, "Error receiving message")
 			require.Equal(t, messageToSend, messageToReceive)
 			messageToReceive = ""