refactoring; fix imports

components/guns/http/base.go

@@ -12,10 +12,11 @@ import (
 	"net/url"
 
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
+
 	"github.com/yandex/pandora/core"
 	"github.com/yandex/pandora/core/aggregator/netsample"
 	"github.com/yandex/pandora/core/warmup"
-	"go.uber.org/zap"
 )
 
 const (

components/guns/http/base_test.go

@@ -14,15 +14,16 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
 	ammomock "github.com/yandex/pandora/components/guns/http/mocks"
 	"github.com/yandex/pandora/core"
 	"github.com/yandex/pandora/core/aggregator/netsample"
 	"github.com/yandex/pandora/core/coretest"
 	"github.com/yandex/pandora/core/engine"
 	"github.com/yandex/pandora/lib/monitoring"
 	"github.com/yandex/pandora/lib/testutil"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 )
 
 func newLogger() *zap.Logger {

components/guns/http/client.go

@@ -8,9 +8,10 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/yandex/pandora/lib/netutil"
 	"go.uber.org/zap"
 	"golang.org/x/net/http2"
+
+	"github.com/yandex/pandora/lib/netutil"
 )
 
 //go:generate mockery --name=Client --case=underscore --inpackage --testonly

components/guns/http/connect.go

@@ -10,8 +10,9 @@ import (
 	"net/url"
 
 	"github.com/pkg/errors"
-	"github.com/yandex/pandora/lib/netutil"
 	"go.uber.org/zap"
+
+	"github.com/yandex/pandora/lib/netutil"
 )
 
 func NewConnectGun(cfg HTTPGunConfig, answLog *zap.Logger) *BaseGun {

components/guns/http/http_test.go

@@ -8,12 +8,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	ammomock "github.com/yandex/pandora/components/guns/http/mocks"
-	"github.com/yandex/pandora/core/aggregator/netsample"
-	"github.com/yandex/pandora/core/config"
 	"go.uber.org/atomic"
 	"go.uber.org/zap"
 	"golang.org/x/net/http2"
+
+	ammomock "github.com/yandex/pandora/components/guns/http/mocks"
+	"github.com/yandex/pandora/core/aggregator/netsample"
+	"github.com/yandex/pandora/core/config"
 )
 
 func TestBaseGun_GunClientConfig_decode(t *testing.T) {

components/guns/http/wrapper.go

@@ -1,11 +1,11 @@
 package phttp
 
 import (
-	"github.com/yandex/pandora/core/warmup"
 	"net/http"
 
 	"github.com/yandex/pandora/core"
 	"github.com/yandex/pandora/core/aggregator/netsample"
+	"github.com/yandex/pandora/core/warmup"
 )
 
 //go:generate mockery --name=Ammo --case=underscore --outpkg=ammomock

components/guns/http_scenario/gun.go

@@ -13,10 +13,11 @@ import (
 	"strings"
 	"time"
 
+	"go.uber.org/zap"
+
 	phttp "github.com/yandex/pandora/components/guns/http"
 	"github.com/yandex/pandora/core"
 	"github.com/yandex/pandora/core/aggregator/netsample"
-	"go.uber.org/zap"
 )
 
 type Gun interface {

components/guns/http_scenario/import.go

@@ -4,13 +4,14 @@ import (
 	"net"
 
 	"github.com/spf13/afero"
+	"go.uber.org/zap"
+
 	phttp "github.com/yandex/pandora/components/guns/http"
 	"github.com/yandex/pandora/core"
 	"github.com/yandex/pandora/core/aggregator/netsample"
 	"github.com/yandex/pandora/core/register"
 	"github.com/yandex/pandora/lib/answlog"
 	"github.com/yandex/pandora/lib/netutil"
-	"go.uber.org/zap"
 )
 
 func WrapGun(g Gun) core.Gun {

components/guns/http_scenario/new.go

@@ -4,8 +4,9 @@ import (
 	"errors"
 	"net"
 
-	phttp "github.com/yandex/pandora/components/guns/http"
 	"go.uber.org/zap"
+
+	phttp "github.com/yandex/pandora/components/guns/http"
 )
 
 func NewHTTPGun(conf phttp.HTTPGunConfig, answLog *zap.Logger, targetResolved string) *BaseGun {

components/phttp/import/import.go

@@ -4,6 +4,8 @@ import (
 	"net"
 
 	"github.com/spf13/afero"
+	"go.uber.org/zap"
+
 	phttp "github.com/yandex/pandora/components/guns/http"
 	scenarioGun "github.com/yandex/pandora/components/guns/http_scenario"
 	httpProvider "github.com/yandex/pandora/components/providers/http"
@@ -12,7 +14,6 @@ import (
 	"github.com/yandex/pandora/core/register"
 	"github.com/yandex/pandora/lib/answlog"
 	"github.com/yandex/pandora/lib/netutil"
-	"go.uber.org/zap"
 )
 
 func Import(fs afero.Fs) {

tests/http_scenario/main_test.go

@@ -11,6 +11,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"go.uber.org/zap"
+
 	phttp "github.com/yandex/pandora/components/guns/http"
 	httpscenario "github.com/yandex/pandora/components/guns/http_scenario"
 	ammo "github.com/yandex/pandora/components/providers/scenario"
@@ -20,7 +22,6 @@ import (
 	"github.com/yandex/pandora/core/aggregator/netsample"
 	"github.com/yandex/pandora/core/plugin/pluginconfig"
 	"github.com/yandex/pandora/examples/http/server"
-	"go.uber.org/zap"
 )
 
 var testOnce = &sync.Once{}