From b3791d21f25ac50166dde1bc99260de46db28a99 Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Wed, 19 Apr 2023 11:53:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?=
=?UTF-8?q?=D0=B9=D1=81=20Versions=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5?=
=?UTF-8?q?=D0=BD=20=D0=B2=20pkg/version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/account/account.go | 2 +-
pkg/account/version/service.go | 14 -------
.../version/transport/server.microgen.go | 2 +-
pkg/content/content.go | 2 +-
pkg/content/version/mocks/Versions.go | 38 -------------------
pkg/content/version/service.go | 14 -------
.../version/transport/server.microgen.go | 2 +-
pkg/{account => }/version/mocks/Versions.go | 0
pkg/version/version.go | 5 +++
9 files changed, 9 insertions(+), 70 deletions(-)
delete mode 100644 pkg/account/version/service.go
delete mode 100644 pkg/content/version/mocks/Versions.go
delete mode 100644 pkg/content/version/service.go
rename pkg/{account => }/version/mocks/Versions.go (100%)
diff --git a/pkg/account/account.go b/pkg/account/account.go
index 707ed0a4..9eb54c31 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 0f0f4447..00000000
--- 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 7c9a442e..61f36f62 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 16c09e2a..22acaaa7 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 e4572bac..00000000
--- 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 9ac74e5a..00000000
--- 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 1cfff4c7..61f36f62 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 e7f38178..3ab2eb5d 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
--
GitLab