diff --git a/pkg/content/client.go b/pkg/content/client.go index adc5f784dff8fccd5b505867bf65efb373a9149d..6661708f52ab092f599b80a769ac8a146f38ad83 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 1d351e9308da0ea2c81f8afa80fb2be219c633ea..53669a1073341d7d469012b6ea6b0522be5e1fb5 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 feb19d9a7ec4b8f93b1749bf1bfeb3f4be18cc59..c6f7d19dbba1a99b30d2364ba84b7d680817ab04 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 e17e891e0368888d8797b251fbec6c2fb833615b..9ae92108e30fbc1d66bd464f08631b37768e9642 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 b5fe116505c7a5f7d12c5f043c5d1c6b4c5d8fda..b87de8ff6891254689b627ffed9127a29bde944f 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 b6ea043b70da4ea5a9bcd3f3740ebb6e3774d107..68dd3dc648923ebb76f72dc60d125e545baa49ca 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 a68dc8f80685b704162c5399053a3bb3831846c9..77309bcc007f4e70f30ab50eaf6b3819cfa7b53b 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 529a61b60265f0f77bc0a4a3be38151f7ba5334e..38a237fccedda44a940dbfbaceddd2ffa43bd11f 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 cc8a87ff40cd9f70da25444d53762cbce67e8fd7..adeff125bd4471a65bebb7cbf01a4a940eb263ad 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 3e8fbb773fd9bc548eed3f34f78a4f5adcbe1128..89b4945104a6e7234dd4e74dc206dc37e6990290 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 f2526e5012d4200d672b295a608156b3770d5e1f..55a7caa35abe546a713b6e1b09c66dcebd9058fe 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 92c8e29036b2960abd16b5f6df6caab04a783c0d..a1d79c9fe2519613f6c743e98301076e302592bb 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 45f10f4f68c292729d7e461219219d09aa3f1341..97c56f0294e07ee317eb25ef0aac5699980370e6 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 4d0b51bf3f61286e8d4ed6968d3a831e2c57bbf0..c59f8a426d07d4f785c466e902adccf97cbf43b3 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 01e5debd6080274fa42afe4779efc0190e8716ed..5267426bd0f3f61ece2a03b80fb104b6b5bbc15d 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 0cc0cfe3c18e3274267517d1be1472167ebc21e6..71baaf63d76e02abaa664bbbce67456fc8c34496 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 f2a2fad073ebb89f1b48242682066d0a8e171b10..eefc43a0431b2ec20e53f22d70dd7c14d7afc932 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 965122b7da2c7e05db175f6f3a15ac373dd075b5..442c30d5657fcbf17565f1fb4186032ca7d9ce29 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 32a4beac6e564c40d19a7cad937f8191fd8fe54c..c370bc68701569aa49da8f4a1bd8c0bd2ae4d40f 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 e5fe77fde5f1463720b2dc9424f2620a464d6f17..ce02b6907cf7ea48e999a3c254fda44f9f4a23d0 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 06cf49df57605952311d211fc554123a86e760e5..57d18e66a39f07b01102a3f7378188adb89c3bb5 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" )