From 063c9e71b90ecce55defe3ed60bac14aaaad7151 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 09:19:31 +0300
Subject: [PATCH] pkg references moved from pkg
---
pkg/content/client.go | 4 ++--
pkg/content/content.go | 2 +-
pkg/extension/action.go | 2 +-
pkg/extension/schema_test.go | 2 +-
{pkg/references => references}/field.go | 0
{pkg/references => references}/field_test.go | 0
.../middleware/access_logging_middleware.go | 4 ++--
.../middleware/client_encode_middleware.go | 2 +-
.../middleware/error_logging_middleware.go | 4 ++--
{pkg/references => references}/middleware/middleware.go | 4 ++--
.../middleware/recovering_middleware.go | 4 ++--
.../middleware/telemetry_middleware.go | 4 ++--
{pkg/references => references}/mocks/Middleware.go | 2 +-
{pkg/references => references}/mocks/References.go | 2 +-
{pkg/references => references}/reference.go | 0
{pkg/references => references}/reference_test.go | 0
{pkg/references => references}/service.go | 0
{pkg/references => references}/transport/client.go | 2 +-
.../references => references}/transport/endpoints.microgen.go | 0
.../references => references}/transport/exchanges.microgen.go | 2 +-
{pkg/references => references}/transport/grpc/client.go | 2 +-
.../transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 4 ++--
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/references => references}/transport/grpc/server.go | 4 ++--
.../transport/grpc/server.microgen.go | 2 +-
{pkg/references => references}/transport/server.microgen.go | 2 +-
27 files changed, 29 insertions(+), 29 deletions(-)
rename {pkg/references => references}/field.go (100%)
rename {pkg/references => references}/field_test.go (100%)
rename {pkg/references => references}/middleware/access_logging_middleware.go (91%)
rename {pkg/references => references}/middleware/client_encode_middleware.go (97%)
rename {pkg/references => references}/middleware/error_logging_middleware.go (88%)
rename {pkg/references => references}/middleware/middleware.go (74%)
rename {pkg/references => references}/middleware/recovering_middleware.go (88%)
rename {pkg/references => references}/middleware/telemetry_middleware.go (95%)
rename {pkg/references => references}/mocks/Middleware.go (94%)
rename {pkg/references => references}/mocks/References.go (98%)
rename {pkg/references => references}/reference.go (100%)
rename {pkg/references => references}/reference_test.go (100%)
rename {pkg/references => references}/service.go (100%)
rename {pkg/references => references}/transport/client.go (95%)
rename {pkg/references => references}/transport/endpoints.microgen.go (100%)
rename {pkg/references => references}/transport/exchanges.microgen.go (95%)
rename {pkg/references => references}/transport/grpc/client.go (88%)
rename {pkg/references => references}/transport/grpc/client.microgen.go (92%)
rename {pkg/references => references}/transport/grpc/protobuf_endpoint_converters.microgen.go (97%)
rename {pkg/references => references}/transport/grpc/protobuf_type_converters.microgen.go (97%)
rename {pkg/references => references}/transport/grpc/server.go (83%)
rename {pkg/references => references}/transport/grpc/server.microgen.go (95%)
rename {pkg/references => references}/transport/server.microgen.go (95%)
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784..6661708f 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -18,12 +18,12 @@ import (
itemsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
localesSvc "git.perx.ru/perxis/perxis-go/pkg/locales/middleware"
localsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/locales/transport/grpc"
- referencesSvc "git.perx.ru/perxis/perxis-go/pkg/references/middleware"
- referencesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/references/transport/grpc"
rolesSvc "git.perx.ru/perxis/perxis-go/pkg/roles/middleware"
rolesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/roles/transport/grpc"
spacesSvc "git.perx.ru/perxis/perxis-go/pkg/spaces/middleware"
spacesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/spaces/transport/grpc"
+ referencesSvc "git.perx.ru/perxis/perxis-go/references/middleware"
+ referencesTransportGrpc "git.perx.ru/perxis/perxis-go/references/transport/grpc"
"go.uber.org/zap"
"google.golang.org/grpc"
)
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e93..53669a10 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -9,10 +9,10 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/invitations"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/references"
)
type Runnable interface {
diff --git a/pkg/extension/action.go b/pkg/extension/action.go
index feb19d9a..c6f7d19d 100644
--- a/pkg/extension/action.go
+++ b/pkg/extension/action.go
@@ -3,8 +3,8 @@ package extension
import (
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/references"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
+ "git.perx.ru/perxis/perxis-go/references"
"github.com/mitchellh/mapstructure"
)
diff --git a/pkg/extension/schema_test.go b/pkg/extension/schema_test.go
index e17e891e..9ae92108 100644
--- a/pkg/extension/schema_test.go
+++ b/pkg/extension/schema_test.go
@@ -6,10 +6,10 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
"git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/references"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/references/field.go b/references/field.go
similarity index 100%
rename from pkg/references/field.go
rename to references/field.go
diff --git a/pkg/references/field_test.go b/references/field_test.go
similarity index 100%
rename from pkg/references/field_test.go
rename to references/field_test.go
diff --git a/pkg/references/middleware/access_logging_middleware.go b/references/middleware/access_logging_middleware.go
similarity index 91%
rename from pkg/references/middleware/access_logging_middleware.go
rename to references/middleware/access_logging_middleware.go
index b5fe1165..b87de8ff 100644
--- a/pkg/references/middleware/access_logging_middleware.go
+++ b/references/middleware/access_logging_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/references -i References -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
@@ -12,7 +12,7 @@ import (
"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/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/client_encode_middleware.go b/references/middleware/client_encode_middleware.go
similarity index 97%
rename from pkg/references/middleware/client_encode_middleware.go
rename to references/middleware/client_encode_middleware.go
index b6ea043b..68dd3dc6 100644
--- a/pkg/references/middleware/client_encode_middleware.go
+++ b/references/middleware/client_encode_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/references"
+ "git.perx.ru/perxis/perxis-go/references"
)
// ClientEncodeMiddleware выполняет операции encode/decode для передаваемых данных
diff --git a/pkg/references/middleware/error_logging_middleware.go b/references/middleware/error_logging_middleware.go
similarity index 88%
rename from pkg/references/middleware/error_logging_middleware.go
rename to references/middleware/error_logging_middleware.go
index a68dc8f8..77309bcc 100644
--- a/pkg/references/middleware/error_logging_middleware.go
+++ b/references/middleware/error_logging_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/references -i References -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/references"
+ "git.perx.ru/perxis/perxis-go/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/middleware.go b/references/middleware/middleware.go
similarity index 74%
rename from pkg/references/middleware/middleware.go
rename to references/middleware/middleware.go
index 529a61b6..38a237fc 100644
--- a/pkg/references/middleware/middleware.go
+++ b/references/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/references -i References -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/references"
+ "git.perx.ru/perxis/perxis-go/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/recovering_middleware.go b/references/middleware/recovering_middleware.go
similarity index 88%
rename from pkg/references/middleware/recovering_middleware.go
rename to references/middleware/recovering_middleware.go
index cc8a87ff..adeff125 100644
--- a/pkg/references/middleware/recovering_middleware.go
+++ b/references/middleware/recovering_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/references -i References -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/references"
+ "git.perx.ru/perxis/perxis-go/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/telemetry_middleware.go b/references/middleware/telemetry_middleware.go
similarity index 95%
rename from pkg/references/middleware/telemetry_middleware.go
rename to references/middleware/telemetry_middleware.go
index 3e8fbb77..89b49451 100644
--- a/pkg/references/middleware/telemetry_middleware.go
+++ b/references/middleware/telemetry_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/references -i References -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
import (
"context"
@@ -13,8 +13,8 @@ import (
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"
+ "git.perx.ru/perxis/perxis-go/references"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/references/mocks/Middleware.go b/references/mocks/Middleware.go
similarity index 94%
rename from pkg/references/mocks/Middleware.go
rename to references/mocks/Middleware.go
index f2526e50..55a7caa3 100644
--- a/pkg/references/mocks/Middleware.go
+++ b/references/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- references "git.perx.ru/perxis/perxis-go/pkg/references"
+ references "git.perx.ru/perxis/perxis-go/references"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/references/mocks/References.go b/references/mocks/References.go
similarity index 98%
rename from pkg/references/mocks/References.go
rename to references/mocks/References.go
index 92c8e290..a1d79c9f 100644
--- a/pkg/references/mocks/References.go
+++ b/references/mocks/References.go
@@ -8,7 +8,7 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
mock "github.com/stretchr/testify/mock"
- references "git.perx.ru/perxis/perxis-go/pkg/references"
+ references "git.perx.ru/perxis/perxis-go/references"
)
// References is an autogenerated mock type for the References type
diff --git a/pkg/references/reference.go b/references/reference.go
similarity index 100%
rename from pkg/references/reference.go
rename to references/reference.go
diff --git a/pkg/references/reference_test.go b/references/reference_test.go
similarity index 100%
rename from pkg/references/reference_test.go
rename to references/reference_test.go
diff --git a/pkg/references/service.go b/references/service.go
similarity index 100%
rename from pkg/references/service.go
rename to references/service.go
diff --git a/pkg/references/transport/client.go b/references/transport/client.go
similarity index 95%
rename from pkg/references/transport/client.go
rename to references/transport/client.go
index 45f10f4f..97c56f02 100644
--- a/pkg/references/transport/client.go
+++ b/references/transport/client.go
@@ -6,7 +6,7 @@ import (
"context"
items "git.perx.ru/perxis/perxis-go/pkg/items"
- references "git.perx.ru/perxis/perxis-go/pkg/references"
+ references "git.perx.ru/perxis/perxis-go/references"
)
func (set EndpointsSet) Get(arg0 context.Context, arg1 string, arg2 string, arg3 []*references.Reference, arg4 ...*references.GetOptions) (res0 []*items.Item, res1 []*references.Reference, res2 error) {
diff --git a/pkg/references/transport/endpoints.microgen.go b/references/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/references/transport/endpoints.microgen.go
rename to references/transport/endpoints.microgen.go
diff --git a/pkg/references/transport/exchanges.microgen.go b/references/transport/exchanges.microgen.go
similarity index 95%
rename from pkg/references/transport/exchanges.microgen.go
rename to references/transport/exchanges.microgen.go
index 4d0b51bf..c59f8a42 100644
--- a/pkg/references/transport/exchanges.microgen.go
+++ b/references/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/references"
+ "git.perx.ru/perxis/perxis-go/references"
)
type (
diff --git a/pkg/references/transport/grpc/client.go b/references/transport/grpc/client.go
similarity index 88%
rename from pkg/references/transport/grpc/client.go
rename to references/transport/grpc/client.go
index 01e5debd..5267426b 100644
--- a/pkg/references/transport/grpc/client.go
+++ b/references/transport/grpc/client.go
@@ -4,7 +4,7 @@ package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- transport "git.perx.ru/perxis/perxis-go/pkg/references/transport"
+ transport "git.perx.ru/perxis/perxis-go/references/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/references/transport/grpc/client.microgen.go b/references/transport/grpc/client.microgen.go
similarity index 92%
rename from pkg/references/transport/grpc/client.microgen.go
rename to references/transport/grpc/client.microgen.go
index 0cc0cfe3..71baaf63 100644
--- a/pkg/references/transport/grpc/client.microgen.go
+++ b/references/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/references/transport"
pb "git.perx.ru/perxis/perxis-go/proto/references"
+ "git.perx.ru/perxis/perxis-go/references/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/references/transport/grpc/protobuf_endpoint_converters.microgen.go b/references/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 97%
rename from pkg/references/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to references/transport/grpc/protobuf_endpoint_converters.microgen.go
index f2a2fad0..eefc43a0 100644
--- a/pkg/references/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/references/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,9 +7,9 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/references"
- "git.perx.ru/perxis/perxis-go/pkg/references/transport"
pb "git.perx.ru/perxis/perxis-go/proto/references"
+ "git.perx.ru/perxis/perxis-go/references"
+ "git.perx.ru/perxis/perxis-go/references/transport"
)
func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/references/transport/grpc/protobuf_type_converters.microgen.go b/references/transport/grpc/protobuf_type_converters.microgen.go
similarity index 97%
rename from pkg/references/transport/grpc/protobuf_type_converters.microgen.go
rename to references/transport/grpc/protobuf_type_converters.microgen.go
index 965122b7..442c30d5 100644
--- a/pkg/references/transport/grpc/protobuf_type_converters.microgen.go
+++ b/references/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,9 +7,9 @@ package transportgrpc
import (
"git.perx.ru/perxis/perxis-go/pkg/items"
itemstransportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
- service "git.perx.ru/perxis/perxis-go/pkg/references"
itemspb "git.perx.ru/perxis/perxis-go/proto/items"
pb "git.perx.ru/perxis/perxis-go/proto/references"
+ service "git.perx.ru/perxis/perxis-go/references"
)
func PtrItemToReference(ref *service.Reference) (*pb.Reference, error) {
diff --git a/pkg/references/transport/grpc/server.go b/references/transport/grpc/server.go
similarity index 83%
rename from pkg/references/transport/grpc/server.go
rename to references/transport/grpc/server.go
index 32a4beac..c370bc68 100644
--- a/pkg/references/transport/grpc/server.go
+++ b/references/transport/grpc/server.go
@@ -2,9 +2,9 @@ package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- "git.perx.ru/perxis/perxis-go/pkg/references"
- "git.perx.ru/perxis/perxis-go/pkg/references/transport"
pb "git.perx.ru/perxis/perxis-go/proto/references"
+ "git.perx.ru/perxis/perxis-go/references"
+ "git.perx.ru/perxis/perxis-go/references/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/references/transport/grpc/server.microgen.go b/references/transport/grpc/server.microgen.go
similarity index 95%
rename from pkg/references/transport/grpc/server.microgen.go
rename to references/transport/grpc/server.microgen.go
index e5fe77fd..ce02b690 100644
--- a/pkg/references/transport/grpc/server.microgen.go
+++ b/references/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/references/transport"
pb "git.perx.ru/perxis/perxis-go/proto/references"
+ "git.perx.ru/perxis/perxis-go/references/transport"
"github.com/go-kit/kit/transport/grpc"
"golang.org/x/net/context"
)
diff --git a/pkg/references/transport/server.microgen.go b/references/transport/server.microgen.go
similarity index 95%
rename from pkg/references/transport/server.microgen.go
rename to references/transport/server.microgen.go
index 06cf49df..57d18e66 100644
--- a/pkg/references/transport/server.microgen.go
+++ b/references/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/references"
+ "git.perx.ru/perxis/perxis-go/references"
"github.com/go-kit/kit/endpoint"
)
--
GitLab