From ff9426a192bcc5c065246940a600fb21b0bdaa3d Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Wed, 19 Apr 2023 12:13:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20=D0=BB=D0=B8?=
=?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=B9=20=D1=83=D1=80=D0=BE=D0=B2=D0=B5=D0=BD?=
=?UTF-8?q?=D1=8C=20=D0=B2=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=BD=D0=BE=D1=81?=
=?UTF-8?q?=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/account/{client => }/client.go | 11 +++++------
pkg/account/{client => }/config.go | 2 +-
pkg/content/{client => }/client.go | 11 +++++------
pkg/content/{client => }/config.go | 2 +-
4 files changed, 12 insertions(+), 14 deletions(-)
rename pkg/account/{client => }/client.go (92%)
rename pkg/account/{client => }/config.go (99%)
rename pkg/content/{client => }/client.go (95%)
rename pkg/content/{client => }/config.go (99%)
diff --git a/pkg/account/client/client.go b/pkg/account/client.go
similarity index 92%
rename from pkg/account/client/client.go
rename to pkg/account/client.go
index 43df5462..7604f1da 100644
--- a/pkg/account/client/client.go
+++ b/pkg/account/client.go
@@ -1,4 +1,4 @@
-package client
+package account
import (
"context"
@@ -8,7 +8,6 @@ import (
"net/url"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/account"
"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"
@@ -31,9 +30,9 @@ const (
DefaultCacheTTL = time.Second * 10
)
-func NewClient(ctx context.Context, addr string, opts ...Option) (*account.Account, *grpc.ClientConn, error) {
+func NewClient(ctx context.Context, addr string, opts ...Option) (*Account, *grpc.ClientConn, error) {
- client := &account.Account{}
+ client := &Account{}
dialOpts := make([]grpc.DialOption, 0)
config := &config{}
@@ -118,7 +117,7 @@ func NewClient(ctx context.Context, addr string, opts ...Option) (*account.Accou
return client, accountConn, nil
}
-func WithCaching(client *account.Account, size int, ttl time.Duration) *account.Account {
+func WithCaching(client *Account, size int, ttl time.Duration) *Account {
c := *client
c.Members = serviceMembers.CachingMiddleware(cache.NewCache(size, ttl))(client.Members)
@@ -128,7 +127,7 @@ func WithCaching(client *account.Account, size int, ttl time.Duration) *account.
return &c
}
-func WithLogging(client *account.Account, logger *zap.Logger, accessLog bool) *account.Account {
+func WithLogging(client *Account, logger *zap.Logger, accessLog bool) *Account {
c := *client
c.Members = serviceMembers.WithLog(c.Members, logger, accessLog)
diff --git a/pkg/account/client/config.go b/pkg/account/config.go
similarity index 99%
rename from pkg/account/client/config.go
rename to pkg/account/config.go
index f92abf1e..ca7218b5 100644
--- a/pkg/account/client/config.go
+++ b/pkg/account/config.go
@@ -1,4 +1,4 @@
-package client
+package account
import (
"github.com/go-kit/kit/transport/grpc"
diff --git a/pkg/content/client/client.go b/pkg/content/client.go
similarity index 95%
rename from pkg/content/client/client.go
rename to pkg/content/client.go
index 500e2137..a6764842 100644
--- a/pkg/content/client/client.go
+++ b/pkg/content/client.go
@@ -1,4 +1,4 @@
-package client
+package content
import (
"context"
@@ -16,7 +16,6 @@ import (
collaboratorsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport/grpc"
collectionsSvc "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
collectionsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collections/transport/grpc"
- "git.perx.ru/perxis/perxis-go/pkg/content"
environmentsSvc "git.perx.ru/perxis/perxis-go/pkg/environments/middleware"
environmentsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/environments/transport/grpc"
invitationsSvc "git.perx.ru/perxis/perxis-go/pkg/invitations/middleware"
@@ -45,10 +44,10 @@ const (
DefaultCacheTTL = time.Second * 10
)
-func NewClient(addr string, opts ...Option) (*content.Content, *grpc.ClientConn, error) {
+func NewClient(addr string, opts ...Option) (*Content, *grpc.ClientConn, error) {
ctx := context.Background()
- client := &content.Content{}
+ client := &Content{}
dialOpts := make([]grpc.DialOption, 0)
config := &Config{}
@@ -98,7 +97,7 @@ func NewClient(addr string, opts ...Option) (*content.Content, *grpc.ClientConn,
return client, contentConn, nil
}
-func WithCaching(client *content.Content, size int, ttl time.Duration) *content.Content {
+func WithCaching(client *Content, size int, ttl time.Duration) *Content {
c := *client
c.Clients = clientsSvc.CachingMiddleware(cache.NewCache(size, ttl))(client.Clients)
@@ -114,7 +113,7 @@ func WithCaching(client *content.Content, size int, ttl time.Duration) *content.
return &c
}
-func WithLogging(cs *content.Content, logger *zap.Logger, accessLog bool) *content.Content {
+func WithLogging(cs *Content, logger *zap.Logger, accessLog bool) *Content {
s := *cs
s.Collaborators = collaboratorsSvc.WithLog(s.Collaborators, logger, accessLog)
diff --git a/pkg/content/client/config.go b/pkg/content/config.go
similarity index 99%
rename from pkg/content/client/config.go
rename to pkg/content/config.go
index dc81c953..b77d7ddb 100644
--- a/pkg/content/client/config.go
+++ b/pkg/content/config.go
@@ -1,4 +1,4 @@
-package client
+package content
import (
kitgrpc "github.com/go-kit/kit/transport/grpc"
--
GitLab