Merge branch 'refactor/PRXS-3306-MovePkgGroup1' into refactor/6-pkg-refactor-expr

# Conflicts: # pkg/permission/permission.go # pkg/permission/ruleset.go # pkg/schema/field/field.go

Merge branch 'refactor/PRXS-3306-MovePkgGroup1' into refactor/6-pkg-refactor-expr
e49a8ade · Semyon Krestyaninov · 24901e8d · f82328f4 · e49a8ade · e49a8ade
Commit e49a8ade authored 4 months ago by Semyon Krestyaninov
--- a/assets/templates/middleware/telemetry_content
+++ b/assets/templates/middleware/telemetry_content
@@ -2,7 +2,7 @@ import (
    "context"
    "time"
-    "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+    "git.perx.ru/perxis/perxis-go/telemetry/metrics"
    "go.opentelemetry.io/otel"
    "go.opentelemetry.io/otel/attribute"
    pkgId "git.perx.ru/perxis/perxis-go/id"

--- a/assets/templates/middleware/telemetry_default
+++ b/assets/templates/middleware/telemetry_default
@@ -2,7 +2,7 @@ import (
    "context"
    "time"
-    "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+    "git.perx.ru/perxis/perxis-go/telemetry/metrics"
    "go.opentelemetry.io/otel"
    "go.opentelemetry.io/otel/attribute"
    pkgId "git.perx.ru/perxis/perxis-go/id"

--- a/pkg/data/crypto.go
+++ b/pkg/data/crypto.go
--- a/pkg/data/data.go
+++ b/pkg/data/data.go
--- a/pkg/data/data_test.go
+++ b/pkg/data/data_test.go
--- a/pkg/data/list.go
+++ b/pkg/data/list.go
--- a/pkg/data/list_test.go
+++ b/pkg/data/list_test.go
--- a/pkg/data/strings.go
+++ b/pkg/data/strings.go
--- a/pkg/data/strings_test.go
+++ b/pkg/data/strings_test.go
--- a/pkg/data/translit.go
+++ b/pkg/data/translit.go
--- a/pkg/data/translit_test.go
+++ b/pkg/data/translit_test.go
--- a/pkg/events/events.go
+++ b/pkg/events/events.go
--- a/pkg/events/mocks/Connection.go
+++ b/pkg/events/mocks/Connection.go
@@ -3,7 +3,7 @@
 package mocks
 import (
-	events "git.perx.ru/perxis/perxis-go/pkg/events"
+	"git.perx.ru/perxis/perxis-go/events"
 	mock "github.com/stretchr/testify/mock"
 )

--- a/pkg/events/mocks/MsgFilter.go
+++ b/pkg/events/mocks/MsgFilter.go
--- a/pkg/events/mocks/ProtoEncoder.go
+++ b/pkg/events/mocks/ProtoEncoder.go
--- a/pkg/events/mocks/PublishOption.go
+++ b/pkg/events/mocks/PublishOption.go
@@ -3,7 +3,7 @@
 package mocks
 import (
-	events "git.perx.ru/perxis/perxis-go/pkg/events"
+	"git.perx.ru/perxis/perxis-go/events"
 	mock "github.com/stretchr/testify/mock"
 )

--- a/pkg/events/mocks/SubscribeOption.go
+++ b/pkg/events/mocks/SubscribeOption.go
@@ -3,7 +3,7 @@
 package mocks
 import (
-	events "git.perx.ru/perxis/perxis-go/pkg/events"
+	"git.perx.ru/perxis/perxis-go/events"
 	mock "github.com/stretchr/testify/mock"
 )

--- a/pkg/events/mocks/Subscription.go
+++ b/pkg/events/mocks/Subscription.go
--- a/pkg/events/nats.go
+++ b/pkg/events/nats.go
--- a/pkg/events/nats_integration_test.go
+++ b/pkg/events/nats_integration_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
-	pb "git.perx.ru/perxis/perxis-go/pkg/events/test_proto"
+	pb "git.perx.ru/perxis/perxis-go/events/test_proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"