From 7a9661559fd9a772be6e1714c5fafc62dbdec899 Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Wed, 19 Apr 2023 11:44:46 +0300
Subject: [PATCH] versions -> version

---
 pkg/account/account.go                                        | 4 ++--
 pkg/account/{versions => version}/mocks/Versions.go           | 0
 pkg/account/{versions => version}/service.go                  | 2 +-
 .../{versions => version}/transport/client.microgen.go        | 0
 .../{versions => version}/transport/endpoints.microgen.go     | 0
 .../{versions => version}/transport/exchanges.microgen.go     | 0
 .../{versions => version}/transport/grpc/client.microgen.go   | 2 +-
 .../transport/grpc/protobuf_endpoint_converters.microgen.go   | 2 +-
 .../transport/grpc/protobuf_type_converters.microgen.go       | 0
 .../{versions => version}/transport/grpc/server.microgen.go   | 2 +-
 .../{versions => version}/transport/server.microgen.go        | 2 +-
 pkg/content/content.go                                        | 4 ++--
 pkg/content/{versions => version}/mocks/Versions.go           | 0
 pkg/content/{versions => version}/service.go                  | 2 +-
 .../{versions => version}/transport/client.microgen.go        | 0
 .../{versions => version}/transport/endpoints.microgen.go     | 0
 .../{versions => version}/transport/exchanges.microgen.go     | 0
 .../{versions => version}/transport/grpc/client.microgen.go   | 2 +-
 .../transport/grpc/protobuf_endpoint_converters.microgen.go   | 2 +-
 .../transport/grpc/protobuf_type_converters.microgen.go       | 2 +-
 .../{versions => version}/transport/grpc/server.microgen.go   | 2 +-
 .../{versions => version}/transport/server.microgen.go        | 2 +-
 22 files changed, 15 insertions(+), 15 deletions(-)
 rename pkg/account/{versions => version}/mocks/Versions.go (100%)
 rename pkg/account/{versions => version}/service.go (94%)
 rename pkg/account/{versions => version}/transport/client.microgen.go (100%)
 rename pkg/account/{versions => version}/transport/endpoints.microgen.go (100%)
 rename pkg/account/{versions => version}/transport/exchanges.microgen.go (100%)
 rename pkg/account/{versions => version}/transport/grpc/client.microgen.go (88%)
 rename pkg/account/{versions => version}/transport/grpc/protobuf_endpoint_converters.microgen.go (94%)
 rename pkg/account/{versions => version}/transport/grpc/protobuf_type_converters.microgen.go (100%)
 rename pkg/account/{versions => version}/transport/grpc/server.microgen.go (91%)
 rename pkg/account/{versions => version}/transport/server.microgen.go (88%)
 rename pkg/content/{versions => version}/mocks/Versions.go (100%)
 rename pkg/content/{versions => version}/service.go (94%)
 rename pkg/content/{versions => version}/transport/client.microgen.go (100%)
 rename pkg/content/{versions => version}/transport/endpoints.microgen.go (100%)
 rename pkg/content/{versions => version}/transport/exchanges.microgen.go (100%)
 rename pkg/content/{versions => version}/transport/grpc/client.microgen.go (88%)
 rename pkg/content/{versions => version}/transport/grpc/protobuf_endpoint_converters.microgen.go (94%)
 rename pkg/content/{versions => version}/transport/grpc/protobuf_type_converters.microgen.go (100%)
 rename pkg/content/{versions => version}/transport/grpc/server.microgen.go (91%)
 rename pkg/content/{versions => version}/transport/server.microgen.go (88%)

diff --git a/pkg/account/account.go b/pkg/account/account.go
index 0461807e..707ed0a4 100644
--- a/pkg/account/account.go
+++ b/pkg/account/account.go
@@ -1,7 +1,7 @@
 package account
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/account/versions"
+	"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"
@@ -14,7 +14,7 @@ type Account struct {
 	users.Users
 	members.Members
 	organizations.Organizations
-	versions.Versions
+	version.Versions
 
 	// сервис, отвечающий за отслеживание сервисом `members` событий от других сервисов
 	MembersObserver msobserver.Observer
diff --git a/pkg/account/versions/mocks/Versions.go b/pkg/account/version/mocks/Versions.go
similarity index 100%
rename from pkg/account/versions/mocks/Versions.go
rename to pkg/account/version/mocks/Versions.go
diff --git a/pkg/account/versions/service.go b/pkg/account/version/service.go
similarity index 94%
rename from pkg/account/versions/service.go
rename to pkg/account/version/service.go
index 573fb513..0f0f4447 100644
--- a/pkg/account/versions/service.go
+++ b/pkg/account/version/service.go
@@ -1,4 +1,4 @@
-package versions
+package version
 
 import (
 	"context"
diff --git a/pkg/account/versions/transport/client.microgen.go b/pkg/account/version/transport/client.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/client.microgen.go
rename to pkg/account/version/transport/client.microgen.go
diff --git a/pkg/account/versions/transport/endpoints.microgen.go b/pkg/account/version/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/endpoints.microgen.go
rename to pkg/account/version/transport/endpoints.microgen.go
diff --git a/pkg/account/versions/transport/exchanges.microgen.go b/pkg/account/version/transport/exchanges.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/exchanges.microgen.go
rename to pkg/account/version/transport/exchanges.microgen.go
diff --git a/pkg/account/versions/transport/grpc/client.microgen.go b/pkg/account/version/transport/grpc/client.microgen.go
similarity index 88%
rename from pkg/account/versions/transport/grpc/client.microgen.go
rename to pkg/account/version/transport/grpc/client.microgen.go
index 2e029d6c..b18f2ad7 100644
--- a/pkg/account/versions/transport/grpc/client.microgen.go
+++ b/pkg/account/version/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/account/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/account/version/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 94%
rename from pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/account/version/transport/grpc/protobuf_endpoint_converters.microgen.go
index 90db56d6..053ed907 100644
--- a/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/account/version/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"errors"
 
-	transport2 "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
+	transport2 "git.perx.ru/perxis/perxis-go/pkg/account/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	empty "github.com/golang/protobuf/ptypes/empty"
 )
diff --git a/pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go b/pkg/account/version/transport/grpc/protobuf_type_converters.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/account/version/transport/grpc/protobuf_type_converters.microgen.go
diff --git a/pkg/account/versions/transport/grpc/server.microgen.go b/pkg/account/version/transport/grpc/server.microgen.go
similarity index 91%
rename from pkg/account/versions/transport/grpc/server.microgen.go
rename to pkg/account/version/transport/grpc/server.microgen.go
index 9de34e92..c35071fe 100644
--- a/pkg/account/versions/transport/grpc/server.microgen.go
+++ b/pkg/account/version/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/account/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/account/versions/transport/server.microgen.go b/pkg/account/version/transport/server.microgen.go
similarity index 88%
rename from pkg/account/versions/transport/server.microgen.go
rename to pkg/account/version/transport/server.microgen.go
index 71354622..7c9a442e 100644
--- a/pkg/account/versions/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/versions"
+	versions "git.perx.ru/perxis/perxis-go/pkg/account/version"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 9a796b0d..16c09e2a 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -5,7 +5,7 @@ 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/versions"
+	"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"
@@ -31,7 +31,7 @@ type Content struct {
 	roles.Roles
 	spaces.Spaces
 	clients.Clients
-	versions.Versions
+	version.Versions
 
 	PrincipalFactory *auth.PrincipalFactory
 
diff --git a/pkg/content/versions/mocks/Versions.go b/pkg/content/version/mocks/Versions.go
similarity index 100%
rename from pkg/content/versions/mocks/Versions.go
rename to pkg/content/version/mocks/Versions.go
diff --git a/pkg/content/versions/service.go b/pkg/content/version/service.go
similarity index 94%
rename from pkg/content/versions/service.go
rename to pkg/content/version/service.go
index 154ecdbc..9ac74e5a 100644
--- a/pkg/content/versions/service.go
+++ b/pkg/content/version/service.go
@@ -1,4 +1,4 @@
-package versions
+package version
 
 import (
 	"context"
diff --git a/pkg/content/versions/transport/client.microgen.go b/pkg/content/version/transport/client.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/client.microgen.go
rename to pkg/content/version/transport/client.microgen.go
diff --git a/pkg/content/versions/transport/endpoints.microgen.go b/pkg/content/version/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/endpoints.microgen.go
rename to pkg/content/version/transport/endpoints.microgen.go
diff --git a/pkg/content/versions/transport/exchanges.microgen.go b/pkg/content/version/transport/exchanges.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/exchanges.microgen.go
rename to pkg/content/version/transport/exchanges.microgen.go
diff --git a/pkg/content/versions/transport/grpc/client.microgen.go b/pkg/content/version/transport/grpc/client.microgen.go
similarity index 88%
rename from pkg/content/versions/transport/grpc/client.microgen.go
rename to pkg/content/version/transport/grpc/client.microgen.go
index 83022312..6506d688 100644
--- a/pkg/content/versions/transport/grpc/client.microgen.go
+++ b/pkg/content/version/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
 package transportgrpc
 
 import (
+	transport "git.perx.ru/perxis/perxis-go/pkg/content/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
 )
diff --git a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/content/version/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 94%
rename from pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/content/version/transport/grpc/protobuf_endpoint_converters.microgen.go
index f4403440..ed459d23 100644
--- a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/content/version/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"errors"
 
+	transport "git.perx.ru/perxis/perxis-go/pkg/content/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	empty "github.com/golang/protobuf/ptypes/empty"
 )
 
diff --git a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go b/pkg/content/version/transport/grpc/protobuf_type_converters.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/content/version/transport/grpc/protobuf_type_converters.microgen.go
index 87862edb..48685100 100644
--- a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/content/version/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/proto/common"
 	"git.perx.ru/perxis/perxis-go/pkg/version"
+	"git.perx.ru/perxis/perxis-go/proto/common"
 )
 
 func PtrVersionsVersionToProto(version *version.Version) (*common.Version, error) {
diff --git a/pkg/content/versions/transport/grpc/server.microgen.go b/pkg/content/version/transport/grpc/server.microgen.go
similarity index 91%
rename from pkg/content/versions/transport/grpc/server.microgen.go
rename to pkg/content/version/transport/grpc/server.microgen.go
index 0ab42107..696a839b 100644
--- a/pkg/content/versions/transport/grpc/server.microgen.go
+++ b/pkg/content/version/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
 package transportgrpc
 
 import (
+	transport "git.perx.ru/perxis/perxis-go/pkg/content/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
diff --git a/pkg/content/versions/transport/server.microgen.go b/pkg/content/version/transport/server.microgen.go
similarity index 88%
rename from pkg/content/versions/transport/server.microgen.go
rename to pkg/content/version/transport/server.microgen.go
index 9bc6e478..1cfff4c7 100644
--- a/pkg/content/versions/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/versions"
+	versions "git.perx.ru/perxis/perxis-go/pkg/content/version"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
-- 
GitLab