From 740f38c757862af469c6ab72470aa4ff57ebc8d4 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Tue, 15 Oct 2024 14:12:52 +0300
Subject: [PATCH] pkg auth moved from pkg
---
{pkg/auth => auth}/anonymous.go | 0
{pkg/auth => auth}/client.go | 0
{pkg/auth => auth}/context.go | 0
{pkg/auth => auth}/factory.go | 0
{pkg/auth => auth}/grpc.go | 0
{pkg/auth => auth}/principal.go | 0
{pkg/auth => auth}/system.go | 0
{pkg/auth => auth}/user.go | 0
id/system/system.go | 2 +-
images/middleware/access_logging_middleware.go | 2 +-
images/middleware/telemetry_middleware.go | 2 +-
logs/middleware/logging_middleware.go | 2 +-
logs/middleware/telemetry_middleware.go | 2 +-
logs/zap/buffered_write_syncer.go | 2 +-
logs/zap/example_test.go | 2 +-
pkg/account/account.go | 2 +-
pkg/clients/middleware/access_logging_middleware.go | 2 +-
pkg/clients/middleware/telemetry_middleware.go | 2 +-
pkg/collaborators/middleware/access_logging_middleware.go | 2 +-
pkg/collaborators/middleware/telemetry_middleware.go | 2 +-
pkg/collections/middleware/access_logging_middleware.go | 2 +-
pkg/collections/middleware/telemetry_middleware.go | 2 +-
pkg/content/content.go | 2 +-
pkg/delivery/middleware/telemetry_middleware.go | 2 +-
pkg/environments/middleware/access_logging_middleware.go | 2 +-
pkg/environments/middleware/telemetry_middleware.go | 2 +-
pkg/extension/manager.go | 2 +-
pkg/extension/manager_client.go | 2 +-
pkg/extension/middleware/access_logging_middleware.go | 2 +-
pkg/extension/middleware/telemetry_middleware.go | 2 +-
pkg/extension/service/registrar.go | 2 +-
pkg/files/middleware/access_logging_middleware.go | 2 +-
pkg/files/middleware/telemetry_middleware.go | 2 +-
pkg/invitations/middleware/access_logging_middleware.go | 2 +-
pkg/invitations/middleware/telemetry_middleware.go | 2 +-
pkg/items/middleware/access_logging_middleware.go | 2 +-
pkg/items/middleware/telemetry_middleware.go | 2 +-
pkg/locales/middleware/access_logging_middleware.go | 2 +-
pkg/locales/middleware/telemetry_middleware.go | 2 +-
pkg/members/middleware/access_logging_middleware.go | 2 +-
pkg/members/middleware/telemetry_middleware.go | 2 +-
pkg/members/observer/middleware/access_logging_middleware.go | 2 +-
pkg/operation/service.go | 2 +-
pkg/organizations/middleware/access_logging_middleware.go | 2 +-
pkg/organizations/middleware/telemetry_middleware.go | 2 +-
pkg/references/middleware/access_logging_middleware.go | 2 +-
pkg/references/middleware/telemetry_middleware.go | 2 +-
pkg/roles/middleware/access_logging_middleware.go | 2 +-
pkg/roles/middleware/telemetry_middleware.go | 2 +-
pkg/spaces/middleware/access_logging_middleware.go | 2 +-
pkg/spaces/middleware/telemetry_middleware.go | 2 +-
pkg/users/middleware/access_logging_middleware.go | 2 +-
pkg/users/middleware/telemetry_middleware.go | 2 +-
zap/field.go | 3 ++-
zap/field_test.go | 2 +-
55 files changed, 48 insertions(+), 47 deletions(-)
rename {pkg/auth => auth}/anonymous.go (100%)
rename {pkg/auth => auth}/client.go (100%)
rename {pkg/auth => auth}/context.go (100%)
rename {pkg/auth => auth}/factory.go (100%)
rename {pkg/auth => auth}/grpc.go (100%)
rename {pkg/auth => auth}/principal.go (100%)
rename {pkg/auth => auth}/system.go (100%)
rename {pkg/auth => auth}/user.go (100%)
diff --git a/pkg/auth/anonymous.go b/auth/anonymous.go
similarity index 100%
rename from pkg/auth/anonymous.go
rename to auth/anonymous.go
diff --git a/pkg/auth/client.go b/auth/client.go
similarity index 100%
rename from pkg/auth/client.go
rename to auth/client.go
diff --git a/pkg/auth/context.go b/auth/context.go
similarity index 100%
rename from pkg/auth/context.go
rename to auth/context.go
diff --git a/pkg/auth/factory.go b/auth/factory.go
similarity index 100%
rename from pkg/auth/factory.go
rename to auth/factory.go
diff --git a/pkg/auth/grpc.go b/auth/grpc.go
similarity index 100%
rename from pkg/auth/grpc.go
rename to auth/grpc.go
diff --git a/pkg/auth/principal.go b/auth/principal.go
similarity index 100%
rename from pkg/auth/principal.go
rename to auth/principal.go
diff --git a/pkg/auth/system.go b/auth/system.go
similarity index 100%
rename from pkg/auth/system.go
rename to auth/system.go
diff --git a/pkg/auth/user.go b/auth/user.go
similarity index 100%
rename from pkg/auth/user.go
rename to auth/user.go
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..9eb8ddaa 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -4,8 +4,8 @@ import (
"context"
"reflect"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/environments"
diff --git a/images/middleware/access_logging_middleware.go b/images/middleware/access_logging_middleware.go
index 0a5f5ec2..b70bd7f9 100644
--- a/images/middleware/access_logging_middleware.go
+++ b/images/middleware/access_logging_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/images"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/files"
"go.uber.org/zap"
)
diff --git a/images/middleware/telemetry_middleware.go b/images/middleware/telemetry_middleware.go
index 36d09a32..ab486db9 100644
--- a/images/middleware/telemetry_middleware.go
+++ b/images/middleware/telemetry_middleware.go
@@ -10,9 +10,9 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/images"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/files"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/logs/middleware/logging_middleware.go b/logs/middleware/logging_middleware.go
index 3a425bf0..aae4c1cd 100644
--- a/logs/middleware/logging_middleware.go
+++ b/logs/middleware/logging_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/logs"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"go.uber.org/zap"
)
diff --git a/logs/middleware/telemetry_middleware.go b/logs/middleware/telemetry_middleware.go
index 37313863..883fd9e7 100644
--- a/logs/middleware/telemetry_middleware.go
+++ b/logs/middleware/telemetry_middleware.go
@@ -10,9 +10,9 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/logs"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/logs/zap/buffered_write_syncer.go b/logs/zap/buffered_write_syncer.go
index 42fae2b1..ecb1bdda 100644
--- a/logs/zap/buffered_write_syncer.go
+++ b/logs/zap/buffered_write_syncer.go
@@ -5,8 +5,8 @@ import (
"sync"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/logs"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/errors"
)
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index dc182fb0..b9ca6907 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -6,10 +6,10 @@ import (
"slices"
"testing"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/logs"
logmocks "git.perx.ru/perxis/perxis-go/logs/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/users"
usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
diff --git a/pkg/account/account.go b/pkg/account/account.go
index 9eb54c31..61aa4753 100644
--- a/pkg/account/account.go
+++ b/pkg/account/account.go
@@ -1,7 +1,7 @@
package account
import (
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/members"
msobserver "git.perx.ru/perxis/perxis-go/pkg/members/observer"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
diff --git a/pkg/clients/middleware/access_logging_middleware.go b/pkg/clients/middleware/access_logging_middleware.go
index 66379ef0..07a826c6 100644
--- a/pkg/clients/middleware/access_logging_middleware.go
+++ b/pkg/clients/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"go.uber.org/zap"
)
diff --git a/pkg/clients/middleware/telemetry_middleware.go b/pkg/clients/middleware/telemetry_middleware.go
index cbb21715..70c8edf5 100644
--- a/pkg/clients/middleware/telemetry_middleware.go
+++ b/pkg/clients/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/collaborators/middleware/access_logging_middleware.go b/pkg/collaborators/middleware/access_logging_middleware.go
index 505624ba..ed129dc6 100644
--- a/pkg/collaborators/middleware/access_logging_middleware.go
+++ b/pkg/collaborators/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
"go.uber.org/zap"
)
diff --git a/pkg/collaborators/middleware/telemetry_middleware.go b/pkg/collaborators/middleware/telemetry_middleware.go
index d4a6f56c..1c92fe26 100644
--- a/pkg/collaborators/middleware/telemetry_middleware.go
+++ b/pkg/collaborators/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/collections/middleware/access_logging_middleware.go b/pkg/collections/middleware/access_logging_middleware.go
index 3624955b..81357174 100644
--- a/pkg/collections/middleware/access_logging_middleware.go
+++ b/pkg/collections/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"go.uber.org/zap"
diff --git a/pkg/collections/middleware/telemetry_middleware.go b/pkg/collections/middleware/telemetry_middleware.go
index c189a7be..37e433b6 100644
--- a/pkg/collections/middleware/telemetry_middleware.go
+++ b/pkg/collections/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e93..1842209a 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,7 +1,7 @@
package content
import (
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/collections"
diff --git a/pkg/delivery/middleware/telemetry_middleware.go b/pkg/delivery/middleware/telemetry_middleware.go
index 600b6a61..308e9a00 100644
--- a/pkg/delivery/middleware/telemetry_middleware.go
+++ b/pkg/delivery/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/delivery"
"git.perx.ru/perxis/perxis-go/pkg/environments"
diff --git a/pkg/environments/middleware/access_logging_middleware.go b/pkg/environments/middleware/access_logging_middleware.go
index e357e2ec..11cba721 100644
--- a/pkg/environments/middleware/access_logging_middleware.go
+++ b/pkg/environments/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"go.uber.org/zap"
)
diff --git a/pkg/environments/middleware/telemetry_middleware.go b/pkg/environments/middleware/telemetry_middleware.go
index f1fb94c7..681d1ac3 100644
--- a/pkg/environments/middleware/telemetry_middleware.go
+++ b/pkg/environments/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/extension/manager.go b/pkg/extension/manager.go
index 9d4def7c..885c9fb7 100644
--- a/pkg/extension/manager.go
+++ b/pkg/extension/manager.go
@@ -3,7 +3,7 @@ package extension
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
diff --git a/pkg/extension/manager_client.go b/pkg/extension/manager_client.go
index 3adbf804..d6d98ddc 100644
--- a/pkg/extension/manager_client.go
+++ b/pkg/extension/manager_client.go
@@ -3,7 +3,7 @@ package extension
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
diff --git a/pkg/extension/middleware/access_logging_middleware.go b/pkg/extension/middleware/access_logging_middleware.go
index 0fbd63de..ab3d08b0 100644
--- a/pkg/extension/middleware/access_logging_middleware.go
+++ b/pkg/extension/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/telemetry_middleware.go b/pkg/extension/middleware/telemetry_middleware.go
index 7302cab3..52abd179 100644
--- a/pkg/extension/middleware/telemetry_middleware.go
+++ b/pkg/extension/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
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"
diff --git a/pkg/extension/service/registrar.go b/pkg/extension/service/registrar.go
index 28da7d37..cfaf1323 100644
--- a/pkg/extension/service/registrar.go
+++ b/pkg/extension/service/registrar.go
@@ -4,7 +4,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/extension"
retry "github.com/avast/retry-go/v4"
"go.uber.org/zap"
diff --git a/pkg/files/middleware/access_logging_middleware.go b/pkg/files/middleware/access_logging_middleware.go
index df932a82..08cfa1ed 100644
--- a/pkg/files/middleware/access_logging_middleware.go
+++ b/pkg/files/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/files"
"go.uber.org/zap"
)
diff --git a/pkg/files/middleware/telemetry_middleware.go b/pkg/files/middleware/telemetry_middleware.go
index e2e482a6..7a9072d6 100644
--- a/pkg/files/middleware/telemetry_middleware.go
+++ b/pkg/files/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/files"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/invitations/middleware/access_logging_middleware.go b/pkg/invitations/middleware/access_logging_middleware.go
index 24a85499..69383a45 100644
--- a/pkg/invitations/middleware/access_logging_middleware.go
+++ b/pkg/invitations/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/invitations"
"git.perx.ru/perxis/perxis-go/pkg/options"
"go.uber.org/zap"
diff --git a/pkg/invitations/middleware/telemetry_middleware.go b/pkg/invitations/middleware/telemetry_middleware.go
index 1696f81a..59252b0b 100644
--- a/pkg/invitations/middleware/telemetry_middleware.go
+++ b/pkg/invitations/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/invitations"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/items/middleware/access_logging_middleware.go b/pkg/items/middleware/access_logging_middleware.go
index 2342a6d9..8d376220 100644
--- a/pkg/items/middleware/access_logging_middleware.go
+++ b/pkg/items/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"go.uber.org/zap"
diff --git a/pkg/items/middleware/telemetry_middleware.go b/pkg/items/middleware/telemetry_middleware.go
index da626aa5..67e5cbcf 100644
--- a/pkg/items/middleware/telemetry_middleware.go
+++ b/pkg/items/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/locales/middleware/access_logging_middleware.go b/pkg/locales/middleware/access_logging_middleware.go
index ab31fc8c..0d52bc97 100644
--- a/pkg/locales/middleware/access_logging_middleware.go
+++ b/pkg/locales/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/locales"
"go.uber.org/zap"
)
diff --git a/pkg/locales/middleware/telemetry_middleware.go b/pkg/locales/middleware/telemetry_middleware.go
index 709a6bab..179c9471 100644
--- a/pkg/locales/middleware/telemetry_middleware.go
+++ b/pkg/locales/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/locales"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/members/middleware/access_logging_middleware.go b/pkg/members/middleware/access_logging_middleware.go
index 0a062331..6a20feb9 100644
--- a/pkg/members/middleware/access_logging_middleware.go
+++ b/pkg/members/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/members"
"go.uber.org/zap"
)
diff --git a/pkg/members/middleware/telemetry_middleware.go b/pkg/members/middleware/telemetry_middleware.go
index bf339f3f..f6a79b22 100644
--- a/pkg/members/middleware/telemetry_middleware.go
+++ b/pkg/members/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/members/observer/middleware/access_logging_middleware.go b/pkg/members/observer/middleware/access_logging_middleware.go
index 48e9da96..ddc9921d 100644
--- a/pkg/members/observer/middleware/access_logging_middleware.go
+++ b/pkg/members/observer/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/members/observer"
"go.uber.org/zap"
diff --git a/pkg/operation/service.go b/pkg/operation/service.go
index 5456e56a..76423f34 100644
--- a/pkg/operation/service.go
+++ b/pkg/operation/service.go
@@ -5,7 +5,7 @@ import (
"sync"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"google.golang.org/protobuf/proto"
)
diff --git a/pkg/organizations/middleware/access_logging_middleware.go b/pkg/organizations/middleware/access_logging_middleware.go
index be6e937d..b7892a73 100644
--- a/pkg/organizations/middleware/access_logging_middleware.go
+++ b/pkg/organizations/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
"go.uber.org/zap"
diff --git a/pkg/organizations/middleware/telemetry_middleware.go b/pkg/organizations/middleware/telemetry_middleware.go
index 1cb79328..b44ee935 100644
--- a/pkg/organizations/middleware/telemetry_middleware.go
+++ b/pkg/organizations/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/references/middleware/access_logging_middleware.go b/pkg/references/middleware/access_logging_middleware.go
index b5fe1165..9f60039f 100644
--- a/pkg/references/middleware/access_logging_middleware.go
+++ b/pkg/references/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
"go.uber.org/zap"
diff --git a/pkg/references/middleware/telemetry_middleware.go b/pkg/references/middleware/telemetry_middleware.go
index 3e8fbb77..4280c017 100644
--- a/pkg/references/middleware/telemetry_middleware.go
+++ b/pkg/references/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/roles/middleware/access_logging_middleware.go b/pkg/roles/middleware/access_logging_middleware.go
index 310cdeda..35825f9f 100644
--- a/pkg/roles/middleware/access_logging_middleware.go
+++ b/pkg/roles/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"go.uber.org/zap"
)
diff --git a/pkg/roles/middleware/telemetry_middleware.go b/pkg/roles/middleware/telemetry_middleware.go
index 74035752..0d5cc423 100644
--- a/pkg/roles/middleware/telemetry_middleware.go
+++ b/pkg/roles/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/spaces/middleware/access_logging_middleware.go b/pkg/spaces/middleware/access_logging_middleware.go
index d155ee1f..38fd9af5 100644
--- a/pkg/spaces/middleware/access_logging_middleware.go
+++ b/pkg/spaces/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"go.uber.org/zap"
diff --git a/pkg/spaces/middleware/telemetry_middleware.go b/pkg/spaces/middleware/telemetry_middleware.go
index 84c90bd6..bd9c6f87 100644
--- a/pkg/spaces/middleware/telemetry_middleware.go
+++ b/pkg/spaces/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/users/middleware/access_logging_middleware.go b/pkg/users/middleware/access_logging_middleware.go
index dd8d4a14..70d6873f 100644
--- a/pkg/users/middleware/access_logging_middleware.go
+++ b/pkg/users/middleware/access_logging_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/users"
"go.uber.org/zap"
diff --git a/pkg/users/middleware/telemetry_middleware.go b/pkg/users/middleware/telemetry_middleware.go
index 8ad677e7..628d5f89 100644
--- a/pkg/users/middleware/telemetry_middleware.go
+++ b/pkg/users/middleware/telemetry_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/auth"
oid "git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"git.perx.ru/perxis/perxis-go/pkg/users"
diff --git a/zap/field.go b/zap/field.go
index d687bacc..7beabe39 100644
--- a/zap/field.go
+++ b/zap/field.go
@@ -2,9 +2,10 @@ package zap
import (
"context"
+
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/id"
_ "git.perx.ru/perxis/perxis-go/id/system" // регистрируем обработчики для системных объектов
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
diff --git a/zap/field_test.go b/zap/field_test.go
index 46c4ee50..7b706be1 100644
--- a/zap/field_test.go
+++ b/zap/field_test.go
@@ -4,8 +4,8 @@ import (
"context"
"testing"
+ "git.perx.ru/perxis/perxis-go/auth"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/users"
"github.com/stretchr/testify/assert"
--
GitLab