Move root plugins to the pkg

34 files changed, 24 insertions, 24 deletions

diff --git a/cmd/cli/workers.go b/cmd/cli/workers.go
index 03639aa4..94c339e2 100644
--- a/cmd/cli/workers.go
+++ b/cmd/cli/workers.go
@@ -13,7 +13,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spiral/errors"
-	"github.com/spiral/roadrunner/v2/plugins/informer"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/informer"
 	"github.com/spiral/roadrunner/v2/tools"
 )
 
diff --git a/cmd/main.go b/cmd/main.go
index 5893fbcb..ec3d84ff 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -4,9 +4,9 @@ import (
 	"log"
 
 	"github.com/spiral/endure"
-	"github.com/spiral/roadrunner/v2/plugins/http"
-	"github.com/spiral/roadrunner/v2/plugins/informer"
-	"github.com/spiral/roadrunner/v2/plugins/server"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/http"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/informer"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 
 	"github.com/spiral/roadrunner-plugins/logger"
 	"github.com/spiral/roadrunner-plugins/metrics"
diff --git a/plugins/http/attributes/attributes.go b/pkg/plugins/http/attributes/attributes.go
index 4c453766..4c453766 100644
--- a/plugins/http/attributes/attributes.go
+++ b/pkg/plugins/http/attributes/attributes.go
diff --git a/plugins/http/config.go b/pkg/plugins/http/config.go
index 00d2940b..00d2940b 100644
--- a/plugins/http/config.go
+++ b/pkg/plugins/http/config.go
diff --git a/plugins/http/constants.go b/pkg/plugins/http/constants.go
index 773d1f46..773d1f46 100644
--- a/plugins/http/constants.go
+++ b/pkg/plugins/http/constants.go
diff --git a/plugins/http/errors.go b/pkg/plugins/http/errors.go
index fb8762ef..fb8762ef 100644
--- a/plugins/http/errors.go
+++ b/pkg/plugins/http/errors.go
diff --git a/plugins/http/errors_windows.go b/pkg/plugins/http/errors_windows.go
index 3d0ba04c..3d0ba04c 100644
--- a/plugins/http/errors_windows.go
+++ b/pkg/plugins/http/errors_windows.go
diff --git a/plugins/http/handler.go b/pkg/plugins/http/handler.go
index 08cee661..08cee661 100644
--- a/plugins/http/handler.go
+++ b/pkg/plugins/http/handler.go
diff --git a/plugins/http/parse.go b/pkg/plugins/http/parse.go
index d4a1604b..d4a1604b 100644
--- a/plugins/http/parse.go
+++ b/pkg/plugins/http/parse.go
diff --git a/plugins/http/plugin.go b/pkg/plugins/http/plugin.go
index 301468d1..d8ca6466 100644
--- a/plugins/http/plugin.go
+++ b/pkg/plugins/http/plugin.go
@@ -20,9 +20,9 @@ import (
 	"github.com/spiral/roadrunner-plugins/logger"
 	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/interfaces/worker"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/http/attributes"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
-	"github.com/spiral/roadrunner/v2/plugins/http/attributes"
-	"github.com/spiral/roadrunner/v2/plugins/server"
 	"github.com/spiral/roadrunner/v2/util"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
diff --git a/plugins/http/request.go b/pkg/plugins/http/request.go
index 16243bcc..9da05fd8 100644
--- a/plugins/http/request.go
+++ b/pkg/plugins/http/request.go
@@ -11,7 +11,7 @@ import (
 	j "github.com/json-iterator/go"
 	"github.com/spiral/roadrunner-plugins/logger"
 	"github.com/spiral/roadrunner/v2/pkg/payload"
-	"github.com/spiral/roadrunner/v2/plugins/http/attributes"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/http/attributes"
 )
 
 var json = j.ConfigCompatibleWithStandardLibrary
diff --git a/plugins/http/response.go b/pkg/plugins/http/response.go
index 17049ce1..17049ce1 100644
--- a/plugins/http/response.go
+++ b/pkg/plugins/http/response.go
diff --git a/plugins/http/uploads.go b/pkg/plugins/http/uploads.go
index 1f14cc0d..1f14cc0d 100644
--- a/plugins/http/uploads.go
+++ b/pkg/plugins/http/uploads.go
diff --git a/plugins/http/uploads_config.go b/pkg/plugins/http/uploads_config.go
index 4c20c8e8..4c20c8e8 100644
--- a/plugins/http/uploads_config.go
+++ b/pkg/plugins/http/uploads_config.go
diff --git a/plugins/informer/interface.go b/pkg/plugins/informer/interface.go
index 27139ae1..27139ae1 100644
--- a/plugins/informer/interface.go
+++ b/pkg/plugins/informer/interface.go
diff --git a/plugins/informer/plugin.go b/pkg/plugins/informer/plugin.go
index e2da7d86..e2da7d86 100644
--- a/plugins/informer/plugin.go
+++ b/pkg/plugins/informer/plugin.go
diff --git a/plugins/informer/rpc.go b/pkg/plugins/informer/rpc.go
index d32d4e3a..d32d4e3a 100644
--- a/plugins/informer/rpc.go
+++ b/pkg/plugins/informer/rpc.go
diff --git a/plugins/server/config.go b/pkg/plugins/server/config.go
index 4bef3c5f..4bef3c5f 100644
--- a/plugins/server/config.go
+++ b/pkg/plugins/server/config.go
diff --git a/plugins/server/interface.go b/pkg/plugins/server/interface.go
index 9c1079ea..9c1079ea 100644
--- a/plugins/server/interface.go
+++ b/pkg/plugins/server/interface.go
diff --git a/plugins/server/plugin.go b/pkg/plugins/server/plugin.go
index 3d90c95b..3d90c95b 100644
--- a/plugins/server/plugin.go
+++ b/pkg/plugins/server/plugin.go
diff --git a/mocks/mock_log.go b/tests/mocks/mock_log.go
index 8e3e2836..8e3e2836 100644
--- a/mocks/mock_log.go
+++ b/tests/mocks/mock_log.go
diff --git a/tests/plugins/http/attributes_test.go b/tests/plugins/http/attributes_test.go
index 69200a30..54998906 100644
--- a/tests/plugins/http/attributes_test.go
+++ b/tests/plugins/http/attributes_test.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/spiral/roadrunner/v2/plugins/http/attributes"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/http/attributes"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/plugins/http/handler_test.go b/tests/plugins/http/handler_test.go
index 18558296..193bf0cf 100644
--- a/tests/plugins/http/handler_test.go
+++ b/tests/plugins/http/handler_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/spiral/roadrunner/v2/pkg/pipe"
+	httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http"
 	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
 	"github.com/stretchr/testify/assert"
 
 	"net/http"
diff --git a/tests/plugins/http/http_test.go b/tests/plugins/http/http_test.go
index 9c081bc5..f4a357f2 100644
--- a/tests/plugins/http/http_test.go
+++ b/tests/plugins/http/http_test.go
@@ -23,14 +23,14 @@ import (
 	"github.com/spiral/roadrunner-plugins/logger"
 	"github.com/spiral/roadrunner-plugins/resetter"
 	"github.com/spiral/roadrunner/v2/interfaces/events"
-	"github.com/spiral/roadrunner/v2/mocks"
-	"github.com/spiral/roadrunner/v2/plugins/informer"
-	"github.com/spiral/roadrunner/v2/plugins/server"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/informer"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
+	"github.com/spiral/roadrunner/v2/tests/mocks"
 	"github.com/spiral/roadrunner/v2/tools"
 	"github.com/yookoala/gofast"
 
 	rpcPlugin "github.com/spiral/roadrunner-plugins/rpc"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
+	httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/plugins/http/parse_test.go b/tests/plugins/http/parse_test.go
index 5cc1ce32..df217202 100644
--- a/tests/plugins/http/parse_test.go
+++ b/tests/plugins/http/parse_test.go
@@ -3,7 +3,7 @@ package http
 import (
 	"testing"
 
-	"github.com/spiral/roadrunner/v2/plugins/http"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/http"
 )
 
 var samples = []struct {
diff --git a/tests/plugins/http/response_test.go b/tests/plugins/http/response_test.go
index a9cbf91a..229163a2 100644
--- a/tests/plugins/http/response_test.go
+++ b/tests/plugins/http/response_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/spiral/roadrunner/v2/pkg/payload"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
+	httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/plugins/http/uploads_config_test.go b/tests/plugins/http/uploads_config_test.go
index e76078ee..4a7927c5 100644
--- a/tests/plugins/http/uploads_config_test.go
+++ b/tests/plugins/http/uploads_config_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
+	httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/plugins/http/uploads_test.go b/tests/plugins/http/uploads_test.go
index 7bb25cbf..e71ff8c1 100644
--- a/tests/plugins/http/uploads_test.go
+++ b/tests/plugins/http/uploads_test.go
@@ -17,8 +17,8 @@ import (
 
 	j "github.com/json-iterator/go"
 	"github.com/spiral/roadrunner/v2/pkg/pipe"
+	httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http"
 	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/plugins/informer/informer_test.go b/tests/plugins/informer/informer_test.go
index 97f27671..15063d7e 100644
--- a/tests/plugins/informer/informer_test.go
+++ b/tests/plugins/informer/informer_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/spiral/roadrunner-plugins/config"
 	"github.com/spiral/roadrunner-plugins/logger"
 	rpcPlugin "github.com/spiral/roadrunner-plugins/rpc"
-	"github.com/spiral/roadrunner/v2/plugins/informer"
-	"github.com/spiral/roadrunner/v2/plugins/server"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/informer"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	"github.com/spiral/roadrunner/v2/tools"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/tests/plugins/informer/test_plugin.go b/tests/plugins/informer/test_plugin.go
index ab3b2286..95adfb07 100644
--- a/tests/plugins/informer/test_plugin.go
+++ b/tests/plugins/informer/test_plugin.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spiral/roadrunner-plugins/config"
 	"github.com/spiral/roadrunner/v2/interfaces/worker"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
-	"github.com/spiral/roadrunner/v2/plugins/server"
 )
 
 var testPoolConfig = poolImpl.Config{
diff --git a/tests/plugins/server/plugin_pipes.go b/tests/plugins/server/plugin_pipes.go
index afed695f..6f31395a 100644
--- a/tests/plugins/server/plugin_pipes.go
+++ b/tests/plugins/server/plugin_pipes.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spiral/roadrunner-plugins/config"
 	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/pkg/payload"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
 	"github.com/spiral/roadrunner/v2/pkg/worker"
-	"github.com/spiral/roadrunner/v2/plugins/server"
 )
 
 const ConfigSection = "server"
diff --git a/tests/plugins/server/plugin_sockets.go b/tests/plugins/server/plugin_sockets.go
index f5f8f7ad..1820b4c1 100644
--- a/tests/plugins/server/plugin_sockets.go
+++ b/tests/plugins/server/plugin_sockets.go
@@ -7,8 +7,8 @@ import (
 	"github.com/spiral/roadrunner-plugins/config"
 	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/pkg/payload"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	"github.com/spiral/roadrunner/v2/pkg/worker"
-	"github.com/spiral/roadrunner/v2/plugins/server"
 )
 
 type Foo2 struct {
diff --git a/tests/plugins/server/plugin_tcp.go b/tests/plugins/server/plugin_tcp.go
index 2f33659c..01fa0cf5 100644
--- a/tests/plugins/server/plugin_tcp.go
+++ b/tests/plugins/server/plugin_tcp.go
@@ -7,8 +7,8 @@ import (
 	"github.com/spiral/roadrunner-plugins/config"
 	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/pkg/payload"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	"github.com/spiral/roadrunner/v2/pkg/worker"
-	"github.com/spiral/roadrunner/v2/plugins/server"
 )
 
 type Foo3 struct {
diff --git a/tests/plugins/server/server_test.go b/tests/plugins/server/server_test.go
index 5be25a20..75111ef7 100644
--- a/tests/plugins/server/server_test.go
+++ b/tests/plugins/server/server_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/spiral/endure"
 	"github.com/spiral/roadrunner-plugins/config"
 	"github.com/spiral/roadrunner-plugins/logger"
-	"github.com/spiral/roadrunner/v2/plugins/server"
+	"github.com/spiral/roadrunner/v2/pkg/plugins/server"
 	"github.com/stretchr/testify/assert"
 )