TUN-4067: Reformat code for consistent import order, grouping, and fix formatting. Added goimports target to the Makefile to make this easier in the future.

token/path.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/go-homedir"
+	homedir "github.com/mitchellh/go-homedir"
 
 	"github.com/cloudflare/cloudflared/config"
 )

token/shell.go

@@ -4,4 +4,3 @@ package token
 func OpenBrowser(url string) error {
 	return getBrowserCmd(url).Start()
 }
-

token/token.go

@@ -13,12 +13,12 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/cloudflare/cloudflared/config"
-	"github.com/cloudflare/cloudflared/origin"
-
 	"github.com/coreos/go-oidc/jose"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/cloudflare/cloudflared/config"
+	"github.com/cloudflare/cloudflared/origin"
 )
 
 const (

token/token_test.go

@@ -17,7 +17,7 @@ func TestSignalHandler(t *testing.T) {
 	handlerRan := false
 	done := make(chan struct{})
 	timer := time.NewTimer(time.Second)
-	sigHandler.register(func(){
+	sigHandler.register(func() {
 		handlerRan = true
 		done <- struct{}{}
 	})
@@ -28,10 +28,10 @@ func TestSignalHandler(t *testing.T) {
 
 	// Blocks for up to one second to make sure the handler callback runs before the assert.
 	select {
-		case <- done:
-			assert.True(t, handlerRan)
-		case <- timer.C:
-			t.Fail()
+	case <-done:
+		assert.True(t, handlerRan)
+	case <-timer.C:
+		t.Fail()
 	}
 	sigHandler.deregister()
 }
@@ -40,15 +40,15 @@ func TestSignalHandlerClose(t *testing.T) {
 	sigHandler := signalHandler{signals: []os.Signal{syscall.SIGUSR1}}
 	done := make(chan struct{})
 	timer := time.NewTimer(time.Second)
-	sigHandler.register(func(){done <- struct{}{}})
+	sigHandler.register(func() { done <- struct{}{} })
 	sigHandler.deregister()
 
 	p, err := os.FindProcess(os.Getpid())
 	require.Nil(t, err)
 	p.Signal(syscall.SIGUSR1)
 	select {
-	case <- done:
+	case <-done:
 		t.Fail()
-	case <- timer.C:
+	case <-timer.C:
 	}
 }