diff --git a/pkg/extension/action.go b/extension/action.go
similarity index 100%
rename from pkg/extension/action.go
rename to extension/action.go
diff --git a/pkg/extension/action_handler.go b/extension/action_handler.go
similarity index 100%
rename from pkg/extension/action_handler.go
rename to extension/action_handler.go
diff --git a/pkg/extension/action_handler_test.go b/extension/action_handler_test.go
similarity index 100%
rename from pkg/extension/action_handler_test.go
rename to extension/action_handler_test.go
diff --git a/pkg/extension/action_test.go b/extension/action_test.go
similarity index 99%
rename from pkg/extension/action_test.go
rename to extension/action_test.go
index d714a3993ad923cb56e78a0be43589f0d035e619..4f3a71ca91fb6f30b9b54211eed8b6c5ad731dd9 100644
--- a/pkg/extension/action_test.go
+++ b/extension/action_test.go
@@ -13,7 +13,7 @@ func TestActionToProto(t *testing.T) {
var pbAction *pb.Action
err := gofakeit.Struct(&pbAction)
require.NoError(t, err)
-
+
action := ActionFromPB(pbAction)
result := ActionToPB(action)
require.Equal(t, pbAction, result)
@@ -52,7 +52,7 @@ func TestActionRequestToProto(t *testing.T) {
var pbAction *pb.ActionRequest
err := gofakeit.Struct(&pbAction)
require.NoError(t, err)
-
+
action := ActionRequestFromPB(pbAction)
result := ActionRequestToPB(action)
require.Equal(t, pbAction, result)
@@ -71,12 +71,12 @@ func TestActionResponseToProto(t *testing.T) {
var pbAction *pb.ActionResponse
err := gofakeit.Struct(&pbAction)
require.NoError(t, err)
-
+
action := ActionResponseFromPB(pbAction)
result := ActionResponseToPB(action)
require.Equal(t, pbAction, result)
})
-
+
t.Run("Action is nil", func(t *testing.T) {
var pbAction *pb.ActionResponse
action := ActionResponseFromPB(pbAction)
diff --git a/pkg/extension/action_url.go b/extension/action_url.go
similarity index 100%
rename from pkg/extension/action_url.go
rename to extension/action_url.go
diff --git a/pkg/extension/action_url_test.go b/extension/action_url_test.go
similarity index 100%
rename from pkg/extension/action_url_test.go
rename to extension/action_url_test.go
diff --git a/pkg/extension/client.go b/extension/client.go
similarity index 100%
rename from pkg/extension/client.go
rename to extension/client.go
diff --git a/pkg/extension/extension.go b/extension/extension.go
similarity index 100%
rename from pkg/extension/extension.go
rename to extension/extension.go
diff --git a/pkg/extension/extension_test.go b/extension/extension_test.go
similarity index 100%
rename from pkg/extension/extension_test.go
rename to extension/extension_test.go
diff --git a/pkg/extension/key.go b/extension/key.go
similarity index 100%
rename from pkg/extension/key.go
rename to extension/key.go
diff --git a/pkg/extension/manager.go b/extension/manager.go
similarity index 100%
rename from pkg/extension/manager.go
rename to extension/manager.go
diff --git a/pkg/extension/manager_client.go b/extension/manager_client.go
similarity index 100%
rename from pkg/extension/manager_client.go
rename to extension/manager_client.go
diff --git a/pkg/extension/middleware/access_logging_middleware.go b/extension/middleware/access_logging_middleware.go
similarity index 95%
rename from pkg/extension/middleware/access_logging_middleware.go
rename to extension/middleware/access_logging_middleware.go
index 0fbd63de8991c449fc96ad49527f5e079bd88773..4fdf8d3b398ac38030b184702e6692e59c37024d 100644
--- a/pkg/extension/middleware/access_logging_middleware.go
+++ b/extension/middleware/access_logging_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/extension"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/error_logging_middleware.go b/extension/middleware/error_logging_middleware.go
similarity index 93%
rename from pkg/extension/middleware/error_logging_middleware.go
rename to extension/middleware/error_logging_middleware.go
index 474003790010e858eed9fb9ac2af71f17fb35094..d9dcfe792fb36ac6cb7f13118b0a6a6bbd030ae2 100644
--- a/pkg/extension/middleware/error_logging_middleware.go
+++ b/extension/middleware/error_logging_middleware.go
@@ -4,12 +4,12 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/middleware.go b/extension/middleware/middleware.go
similarity index 73%
rename from pkg/extension/middleware/middleware.go
rename to extension/middleware/middleware.go
index f308b6a1d0af97853b6105788cd28977f6c637ac..c45e9e3f4be8204012bdabcbc28d72d9cc35b88f 100644
--- a/pkg/extension/middleware/middleware.go
+++ b/extension/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/recovering_middleware.go b/extension/middleware/recovering_middleware.go
similarity index 94%
rename from pkg/extension/middleware/recovering_middleware.go
rename to extension/middleware/recovering_middleware.go
index 54b78da481917fda0d5614f6d9158c455d4d03e6..0bbe10a65486b612e64561d655e85de48a28eb3d 100644
--- a/pkg/extension/middleware/recovering_middleware.go
+++ b/extension/middleware/recovering_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/telemetry_middleware.go b/extension/middleware/telemetry_middleware.go
similarity index 98%
rename from pkg/extension/middleware/telemetry_middleware.go
rename to extension/middleware/telemetry_middleware.go
index 7302cab3b4ecf364f475b0dbe7d77a37c96cd784..8cacfe264529c28b4a27593bb14cd1e05d2c492f 100644
--- a/pkg/extension/middleware/telemetry_middleware.go
+++ b/extension/middleware/telemetry_middleware.go
@@ -4,15 +4,15 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/extension"
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/extension/mocks/Extension.go b/extension/mocks/Extension.go
similarity index 98%
rename from pkg/extension/mocks/Extension.go
rename to extension/mocks/Extension.go
index e5482a2db5ede0d006eeefcd5e83259b1974a158..ec2b66319f7e8db8e5bd9a4b526f95b150b593ed 100644
--- a/pkg/extension/mocks/Extension.go
+++ b/extension/mocks/Extension.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- extension "git.perx.ru/perxis/perxis-go/pkg/extension"
+ extension "git.perx.ru/perxis/perxis-go/extension"
extensions "git.perx.ru/perxis/perxis-go/proto/extensions"
mock "github.com/stretchr/testify/mock"
diff --git a/pkg/extension/mocks/Manager.go b/extension/mocks/Manager.go
similarity index 99%
rename from pkg/extension/mocks/Manager.go
rename to extension/mocks/Manager.go
index 84fdb40c2471d0a13a9d76cc6528e3a6a2a51d63..95f33d7e4976122c5bb4f45fa1a13d834dbf1eeb 100644
--- a/pkg/extension/mocks/Manager.go
+++ b/extension/mocks/Manager.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- extension "git.perx.ru/perxis/perxis-go/pkg/extension"
+ extension "git.perx.ru/perxis/perxis-go/extension"
extensions "git.perx.ru/perxis/perxis-go/proto/extensions"
mock "github.com/stretchr/testify/mock"
diff --git a/pkg/extension/mocks/Storage.go b/extension/mocks/Storage.go
similarity index 100%
rename from pkg/extension/mocks/Storage.go
rename to extension/mocks/Storage.go
diff --git a/pkg/extension/schema.go b/extension/schema.go
similarity index 100%
rename from pkg/extension/schema.go
rename to extension/schema.go
diff --git a/pkg/extension/schema_test.go b/extension/schema_test.go
similarity index 100%
rename from pkg/extension/schema_test.go
rename to extension/schema_test.go
diff --git a/pkg/extension/server.go b/extension/server.go
similarity index 100%
rename from pkg/extension/server.go
rename to extension/server.go
diff --git a/pkg/extension/server_test.go b/extension/server_test.go
similarity index 100%
rename from pkg/extension/server_test.go
rename to extension/server_test.go
diff --git a/pkg/extension/service/doc.go b/extension/service/doc.go
similarity index 100%
rename from pkg/extension/service/doc.go
rename to extension/service/doc.go
diff --git a/pkg/extension/service/extension.go b/extension/service/extension.go
similarity index 99%
rename from pkg/extension/service/extension.go
rename to extension/service/extension.go
index 5d57e56c86190403cfe18a8084c902497280c993..5651f11b4d429df104a74eb827ee9f6cb5071880 100644
--- a/pkg/extension/service/extension.go
+++ b/extension/service/extension.go
@@ -4,10 +4,10 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/extension"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/setup"
"go.uber.org/zap"
diff --git a/pkg/extension/service/extension_test.go b/extension/service/extension_test.go
similarity index 98%
rename from pkg/extension/service/extension_test.go
rename to extension/service/extension_test.go
index d96712dd664e45531529f7a448dd870f07b32037..138548f6ae5a39a5ee07587469b5f71074a69d47 100644
--- a/pkg/extension/service/extension_test.go
+++ b/extension/service/extension_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/extension/service/registrar.go b/extension/service/registrar.go
similarity index 98%
rename from pkg/extension/service/registrar.go
rename to extension/service/registrar.go
index 28da7d37d7e3d5fd29d3dfc51ec8af3ecc83707f..8a396832b4b96fdd1a79f5b8d5eb29b10bc3979f 100644
--- a/pkg/extension/service/registrar.go
+++ b/extension/service/registrar.go
@@ -4,8 +4,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/extension"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
retry "github.com/avast/retry-go/v4"
"go.uber.org/zap"
)
diff --git a/pkg/extension/storage.go b/extension/storage.go
similarity index 100%
rename from pkg/extension/storage.go
rename to extension/storage.go