diff --git a/pkg/account/account.go b/pkg/account/account.go index 707ed0a4f2ef7eed8783c61271e6421b5eeb8f52..9eb54c317274789cb34ee30632df61c152aef93a 100644 --- a/pkg/account/account.go +++ b/pkg/account/account.go @@ -1,12 +1,12 @@ package account import ( - "git.perx.ru/perxis/perxis-go/pkg/account/version" "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/version/service.go b/pkg/account/version/service.go deleted file mode 100644 index 0f0f4447d1aeab8e965bd12d2bc9a614ec15b43a..0000000000000000000000000000000000000000 --- a/pkg/account/version/service.go +++ /dev/null @@ -1,14 +0,0 @@ -package version - -import ( - "context" - - "git.perx.ru/perxis/perxis-go/pkg/version" -) - -// @microgen grpc -// @protobuf git.perx.ru/perxis/perxis-go/proto/versions/account -// @grpc-addr account.Versions -type Versions interface { - Get(ctx context.Context) (version *version.Version, err error) -} diff --git a/pkg/account/version/transport/server.microgen.go b/pkg/account/version/transport/server.microgen.go index 7c9a442e4f901ba1c9f1bfaaf6ec1a23b928d94e..61f36f62a7d425e6fa2ce75a0e50cebd527853a0 100644 --- a/pkg/account/version/transport/server.microgen.go +++ b/pkg/account/version/transport/server.microgen.go @@ -5,7 +5,7 @@ package transport import ( "context" - versions "git.perx.ru/perxis/perxis-go/pkg/account/version" + versions "git.perx.ru/perxis/perxis-go/pkg/version" endpoint "github.com/go-kit/kit/endpoint" ) diff --git a/pkg/content/content.go b/pkg/content/content.go index 16c09e2ab8ce5df301a975ec5a9a76842a7504bd..22acaaa7227622781e93b0a9a019acae51e76873 100644 --- a/pkg/content/content.go +++ b/pkg/content/content.go @@ -5,7 +5,6 @@ import ( "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collaborators" "git.perx.ru/perxis/perxis-go/pkg/collections" - "git.perx.ru/perxis/perxis-go/pkg/content/version" "git.perx.ru/perxis/perxis-go/pkg/environments" "git.perx.ru/perxis/perxis-go/pkg/invitations" "git.perx.ru/perxis/perxis-go/pkg/items" @@ -13,6 +12,7 @@ import ( "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" ) type Runnable interface { diff --git a/pkg/content/version/mocks/Versions.go b/pkg/content/version/mocks/Versions.go deleted file mode 100644 index e4572bac6ac23903d7ad0bdd94e2f7044f9fa7e3..0000000000000000000000000000000000000000 --- a/pkg/content/version/mocks/Versions.go +++ /dev/null @@ -1,38 +0,0 @@ -// Code generated by mockery v2.7.4. DO NOT EDIT. - -package mocks - -import ( - context "context" - - version "git.perx.ru/perxis/perxis-go/pkg/version" - mock "github.com/stretchr/testify/mock" -) - -// Versions is an autogenerated mock type for the Versions type -type Versions struct { - mock.Mock -} - -// Get provides a mock function with given fields: ctx -func (_m *Versions) Get(ctx context.Context) (*version.Version, error) { - ret := _m.Called(ctx) - - var r0 *version.Version - if rf, ok := ret.Get(0).(func(context.Context) *version.Version); ok { - r0 = rf(ctx) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*version.Version) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context) error); ok { - r1 = rf(ctx) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} diff --git a/pkg/content/version/service.go b/pkg/content/version/service.go deleted file mode 100644 index 9ac74e5a6907ce0b1df7cee45dc63663ee6ebb39..0000000000000000000000000000000000000000 --- a/pkg/content/version/service.go +++ /dev/null @@ -1,14 +0,0 @@ -package version - -import ( - "context" - - "git.perx.ru/perxis/perxis-go/pkg/version" -) - -// @microgen grpc -// @protobuf git.perx.ru/perxis/perxis-go/proto/versions/content -// @grpc-addr content.Versions -type Versions interface { - Get(ctx context.Context) (version *version.Version, err error) -} diff --git a/pkg/content/version/transport/server.microgen.go b/pkg/content/version/transport/server.microgen.go index 1cfff4c720d4ef535dbf1f76218919249c7a96ca..61f36f62a7d425e6fa2ce75a0e50cebd527853a0 100644 --- a/pkg/content/version/transport/server.microgen.go +++ b/pkg/content/version/transport/server.microgen.go @@ -5,7 +5,7 @@ package transport import ( "context" - versions "git.perx.ru/perxis/perxis-go/pkg/content/version" + versions "git.perx.ru/perxis/perxis-go/pkg/version" endpoint "github.com/go-kit/kit/endpoint" ) diff --git a/pkg/account/version/mocks/Versions.go b/pkg/version/mocks/Versions.go similarity index 100% rename from pkg/account/version/mocks/Versions.go rename to pkg/version/mocks/Versions.go diff --git a/pkg/version/version.go b/pkg/version/version.go index e7f3817890c2cd3ed84a1e5c70ad42dfdf7239ad..3ab2eb5d82a8ca1fe258c003e54f6d6324e82a5f 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,9 +1,14 @@ package version import ( + "context" "fmt" ) +type Versions interface { + Get(ctx context.Context) (version *Version, err error) +} + type Version struct { ServerVersion string APIVersion string