group internal imports to make lint independent from pkg name

orymate · Jan 18, 2019 · f9c91ec · f9c91ec
1 parent e0f9fc4
commit f9c91ec
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 13 deletions.
diff --git a/internal/app.go b/internal/app.go
@@ -7,6 +7,7 @@ import (
 	"github.com/goph/emperror"
 	"github.com/goph/logur"
 	"github.com/gorilla/mux"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingadapter"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingdriver"

diff --git a/internal/greeting/greetingadapter/helloworld_events.go b/internal/greeting/greetingadapter/helloworld_events.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ThreeDotsLabs/watermill/message/router/middleware"
 	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )
 

diff --git a/internal/greeting/greetingadapter/helloworld_events_test.go b/internal/greeting/greetingadapter/helloworld_events_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )
 
 func TestHelloWorldEvents_SaidHello(t *testing.T) {

diff --git a/internal/greeting/greetingadapter/logger.go b/internal/greeting/greetingadapter/logger.go
@@ -2,6 +2,7 @@ package greetingadapter
 
 import (
 	"github.com/goph/logur"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )
 

diff --git a/internal/greeting/greetingadapter/sayhello_events.go b/internal/greeting/greetingadapter/sayhello_events.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ThreeDotsLabs/watermill/message/router/middleware"
 	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )
 

diff --git a/internal/greeting/greetingadapter/sayhello_events_test.go b/internal/greeting/greetingadapter/sayhello_events_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )
 
 func TestSayHelloEvents_SaidHelloTo(t *testing.T) {

diff --git a/internal/greeting/greetingdriver/greeting_controller.go b/internal/greeting/greetingdriver/greeting_controller.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/goph/emperror"
+
 	"github.com/sagikazarmark/modern-go-application/.gen/openapi/go"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )

diff --git a/internal/greeting/greetingdriver/greeting_web_output.go b/internal/greeting/greetingdriver/greeting_web_output.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 
 	"github.com/goph/emperror"
+
 	"github.com/sagikazarmark/modern-go-application/.gen/openapi/go"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )

diff --git a/internal/greeting/greetingdriver/greeting_web_output_test.go b/internal/greeting/greetingdriver/greeting_web_output_test.go
@@ -10,9 +10,10 @@ import (
 
 	"github.com/goph/emperror"
 	"github.com/pkg/errors"
-	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 )
 
 type helloWorldViewStub struct {

diff --git a/internal/greeting/helloworld_integration_test.go b/internal/greeting/helloworld_integration_test.go
@@ -7,12 +7,13 @@ import (
 	"testing"
 
 	"github.com/goph/emperror"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/sagikazarmark/modern-go-application/.gen/openapi/go"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingadapter"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingdriver"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func testHelloWorld(t *testing.T) {

diff --git a/internal/greeting/helloworld_test.go b/internal/greeting/helloworld_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 
 	"github.com/goph/emperror"
+	"github.com/stretchr/testify/assert"
+
 	. "github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingadapter"
-	"github.com/stretchr/testify/assert"
 )
 
 type helloWorldOutputStub struct {

diff --git a/internal/greeting/sayhello_integration_test.go b/internal/greeting/sayhello_integration_test.go
@@ -8,12 +8,13 @@ import (
 	"testing"
 
 	"github.com/goph/emperror"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/sagikazarmark/modern-go-application/.gen/openapi/go"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingadapter"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingdriver"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func testSayHello(t *testing.T) {

diff --git a/internal/greeting/sayhello_test.go b/internal/greeting/sayhello_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 
 	"github.com/goph/emperror"
+	"github.com/stretchr/testify/assert"
+
 	. "github.com/sagikazarmark/modern-go-application/internal/greeting"
 	"github.com/sagikazarmark/modern-go-application/internal/greeting/greetingadapter"
-	"github.com/stretchr/testify/assert"
 )
 
 type sayHelloOutputStub struct {

diff --git a/internal/greetingworker/greetingworkeradapter/logger.go b/internal/greetingworker/greetingworkeradapter/logger.go
@@ -2,6 +2,7 @@ package greetingworkeradapter
 
 import (
 	"github.com/goph/logur"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greetingworker"
 )
 

diff --git a/internal/greetingworker/greetingworkerdriver/helloworld_event_handler.go b/internal/greetingworker/greetingworkerdriver/helloworld_event_handler.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/pkg/errors"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greetingworker"
 )
 

diff --git a/internal/greetingworker/greetingworkerdriver/sayhello_event_handler.go b/internal/greetingworker/greetingworkerdriver/sayhello_event_handler.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/pkg/errors"
+
 	"github.com/sagikazarmark/modern-go-application/internal/greetingworker"
 )
 

diff --git a/internal/greetingworker/helloworld_event_logger_test.go b/internal/greetingworker/helloworld_event_logger_test.go
@@ -5,10 +5,11 @@ import (
 	"testing"
 
 	"github.com/goph/logur"
-	. "github.com/sagikazarmark/modern-go-application/internal/greetingworker"
-	"github.com/sagikazarmark/modern-go-application/internal/greetingworker/greetingworkeradapter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/sagikazarmark/modern-go-application/internal/greetingworker"
+	"github.com/sagikazarmark/modern-go-application/internal/greetingworker/greetingworkeradapter"
 )
 
 func TestHelloWorldEventLogger_SaidHello(t *testing.T) {

diff --git a/internal/greetingworker/sayhello_event_logger_test.go b/internal/greetingworker/sayhello_event_logger_test.go
@@ -5,10 +5,11 @@ import (
 	"testing"
 
 	"github.com/goph/logur"
-	. "github.com/sagikazarmark/modern-go-application/internal/greetingworker"
-	"github.com/sagikazarmark/modern-go-application/internal/greetingworker/greetingworkeradapter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/sagikazarmark/modern-go-application/internal/greetingworker"
+	"github.com/sagikazarmark/modern-go-application/internal/greetingworker/greetingworkeradapter"
 )
 
 func TestSayHelloEventLogger_SaidHelloTo(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package greetingadapter @@
     import (
     	"github.com/goph/logur"
     	"github.com/sagikazarmark/modern-go-application/internal/greeting"
     )
@@ Expand Down @@