Manually compact some import-groups so goimports will maintain them more nicely

Somewhat surprisingly, goimports does not have a way to forcefully merge groups into its 3-tier structure.
Personally I'd like to do that for consistency, allowing separate groups only if documented.

But meh.  They're kinda unlikely to degrade, and it doesn't really matter if they do.

Author: Groxx

internal/common/auth/service_wrapper_test.go

@@ -25,15 +25,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber/tchannel-go/thrift"
-
-	"go.uber.org/cadence/.gen/go/shared"
-
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/suite"
+	"github.com/uber/tchannel-go/thrift"
 
 	"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
-
-	"github.com/stretchr/testify/suite"
+	"go.uber.org/cadence/.gen/go/shared"
 )
 
 type (

internal/compatibility/enum_test.go

@@ -24,12 +24,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
 
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/compatibility/proto"
 	"go.uber.org/cadence/internal/compatibility/thrift"
-
-	apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
 )
 
 const UnknownValue = 9999

internal/compatibility/proto/error.go

@@ -21,12 +21,11 @@
 package proto
 
 import (
+	apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
 	"go.uber.org/yarpc/encoding/protobuf"
 	"go.uber.org/yarpc/yarpcerrors"
 
 	"go.uber.org/cadence/.gen/go/shared"
-
-	apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
 )
 
 func Error(err error) error {

internal/compatibility/thrift/error.go

@@ -23,13 +23,12 @@ package thrift
 import (
 	"errors"
 
+	apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
 	"go.uber.org/yarpc/encoding/protobuf"
 	"go.uber.org/yarpc/yarpcerrors"
 
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
-
-	apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
 )
 
 func Error(err error) error {

internal/internal_workflow_client_test.go

@@ -29,19 +29,16 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang/mock/gomock"
+	"github.com/pborman/uuid"
+	"github.com/stretchr/testify/suite"
 	"go.uber.org/yarpc"
 
-	"go.uber.org/cadence/internal/common/serializer"
-
 	"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/internal/common"
-
-	"github.com/golang/mock/gomock"
-	"github.com/pborman/uuid"
-	"github.com/stretchr/testify/suite"
-
 	"go.uber.org/cadence/internal/common/metrics"
+	"go.uber.org/cadence/internal/common/serializer"
 )
 
 const (

test/integration_test.go

@@ -30,20 +30,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber-go/tally"
-
-	"go.uber.org/cadence/internal"
-
 	"github.com/pborman/uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/uber-go/tally"
 	"go.uber.org/goleak"
 	"go.uber.org/zap/zaptest"
 
 	"go.uber.org/cadence"
 	"go.uber.org/cadence/.gen/go/shared"
 	"go.uber.org/cadence/client"
 	"go.uber.org/cadence/interceptors"
+	"go.uber.org/cadence/internal"
 	"go.uber.org/cadence/worker"
 	"go.uber.org/cadence/workflow"
 )