diff --git a/id/system/system.go b/id/system/system.go index c33995d905a615b6c24422e27239da34141d4752..a3764faa68bd7d1e85d8bdb00ddf1c18e45c49ea 100644 --- a/id/system/system.go +++ b/id/system/system.go @@ -5,13 +5,13 @@ import ( "reflect" "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/organizations" "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" "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" - "git.perx.ru/perxis/perxis-go/pkg/organizations" "git.perx.ru/perxis/perxis-go/pkg/roles" "git.perx.ru/perxis/perxis-go/pkg/spaces" "git.perx.ru/perxis/perxis-go/pkg/users" diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go index 2f01fa125e376623ceb710bbe594235b8434d853..73a184609429dfe1f0ec69e94e16789f93446542 100644 --- a/id/test/object_id_test.go +++ b/id/test/object_id_test.go @@ -5,12 +5,12 @@ import ( "git.perx.ru/perxis/perxis-go/id" _ "git.perx.ru/perxis/perxis-go/id/system" + "git.perx.ru/perxis/perxis-go/organizations" "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/environments" "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" - "git.perx.ru/perxis/perxis-go/pkg/organizations" "git.perx.ru/perxis/perxis-go/pkg/roles" "git.perx.ru/perxis/perxis-go/pkg/spaces" "git.perx.ru/perxis/perxis-go/pkg/users" diff --git a/pkg/organizations/events.go b/organizations/events.go similarity index 100% rename from pkg/organizations/events.go rename to organizations/events.go diff --git a/pkg/organizations/middleware/access_logging_middleware.go b/organizations/middleware/access_logging_middleware.go similarity index 92% rename from pkg/organizations/middleware/access_logging_middleware.go rename to organizations/middleware/access_logging_middleware.go index be6e937d1dc76ba9a6d4d80acd5c6343e35eacd7..d0d6305c26f8a7d85a52b8dedb9333c27d738dc5 100644 --- a/pkg/organizations/middleware/access_logging_middleware.go +++ b/organizations/middleware/access_logging_middleware.go @@ -4,15 +4,15 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/organizations -i Organizations -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" import ( "context" "time" + "git.perx.ru/perxis/perxis-go/organizations" "git.perx.ru/perxis/perxis-go/pkg/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/caching_middleware.go b/organizations/middleware/caching_middleware.go similarity index 96% rename from pkg/organizations/middleware/caching_middleware.go rename to organizations/middleware/caching_middleware.go index c6503200cfbc47915475a95c154a253dec51e29c..ea65c822882209f88232d0ec57d15eb95313164a 100644 --- a/pkg/organizations/middleware/caching_middleware.go +++ b/organizations/middleware/caching_middleware.go @@ -3,9 +3,9 @@ package middleware import ( "context" + service "git.perx.ru/perxis/perxis-go/organizations" "git.perx.ru/perxis/perxis-go/pkg/cache" "git.perx.ru/perxis/perxis-go/pkg/options" - service "git.perx.ru/perxis/perxis-go/pkg/organizations" ) func CachingMiddleware(cache cache.Cache) Middleware { diff --git a/pkg/organizations/middleware/caching_middleware_test.go b/organizations/middleware/caching_middleware_test.go similarity index 97% rename from pkg/organizations/middleware/caching_middleware_test.go rename to organizations/middleware/caching_middleware_test.go index f9999cfce509debda6b49d5aa5ee26a3d60d0f4f..3c8ec732e2a177b1a4745b0ca18442f31862dc0d 100644 --- a/pkg/organizations/middleware/caching_middleware_test.go +++ b/organizations/middleware/caching_middleware_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + "git.perx.ru/perxis/perxis-go/organizations" + mocksorgs "git.perx.ru/perxis/perxis-go/organizations/mocks" "git.perx.ru/perxis/perxis-go/pkg/cache" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/organizations" - mocksorgs "git.perx.ru/perxis/perxis-go/pkg/organizations/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/organizations/middleware/error_logging_middleware.go b/organizations/middleware/error_logging_middleware.go similarity index 90% rename from pkg/organizations/middleware/error_logging_middleware.go rename to organizations/middleware/error_logging_middleware.go index 2d6db8198b885e157ba8ebcc855bb6d9dadb519c..e74d4caaf00d83f38dbd610da84769176bf8da75 100644 --- a/pkg/organizations/middleware/error_logging_middleware.go +++ b/organizations/middleware/error_logging_middleware.go @@ -4,13 +4,13 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/organizations -i Organizations -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l "" import ( "context" + "git.perx.ru/perxis/perxis-go/organizations" "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/logging_middleware.go b/organizations/middleware/logging_middleware.go similarity index 98% rename from pkg/organizations/middleware/logging_middleware.go rename to organizations/middleware/logging_middleware.go index bda7f54fb101777758978a393bf43b52b1532b28..efba09eda98b172f329a8403119a257410c376fd 100644 --- a/pkg/organizations/middleware/logging_middleware.go +++ b/organizations/middleware/logging_middleware.go @@ -4,7 +4,7 @@ import ( "context" "git.perx.ru/perxis/perxis-go/id" - "git.perx.ru/perxis/perxis-go/pkg/organizations" + "git.perx.ru/perxis/perxis-go/organizations" "git.perx.ru/perxis/perxis-go/pkg/options" logzap "git.perx.ru/perxis/perxis-go/zap" diff --git a/pkg/organizations/middleware/middleware.go b/organizations/middleware/middleware.go similarity index 74% rename from pkg/organizations/middleware/middleware.go rename to organizations/middleware/middleware.go index 83808ec26d317f68a07b7b49c772911be1381fcb..40e4c5041d57025207dbad4ec7dd5cfcec67dbc5 100644 --- a/pkg/organizations/middleware/middleware.go +++ b/organizations/middleware/middleware.go @@ -4,10 +4,10 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/organizations -i Organizations -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" import ( - "git.perx.ru/perxis/perxis-go/pkg/organizations" + "git.perx.ru/perxis/perxis-go/organizations" "go.uber.org/zap" ) diff --git a/pkg/organizations/middleware/recovering_middleware.go b/organizations/middleware/recovering_middleware.go similarity index 91% rename from pkg/organizations/middleware/recovering_middleware.go rename to organizations/middleware/recovering_middleware.go index d598f1da65414b4088c712944bbad71083e0def8..64cfb96549b01779f1bdabfb9e8a3002ed102f03 100644 --- a/pkg/organizations/middleware/recovering_middleware.go +++ b/organizations/middleware/recovering_middleware.go @@ -4,14 +4,14 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/organizations -i Organizations -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" import ( "context" "fmt" + "git.perx.ru/perxis/perxis-go/organizations" "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/organizations/middleware/telemetry_middleware.go similarity index 97% rename from pkg/organizations/middleware/telemetry_middleware.go rename to organizations/middleware/telemetry_middleware.go index 1cb7932880080c617db6ccbf2f3d204682ca7c11..c3dbf5c21ef584ac14c462e0ac54f25badbdff3b 100644 --- a/pkg/organizations/middleware/telemetry_middleware.go +++ b/organizations/middleware/telemetry_middleware.go @@ -4,16 +4,16 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/organizations -i Organizations -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l "" import ( "context" "time" oid "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/organizations" "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" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/pkg/organizations/mocks/Middleware.go b/organizations/mocks/Middleware.go similarity index 94% rename from pkg/organizations/mocks/Middleware.go rename to organizations/mocks/Middleware.go index 5ff2ac9d9bda88225394cdc0e3b80115e3078196..08c2392b562a3d87ed723188266d0674119bef91 100644 --- a/pkg/organizations/mocks/Middleware.go +++ b/organizations/mocks/Middleware.go @@ -3,7 +3,7 @@ package mocks import ( - organizations "git.perx.ru/perxis/perxis-go/pkg/organizations" + organizations "git.perx.ru/perxis/perxis-go/organizations" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/organizations/mocks/Organizations.go b/organizations/mocks/Organizations.go similarity index 98% rename from pkg/organizations/mocks/Organizations.go rename to organizations/mocks/Organizations.go index ec0015ae2989bc8b090f95ba515fd0a09a2c45fe..462f81158313ecf8ddb13ea74c1c427f3f21a0f1 100644 --- a/pkg/organizations/mocks/Organizations.go +++ b/organizations/mocks/Organizations.go @@ -8,7 +8,7 @@ import ( options "git.perx.ru/perxis/perxis-go/pkg/options" mock "github.com/stretchr/testify/mock" - organizations "git.perx.ru/perxis/perxis-go/pkg/organizations" + organizations "git.perx.ru/perxis/perxis-go/organizations" ) // Organizations is an autogenerated mock type for the Organizations type diff --git a/pkg/organizations/mocks/Storage.go b/organizations/mocks/Storage.go similarity index 98% rename from pkg/organizations/mocks/Storage.go rename to organizations/mocks/Storage.go index 6b2b7176ff452b0e5935b352ccc3ee112182eb0b..9d9b56e8019ec4173cdf41c2d2b9e7dba3069148 100644 --- a/pkg/organizations/mocks/Storage.go +++ b/organizations/mocks/Storage.go @@ -8,7 +8,7 @@ import ( options "git.perx.ru/perxis/perxis-go/pkg/options" mock "github.com/stretchr/testify/mock" - organizations "git.perx.ru/perxis/perxis-go/pkg/organizations" + organizations "git.perx.ru/perxis/perxis-go/organizations" ) // Storage is an autogenerated mock type for the Storage type diff --git a/pkg/organizations/organization.go b/organizations/organization.go similarity index 100% rename from pkg/organizations/organization.go rename to organizations/organization.go diff --git a/pkg/organizations/service.go b/organizations/service.go similarity index 100% rename from pkg/organizations/service.go rename to organizations/service.go diff --git a/pkg/organizations/storage.go b/organizations/storage.go similarity index 100% rename from pkg/organizations/storage.go rename to organizations/storage.go diff --git a/pkg/organizations/transport/client.go b/organizations/transport/client.go similarity index 96% rename from pkg/organizations/transport/client.go rename to organizations/transport/client.go index e08e3346129b8ec886f3eb83709c4047fd4eac43..4ebcc109e9d5d20915476c834cc6c4403b743dd9 100644 --- a/pkg/organizations/transport/client.go +++ b/organizations/transport/client.go @@ -5,8 +5,8 @@ package transport import ( "context" + organizations "git.perx.ru/perxis/perxis-go/organizations" options "git.perx.ru/perxis/perxis-go/pkg/options" - organizations "git.perx.ru/perxis/perxis-go/pkg/organizations" ) func (set EndpointsSet) Create(arg0 context.Context, arg1 *organizations.Organization) (res0 *organizations.Organization, res1 error) { diff --git a/pkg/organizations/transport/endpoints.microgen.go b/organizations/transport/endpoints.microgen.go similarity index 100% rename from pkg/organizations/transport/endpoints.microgen.go rename to organizations/transport/endpoints.microgen.go diff --git a/pkg/organizations/transport/exchanges.microgen.go b/organizations/transport/exchanges.microgen.go similarity index 93% rename from pkg/organizations/transport/exchanges.microgen.go rename to organizations/transport/exchanges.microgen.go index 480cc3e5b7b3d6ea68bfa2e9bea23f0156d6f3d0..dd99c9dc72ae750968158b55eb70700672049caa 100644 --- a/pkg/organizations/transport/exchanges.microgen.go +++ b/organizations/transport/exchanges.microgen.go @@ -3,8 +3,8 @@ package transport import ( + organizations "git.perx.ru/perxis/perxis-go/organizations" options "git.perx.ru/perxis/perxis-go/pkg/options" - organizations "git.perx.ru/perxis/perxis-go/pkg/organizations" ) type ( diff --git a/pkg/organizations/transport/grpc/client.go b/organizations/transport/grpc/client.go similarity index 90% rename from pkg/organizations/transport/grpc/client.go rename to organizations/transport/grpc/client.go index 3e8793d1b81dd2c6e28b2c24a6be7b4d5b23ff95..f09622c2c7ca0a80699da8601bff3e69ba3b6615 100644 --- a/pkg/organizations/transport/grpc/client.go +++ b/organizations/transport/grpc/client.go @@ -3,8 +3,8 @@ package transportgrpc import ( + transport "git.perx.ru/perxis/perxis-go/organizations/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" ) diff --git a/pkg/organizations/transport/grpc/client.microgen.go b/organizations/transport/grpc/client.microgen.go similarity index 94% rename from pkg/organizations/transport/grpc/client.microgen.go rename to organizations/transport/grpc/client.microgen.go index 3fd1180e5e2742e172d52da51cc4d00314355a48..bf91d6f7b81e15eac7236967ead5d3d17ba00e52 100644 --- a/pkg/organizations/transport/grpc/client.microgen.go +++ b/organizations/transport/grpc/client.microgen.go @@ -3,7 +3,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport" + transport "git.perx.ru/perxis/perxis-go/organizations/transport" pb "git.perx.ru/perxis/perxis-go/proto/organizations" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" diff --git a/pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go b/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go similarity index 98% rename from pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go rename to organizations/transport/grpc/protobuf_endpoint_converters.microgen.go index 6bddb799d5ad72686df3a716bf427d61cc0499a9..d2fc8fbf88111c26b20cfb355e2145d2272a48ed 100644 --- a/pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -7,7 +7,7 @@ import ( "context" "errors" - transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport" + transport "git.perx.ru/perxis/perxis-go/organizations/transport" pb "git.perx.ru/perxis/perxis-go/proto/organizations" empty "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/organizations/transport/grpc/protobuf_type_converters.microgen.go b/organizations/transport/grpc/protobuf_type_converters.microgen.go similarity index 97% rename from pkg/organizations/transport/grpc/protobuf_type_converters.microgen.go rename to organizations/transport/grpc/protobuf_type_converters.microgen.go index 9a35f86e871d4e9b7792aa31590fd8f1b1fd0e12..9d0416cb27ed4f17cbe0a865ec83c37a8deb1e4d 100644 --- a/pkg/organizations/transport/grpc/protobuf_type_converters.microgen.go +++ b/organizations/transport/grpc/protobuf_type_converters.microgen.go @@ -5,8 +5,8 @@ package transportgrpc import ( + "git.perx.ru/perxis/perxis-go/organizations" "git.perx.ru/perxis/perxis-go/pkg/options" - "git.perx.ru/perxis/perxis-go/pkg/organizations" "git.perx.ru/perxis/perxis-go/proto/common" pb "git.perx.ru/perxis/perxis-go/proto/organizations" ) diff --git a/pkg/organizations/transport/grpc/server.go b/organizations/transport/grpc/server.go similarity index 86% rename from pkg/organizations/transport/grpc/server.go rename to organizations/transport/grpc/server.go index 8748dabd8cd66b1c0597dce50b1cf43f87938d2e..795678d9f12f19106b3a1534f15e603e9562a832 100644 --- a/pkg/organizations/transport/grpc/server.go +++ b/organizations/transport/grpc/server.go @@ -1,9 +1,9 @@ package transportgrpc import ( + "git.perx.ru/perxis/perxis-go/organizations" + "git.perx.ru/perxis/perxis-go/organizations/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - "git.perx.ru/perxis/perxis-go/pkg/organizations" - "git.perx.ru/perxis/perxis-go/pkg/organizations/transport" pb "git.perx.ru/perxis/perxis-go/proto/organizations" grpckit "github.com/go-kit/kit/transport/grpc" ) diff --git a/pkg/organizations/transport/grpc/server.microgen.go b/organizations/transport/grpc/server.microgen.go similarity index 97% rename from pkg/organizations/transport/grpc/server.microgen.go rename to organizations/transport/grpc/server.microgen.go index e8576fc07054247b34b6476a5c1b44335ea749d3..648bb99fa2a529282b884312571cdb2ef3a98b3a 100644 --- a/pkg/organizations/transport/grpc/server.microgen.go +++ b/organizations/transport/grpc/server.microgen.go @@ -4,7 +4,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport" + transport "git.perx.ru/perxis/perxis-go/organizations/transport" pb "git.perx.ru/perxis/perxis-go/proto/organizations" grpc "github.com/go-kit/kit/transport/grpc" context "golang.org/x/net/context" diff --git a/pkg/organizations/transport/server.microgen.go b/organizations/transport/server.microgen.go similarity index 96% rename from pkg/organizations/transport/server.microgen.go rename to organizations/transport/server.microgen.go index 2e08f8f534f862552ecc5008b2f76277e702a9ab..0f156d2745eef2c3b10bfeaf5e4c42d3b3cacd75 100644 --- a/pkg/organizations/transport/server.microgen.go +++ b/organizations/transport/server.microgen.go @@ -5,7 +5,7 @@ package transport import ( "context" - organizations "git.perx.ru/perxis/perxis-go/pkg/organizations" + organizations "git.perx.ru/perxis/perxis-go/organizations" endpoint "github.com/go-kit/kit/endpoint" ) diff --git a/pkg/account/account.go b/pkg/account/account.go index 9eb54c317274789cb34ee30632df61c152aef93a..c96347c1151998e5f3bd33172cb4ff4a948c5de8 100644 --- a/pkg/account/account.go +++ b/pkg/account/account.go @@ -1,10 +1,10 @@ package account import ( + "git.perx.ru/perxis/perxis-go/organizations" "git.perx.ru/perxis/perxis-go/pkg/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" "git.perx.ru/perxis/perxis-go/pkg/users" "git.perx.ru/perxis/perxis-go/pkg/version" "google.golang.org/grpc" diff --git a/pkg/account/client.go b/pkg/account/client.go index 5349ed2917ed691f6661930ea0ffce72a79ab814..d1b3acd9a2847746c0156a326d592d62f0d1189d 100644 --- a/pkg/account/client.go +++ b/pkg/account/client.go @@ -3,12 +3,12 @@ package account import ( "time" + serviceOrganizations "git.perx.ru/perxis/perxis-go/organizations/middleware" + organizationsTransport "git.perx.ru/perxis/perxis-go/organizations/transport/grpc" "git.perx.ru/perxis/perxis-go/pkg/cache" serviceMembers "git.perx.ru/perxis/perxis-go/pkg/members/middleware" membersObserverTransport "git.perx.ru/perxis/perxis-go/pkg/members/observer/transport/grpc" membersTransport "git.perx.ru/perxis/perxis-go/pkg/members/transport/grpc" - serviceOrganizations "git.perx.ru/perxis/perxis-go/pkg/organizations/middleware" - organizationsTransport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport/grpc" serviceUsers "git.perx.ru/perxis/perxis-go/pkg/users/middleware" usersTransport "git.perx.ru/perxis/perxis-go/pkg/users/transport/grpc" "go.uber.org/zap"